home: refactor home/packages.nix

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
-  ];
-}