refactor: extract shell setup

flake.nix

@@ -20,6 +20,10 @@
           inherit pkgs;
 
           modules = [
+            ./shell
+            ./git
+            ./gpg
+            ./neovim
             ./private.nix
             ./xps.nix
           ];
@@ -37,6 +41,10 @@
           inherit pkgs;
 
           modules = [
+            ./shell
+            ./git
+            ./gpg
+            ./neovim
             ./horsch.nix
           ];
 

horsch.nix

@@ -6,10 +6,6 @@
 
   home.stateVersion = "24.05"; # Please read the comment before changing.
 
-  home.sessionVariables = {
-    EDITOR = "nvim";
-  };
-
   programs.home-manager.enable = true;
 
   home.packages = with pkgs; [
@@ -18,23 +14,8 @@
   ];
 
   imports = [
-    ./bat.nix
-    ./carapace.nix
-    ./direnv.nix
-    ./eza.nix
-    ./fzf.nix
-    ./git.nix
-    ./gpg
-    ./neovim
     ./picocom.nix
     ./podman.nix
-    ./ripgrep.nix
-    ./rsync.nix
-    ./shell_aliases.nix
-    ./starship.nix
-    ./tree.nix
-    ./zoxide.nix
-    ./zsh.nix
 
     ./horsch/ssh.nix
     ./horsch/zsh.nix

neovim/default.nix

@@ -1,6 +1,5 @@
 { pkgs, theme, ... }:
 {
-
   # symlink for a stable path 
   home.file.".vscode-extensions/vscode-lldb".source = pkgs.vscode-extensions.vadimcn.vscode-lldb;
 

private.nix

@@ -7,17 +7,13 @@
   home.stateVersion = "24.05"; # Please read the comment before changing.
 
   home.packages = with pkgs; [
-    jq
-    htop
     pavucontrol
     gnumake
-    unzip
     gcc
     thunderbird
     keepassxc
     light
     element-desktop
-    difftastic
     darktable
     kubectl
     kubectx
@@ -27,50 +23,16 @@
     gthumb
     gimp
     evince
-    screen
     inkscape
     chromium
-    xclip
   ];
 
-  # 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/mandlm/etc/profile.d/hm-session-vars.sh
-  #
-  home.sessionVariables = { };
-
   programs.home-manager.enable = true;
 
   imports = [
-    ./bat.nix
-    ./carapace.nix
-    ./direnv.nix
-    ./eza.nix
     ./firefox.nix
-    ./fzf.nix
-    ./git.nix
-    ./gpg
     ./kitty.nix
-    ./neovim
     ./nextcloud.nix
-    ./ripgrep.nix
-    ./shell_aliases.nix
-    ./starship.nix
     ./sway
-    ./tree.nix
-    ./zoxide.nix
-    ./zsh.nix
   ];
 }

shell/default.nix

@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    difftastic
+    htop
+    jq
+    unzip
+    xclip
+  ];
+
+  imports = [
+    ./bat.nix
+    ./carapace.nix
+    ./direnv.nix
+    ./eza.nix
+    ./fzf.nix
+    ./ripgrep.nix
+    ./rsync.nix
+    ./shell_aliases.nix
+    ./starship.nix
+    ./tree.nix
+    ./zoxide.nix
+    ./zsh.nix
+  ];
+}