Specify cli packages in home-manager

home/default.nix

@@ -1,14 +1,15 @@
 { config, lib, inputs, self, ... }:
 let
-  hmConf = config.myOptions.home-manager;
+  myHmConf = config.myOptions.home-manager;
   username = config.myOptions.system.username;
 in
 {
   imports = [
+    ./packages
     ./programs
   ];
 
-  home-manager = lib.mkIf hmConf.enabled {
+  home-manager = lib.mkIf myHmConf.enabled {
     # Use verbose mode for home-manager
     verbose = true;
 
@@ -36,7 +37,7 @@ in
       home = {
         inherit username;
         homeDirectory = "/home/${username}";
-        stateVersion = hmConf.stateVersion;
+        stateVersion = myHmConf.stateVersion;
       };
     };
   };

home/packages/cli/default.nix

@@ -0,0 +1,5 @@
+_: {
+  imports = [
+    ./shared.nix
+  ];
+}

home/packages/cli/shared.nix

@@ -0,0 +1,21 @@
+{ config, pkgs, lib, ... }:
+let
+  username = config.myOptions.system.username;
+in
+{
+  home-manager.users.${username} = {
+    home.packages = with pkgs; [
+      fzf
+      jq
+      fd
+      ripgrep
+      unzip
+      file
+      rsync
+      btop
+      hyperfine
+      delta
+      gnupg
+    ];
+  };
+}

home/packages/default.nix

@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./cli
+    ./gui
+  ];
+}

home/packages/gui/default.nix

@@ -0,0 +1,3 @@
+_: {
+  imports = [ ];
+}

system/programs/default.nix

@@ -4,11 +4,7 @@
   ];
 
   # Basic list of must-have packages for all systems
-  # TODO: Move these to home-manager, no need for system wide deps
-  # although maybe keep vim
   environment.systemPackages = with pkgs; [
     vim
-    gnupg
-    delta
   ];
 }