home: refactor home/packages.nix

nix/homeModules/common/fish/default.nix

@@ -29,7 +29,6 @@ in
   programs = {
     fd.enable = true;
     tmux = {
-      enable = true;
       extraConfig = lib.mkBefore ''
         set -g default-command "${fishExe}" # Use fish
         set -g default-shell "${fishExe}"
@@ -45,7 +44,6 @@ in
       enableFishIntegration = true;
     };
     starship = {
-      enable = true;
       enableFishIntegration = true;
     };
     kitty = {

nix/homeModules/common/packages.nix

@@ -3,23 +3,19 @@
 {
 
   programs = {
-    fish.enable = true;
-    git.enable = true;
     vim.enable = true;
-    starship.enable = true;
-    tmux.enable = true;
   };
 
-  services.gpg-agent.enable = lib.mkDefault pkgs.stdenv.isLinux;
-
   home.packages =
     [
       pkgs.file
       pkgs.gnused
       pkgs.tree
       pkgs.findutils # xargs and more
+      pkgs.rsync
+      pkgs.parallel
+      pkgs.jq
     ]
-
     # coreutils for darwin
     ++ (lib.optional pkgs.stdenv.isDarwin pkgs.uutils-coreutils-noprefix);
 

nix/homeModules/extra/preset-fancy.nix

@@ -1,21 +1,29 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 let
   inherit (pkgs) myPkgs;
 in
 
 {
+  programs = {
+    neovim.enable = true;
+    git.enable = true;
+    gpg.enable = true;
+  };
+
+  programs = {
+    fish.enable = true;
+    starship.enable = true;
+    tmux.enable = true;
+  };
+
   programs = {
     ripgrep.enable = true;
     direnv.enable = true;
     btop.enable = true;
   };
 
-  programs = {
-    neovim.enable = true;
-    # sign commits
-    gpg.enable = true;
-  };
+  services.gpg-agent.enable = lib.mkDefault pkgs.stdenv.isLinux;
 
   home.packages = [
     # pretty tui tools
@@ -25,6 +33,7 @@ in
     pkgs.hyperfine
     pkgs.watchexec
     pkgs.onefetch
+    pkgs.just
 
     # tools I don't need on servers
     myPkgs.hutils

nix/homeModules/extra/preset-utilities.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = [
-    pkgs.rsync
-    pkgs.parallel
-    pkgs.jq
-    pkgs.just
-  ];
-}