hi

13 files changed, 167 insertions, 93 deletions

diff --git a/home/ebisu/home.nix b/home/ebisu/home.nix
index 2052516..1c73aa2 100644
--- a/home/ebisu/home.nix
+++ b/home/ebisu/home.nix
@@ -34,33 +34,16 @@
       # '')
     ];
 
-    # Home Manager can also manage your environment variables through
-    # 'home.sessionVariables'. These will be explicitly sourced when using a
-    # shell provided by Home Manager. If you don't want to manage your shell
-    # through Home Manager then you have to manually source 'hm-session-vars.sh'
-    # located at either
-    #
-    #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-    #
-    # or
-    #
-    #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-    #
-    # or
-    #
-    #  /etc/profiles/per-user/$USER/etc/profile.d/hm-session-vars.sh
-    #
-    sessionVariables = {
-      # ref: https://github.com/nix-community/home-manager/issues/354#issuecomment-475803163
-      LOCALES_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
-    };
-
-    sessionPath = [ "$HOME/.local/bin" ];
+    sessionPath = [
+      "${config.home.homeDirectory}/.local/bin"
+      "${config.home.homeDirectory}/.local/share/cargo/bin"
+      "${config.xdg.configHome}/.emacs.d/bin"
+    ];
   };
 
   programs.home-manager.enable = true;
-
   imports = [ ./meta ];
+  nixpkgs.overlays = [ inputs.nur.overlay ];
 
   nixpkgs = {
     config = {
@@ -71,8 +54,6 @@
     };
   };
 
