From 1e2a2c0222d58fff072925c8133babaa8ffc8e10 Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Sun, 24 Mar 2024 12:24:00 +0100
Subject: [PATCH] Specify cli packages in home-manager

---
 home/default.nix              |  7 ++++---
 home/packages/cli/default.nix |  5 +++++
 home/packages/cli/shared.nix  | 21 +++++++++++++++++++++
 home/packages/default.nix     |  6 ++++++
 home/packages/gui/default.nix |  3 +++
 system/programs/default.nix   |  4 ----
 6 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 home/packages/cli/default.nix
 create mode 100644 home/packages/cli/shared.nix
 create mode 100644 home/packages/default.nix
 create mode 100644 home/packages/gui/default.nix

diff --git a/home/default.nix b/home/default.nix
index 03adfe0..ebc4bc0 100644
--- a/home/default.nix
+++ b/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;
       };
     };
   };
diff --git a/home/packages/cli/default.nix b/home/packages/cli/default.nix
new file mode 100644
index 0000000..46d4c7f
--- /dev/null
+++ b/home/packages/cli/default.nix
@@ -0,0 +1,5 @@
+_: {
+  imports = [
+    ./shared.nix
+  ];
+}
diff --git a/home/packages/cli/shared.nix b/home/packages/cli/shared.nix
new file mode 100644
index 0000000..b3793ac
--- /dev/null
+++ b/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
+    ];
+  };
+}
diff --git a/home/packages/default.nix b/home/packages/default.nix
new file mode 100644
index 0000000..b353f0a
--- /dev/null
+++ b/home/packages/default.nix
@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./cli
+    ./gui
+  ];
+}
diff --git a/home/packages/gui/default.nix b/home/packages/gui/default.nix
new file mode 100644
index 0000000..63b0638
--- /dev/null
+++ b/home/packages/gui/default.nix
@@ -0,0 +1,3 @@
+_: {
+  imports = [ ];
+}
diff --git a/system/programs/default.nix b/system/programs/default.nix
index 906f90d..b8534b5 100644
--- a/system/programs/default.nix
+++ b/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
   ];
 }