-  nixpkgs.overlays = [ inputs.nur.overlay ];
-
   stylix = {
     enable = false;
     image = ./wallpaper.png;
diff --git a/home/ebisu/meta/development/default.nix b/home/ebisu/meta/development/default.nix
index 7f2a70f..e033d0c 100644
--- a/home/ebisu/meta/development/default.nix
+++ b/home/ebisu/meta/development/default.nix
@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./database
     ./git
diff --git a/home/ebisu/meta/development/tools/default.nix b/home/ebisu/meta/development/tools/default.nix
index 982b281..aca8fde 100644
--- a/home/ebisu/meta/development/tools/default.nix
+++ b/home/ebisu/meta/development/tools/default.nix
@@ -1,9 +1,6 @@
-{ pkgs
-, ...
-}: {
-  imports = [
-    ./build
-  ];
+{ pkgs, ... }:
+{
+  imports = [ ./build ];
 
   home.packages = with pkgs; [
     clang-tools
@@ -16,5 +13,6 @@
     linuxKernel.packages.linux_lqx.perf
     radare2
     global
+    valgrind
   ];
 }
diff --git a/home/ebisu/meta/editor/vscode-fhs.nix b/home/ebisu/meta/editor/vscode-fhs.nix
index 59f6b73..e26bb85 100644
--- a/home/ebisu/meta/editor/vscode-fhs.nix
+++ b/home/ebisu/meta/editor/vscode-fhs.nix
@@ -2,22 +2,22 @@
 {
   home.packages = with pkgs; [ vscode-fhs ];
 
-  xdg.configFile."code-flags.conf".text = ''
-    --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer,TouchpadOverscrollHistoryNavigation
-    --ozone-platform=wayland
-    --ignore-gpu-blocklist
-    --enable-gpu-rasterization
-    --enable-zero-copy
-    --disable-gpu-driver-bug-workarounds
-    --enable-features=VaapiVideoDecoder
-    --enable-native-gpu-memory-buffers
-    --disable-features=UseSkiaRenderer
-    --use-cmd-decoder=passthrough
-    --process-per-site
-    --force-dark-mode
-    --enable-features=WebUIDarkMode
-    --enable-unsafe-webgpu
-    --gtk-version=4
-    --enable-wayland-ime
-  '';
+  # xdg.configFile."code-flags.conf".text = ''
+  #   --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer,TouchpadOverscrollHistoryNavigation
+  #   --ozone-platform=wayland
+  #   --ignore-gpu-blocklist
+  #   --enable-gpu-rasterization
+  #   --enable-zero-copy
+  #   --disable-gpu-driver-bug-workarounds
+  #   --enable-features=VaapiVideoDecoder
+  #   --enable-native-gpu-memory-buffers
+  #   --disable-features=UseSkiaRenderer
+  #   --use-cmd-decoder=passthrough
+  #   --process-per-site
+  #   --force-dark-mode
+  #   --enable-features=WebUIDarkMode
+  #   --enable-unsafe-webgpu
+  #   --gtk-version=4
+  #   --enable-wayland-ime
+  # '';
 }
diff --git a/home/ebisu/meta/system/default.nix b/home/ebisu/meta/system/default.nix
index fca6738..1110382 100644
--- a/home/ebisu/meta/system/default.nix
+++ b/home/ebisu/meta/system/default.nix
@@ -8,6 +8,7 @@
     ./shell
     ./terminal
     ./virtualisation
+    ./variables.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/home/ebisu/meta/system/shell/fish/default.nix b/home/ebisu/meta/system/shell/fish/default.nix
index 55f441d..2d8590e 100644
--- a/home/ebisu/meta/system/shell/fish/default.nix
+++ b/home/ebisu/meta/system/shell/fish/default.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   programs.fish = {
     enable = true;
 
@@ -25,9 +26,6 @@
       set HISTFILESIZE -1
       set SAVEHIST -1
 
-      source "$config_home/shell/profile"
-      bass source "~/.nix-profile/etc/profile.d/hm-session-vars.sh"
-
       bind \ce edit_command_buffer
 
       zoxide init fish | source
diff --git a/home/ebisu/meta/system/variables.nix b/home/ebisu/meta/system/variables.nix
new file mode 100644
index 0000000..f562292
--- /dev/null
+++ b/home/ebisu/meta/system/variables.nix
@@ -0,0 +1,92 @@
+{ pkgs, config, ... }:
+{
+  home.sessionVariables = {
+    # ref: https://github.com/nix-community/home-manager/issues/354#issuecomment-475803163
+    LOCALES_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
+    FLAKE = "${config.home.homeDirectory}/nixos-config";
+
+    # Default programs
+    EDITOR = "nvim";
+    TERMINAL = "kitty";
+    TERMINAL_PROG = "kitty";
+    BROWSER = "zen";
+
+    # Home directory clean-up
+    NOTMUCH_CONFIG = "${config.xdg.configHome}/notmuch-config";
+    # GTK2_RC_FILES = "${config.xdg.configHome}/gtk-2.0/gtkrc-2.0";
+    WGETRC = "${config.xdg.configHome}/wget/wgetrc";
+    INPUTRC = "${config.xdg.configHome}/shell/inputrc";
+    ZDOTDIR = "${config.xdg.configHome}/zsh";
+    # GNUPGHOME="${config.xdg.dataHome}/gnupg";
+    WINEPREFIX = "${config.xdg.dataHome}/wineprefixes/default";
+    KODI_DATA = "${config.xdg.dataHome}/kodi";
+    PASSWORD_STORE_DIR = "${config.xdg.dataHome}/password-store";
+    TMUX_TMPDIR = "$XDG_RUNTIME_DIR";
+    ANDROID_SDK_HOME = "${config.xdg.configHome}/android";
+    CARGO_HOME = "${config.xdg.dataHome}/cargo";
+    GOPATH = "${config.xdg.dataHome}/go";
+    GOMODCACHE = "${config.xdg.cacheHome}/go/mod";
+    ANSIBLE_CONFIG = "${config.xdg.configHome}/ansible/ansible.cfg";
+    UNISON = "${config.xdg.dataHome}/unison";
+    HISTFILE = "${config.xdg.dataHome}/history";
+    MBSYNCRC = "${config.xdg.configHome}/mbsync/config";
+    ELECTRUMDIR = "${config.xdg.dataHome}/electrum";
+    PYTHONSTARTUP = "${config.xdg.configHome}/python/pythonrc";
+    SQLITE_HISTORY = "${config.xdg.dataHome}/sqlite_history";
+    WAKATIME_HOME = "${config.xdg.configHome}/wakatime";
+    NVM_DIR = "${config.xdg.dataHome}/nvm";
+    CUDA_CACHE_PATH = "${config.xdg.cacheHome}/nv";
+    DOCKER_CONFIG = "${config.xdg.configHome}/docker";
+    RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
+    NUGET_PACKAGES = "${config.xdg.cacheHome}/NuGetPackages";
+    KERAS_HOME = "${config.xdg.stateHome}/keras";
+    PARALLEL_HOME = "${config.xdg.configHome}/parallel";
+    _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java";
+    NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
+    NODE_REPL_HISTORY = "${config.xdg.dataHome}/node_repl_history";
+    MPLAYER_HOME = "${config.xdg.configHome}/mplayer";
+    BUNDLE_PATH = "${config.home.homeDirectory}/.gems";
+    STEAM_APP_DIR = "${config.home.homeDirectory}/.steam";
+    ANDROID_USER_HOME = "${config.xdg.dataHome}/android";
+    ASDF_DATA_DIR = "${config.xdg.dataHome}/asdf";
+    CABAL_CONFIG = "${config.xdg.configHome}/cabal/config";
+    CABAL_DIR = "${config.xdg.dataHome}/cabal";
+    DOTNET_CLI_HOME = "${config.xdg.dataHome}/dotnet";
+    GRADLE_USER_HOME = "${config.xdg.dataHome}/gradle";
+    NIMBLE_DIR = "${config.xdg.dataHome}/nimble";
+    REDISCLI_HISTFILE = "${config.xdg.dataHome}/redis/rediscli_history";
+    STACK_ROOT = "${config.xdg.dataHome}/stack";
+    STACK_XDG = 1;
+
+    # Other program settings
+    FZF_DEFAULT_OPTS = "--layout=reverse --height 40%";
+    LESS = "R";
+    LESS_TERMCAP_mb = "$(printf '%b' '')";
+    LESS_TERMCAP_md = "$(printf '%b' '')";
+    LESS_TERMCAP_me = "$(printf '%b' '')";
+    LESS_TERMCAP_so = "$(printf '%b' '')";
+    LESS_TERMCAP_se = "$(printf '%b' '')";
+    LESS_TERMCAP_us = "$(printf '%b' '')";
+    LESS_TERMCAP_ue = "$(printf '%b' '')";
+    LESSOPEN = "| highlight -O ansi %s 2>/dev/null";
+    QT_QPA_PLATFORMTHEME = "gtk2";
+    MOZ_USE_XINPUT2 = "1";
+    AWT_TOOLKIT = "MToolkit wmname LG3D";
+    _JAVA_AWT_WM_NONREPARENTING = 1;
+    # GPG_TTY=$(tty);
+    # GIT_ASKPASS = "${pkgs.ksshaskpass}/bin/ksshaskpass";
+    # SSH_ASKPASS = "${pkgs.ksshaskpass}/bin/ksshaskpass";
+    # SSH_ASKPASS_REQUIRE = "prefer";
+    OPENAI_API_KEY = "sk-proj-lp1rme6lIEbfNeg4sbMQT3BlbkFJoWb5uwnraatH6HOkymqr";
+    NNN_FIFO = "/tmp/nnn.fifo";
+    _Z_DATA = "${config.xdg.dataHome}/z";
+    W3M_DIR = "${config.xdg.dataHome}/w3m";
+    VMODULES = "${config.xdg.dataHome}/vmodules";
+    TEXMFVAR = "${config.xdg.cacheHome}/texlive/texmf-var";
+    BUNDLE_USER_CONFIG = "${config.xdg.configHome}/bundle";
+    BUNDLE_USER_CACHE = "${config.xdg.cacheHome}/bundle";
+    BUNDLE_USER_PLUGIN = "${config.xdg.dataHome}/bundle";
+    PSQL_HISTORY = "${config.xdg.dataHome}/psql_history";
+    PKG_CACHE_PATH = "${config.xdg.cacheHome}/pkg-cache";
+  };
+}
diff --git a/home/ebisu/meta/system/virtualisation/default.nix b/home/ebisu/meta/system/virtualisation/default.nix
index d99c7eb..85e082f 100644
--- a/home/ebisu/meta/system/virtualisation/default.nix
+++ b/home/ebisu/meta/system/virtualisation/default.nix
@@ -1,11 +1,9 @@
-{ pkgs, ... }: {
-  imports = [
-    ./docker
-  ];
+{ pkgs, ... }:
+{
+  imports = [ ./docker ];
 
   home.packages = with pkgs; [
     bottles
-    valgrind
     virt-manager
   ];
 }
diff --git a/home/ebisu/meta/system/virtualisation/docker/default.nix b/home/ebisu/meta/system/virtualisation/docker/default.nix
index 26854be..4d395ff 100644
--- a/home/ebisu/meta/system/virtualisation/docker/default.nix
+++ b/home/ebisu/meta/system/virtualisation/docker/default.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   home.packages = with pkgs; [
     act
     earthly
     dive
-    # docker
     docker-buildx
     docker-slim
   ];
diff --git a/modules/environment/default.nix b/modules/environment/default.nix
index b20dcf4..07805f0 100644
--- a/modules/environment/default.nix
+++ b/modules/environment/default.nix
@@ -1,24 +1,6 @@
 {
-  environment = {
-    variables = {
-      LIBVA_DRIVER_NAME = "nvidia";
-      XDG_SESSION_TYPE = "wayland";
-      GBM_BACKEND = "nvidia-drm";
-      __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-      __GL_GSYNC_ALLOWED = "1";
-      __GL_VRR_ALLOWED = "0";
-      QT_AUTO_SCREEN_SCALE_FACTOR = "1";
-      QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-      CUDA_CACHE_PATH = "$XDG_CACHE_HOME/nv";
-    };
-
-    sessionVariables = {
-      NIXOS_OZONE_WL = "1";
-      WLR_NO_HARDWARE_CURSORS = "1";
-    };
-
-    shellAliases = {
-      nvidia-settings = "nvidia-settings --config='$XDG_CONFIG_HOME'/nvidia/settings";
-    };
-  };
+  imports = [
+    ./system-packages.nix
+    ./variables.nix
+  ];
 }
diff --git a/modules/environment/system-packages.nix b/modules/environment/system-packages.nix
new file mode 100644
index 0000000..2432ba7
--- /dev/null
+++ b/modules/environment/system-packages.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    vim
+    wget
+    git
+    gtk2
+    gtk3
+    gtk4
+    mediastreamer-openh264
+  ];
+}
diff --git a/modules/environment/variables.nix b/modules/environment/variables.nix
new file mode 100644
index 0000000..d28c806
--- /dev/null
+++ b/modules/environment/variables.nix
@@ -0,0 +1,22 @@
+{
+  environment = {
+    variables = {
+      LIBVA_DRIVER_NAME = "nvidia";
+      XDG_SESSION_TYPE = "wayland";
+      GBM_BACKEND = "nvidia-drm";
+      __GLX_VENDOR_LIBRARY_NAME = "nvidia";
+      __GL_GSYNC_ALLOWED = "1";
+      __GL_VRR_ALLOWED = "0";
+      QT_AUTO_SCREEN_SCALE_FACTOR = "1";
+      QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+      CUDA_CACHE_PATH = "$XDG_CACHE_HOME/nv";
+    };
+
+    sessionVariables = {
+      NIXOS_OZONE_WL = "1";
+      WLR_NO_HARDWARE_CURSORS = "1";
+    };
+
+    shellAliases.nvidia-settings = "nvidia-settings --config='$XDG_CONFIG_HOME'/nvidia/settings";
+  };
+}
diff --git a/modules/programs/default.nix b/modules/programs/default.nix
index f4fc813..c4ce8ca 100644
--- a/modules/programs/default.nix
+++ b/modules/programs/default.nix
@@ -2,16 +2,6 @@
 {
   imports = [ ./hyprland.nix ];
 
-  environment.systemPackages = with pkgs; [
-    vim
-    wget
-    git
-    gtk2
-    gtk3
-    gtk4
-    mediastreamer-openh264
-  ];
-
   programs = {
     fish.enable = true;
     mtr.enable = true;