From fe0e45b873af2f2d14e881ee56726122f8df6e0e Mon Sep 17 00:00:00 2001
From: Lander Van den Bulcke <landervandenbulcke@gmail.com>
Date: Thu, 29 Aug 2024 08:47:24 +0200
Subject: [PATCH] chore: restructure home manager config

Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>
---
 home/lander/features/cli/default.nix          | 22 +++++++++++++++++++
 .../{global => features/cli}/git/default.nix  |  0
 .../{global => features/cli}/git/git-identity |  0
 .../{global => features/cli}/starship.nix     |  0
 home/lander/{global => features/cli}/vim.nix  |  0
 home/lander/{global => features/cli}/zsh.nix  |  0
 .../workstation}/alacritty.nix                |  2 +-
 home/lander/features/workstation/default.nix  |  7 ++++++
 home/lander/global/default.nix                |  9 +-------
 home/lander/wodan.nix                         |  3 +--
 10 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 home/lander/features/cli/default.nix
 rename home/lander/{global => features/cli}/git/default.nix (100%)
 rename home/lander/{global => features/cli}/git/git-identity (100%)
 rename home/lander/{global => features/cli}/starship.nix (100%)
 rename home/lander/{global => features/cli}/vim.nix (100%)
 rename home/lander/{global => features/cli}/zsh.nix (100%)
 rename home/lander/{common => features/workstation}/alacritty.nix (88%)
 create mode 100644 home/lander/features/workstation/default.nix

diff --git a/home/lander/features/cli/default.nix b/home/lander/features/cli/default.nix
new file mode 100644
index 0000000..4e016a9
--- /dev/null
+++ b/home/lander/features/cli/default.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }: 
+
+{
+  imports = [
+    ./git
+
+    ./starship.nix
+    ./vim.nix
+    ./zsh.nix
+  ];
+
+  home.packages = with pkgs; [
+    btop
+    ncdu
+    eza
+    ripgrep
+    fd
+    httpie
+    diffsitter
+    jq
+  ];
+}
diff --git a/home/lander/global/git/default.nix b/home/lander/features/cli/git/default.nix
similarity index 100%
rename from home/lander/global/git/default.nix
rename to home/lander/features/cli/git/default.nix
diff --git a/home/lander/global/git/git-identity b/home/lander/features/cli/git/git-identity
similarity index 100%
rename from home/lander/global/git/git-identity
rename to home/lander/features/cli/git/git-identity
diff --git a/home/lander/global/starship.nix b/home/lander/features/cli/starship.nix
similarity index 100%
rename from home/lander/global/starship.nix
rename to home/lander/features/cli/starship.nix
diff --git a/home/lander/global/vim.nix b/home/lander/features/cli/vim.nix
similarity index 100%
rename from home/lander/global/vim.nix
rename to home/lander/features/cli/vim.nix
diff --git a/home/lander/global/zsh.nix b/home/lander/features/cli/zsh.nix
similarity index 100%
rename from home/lander/global/zsh.nix
rename to home/lander/features/cli/zsh.nix
diff --git a/home/lander/common/alacritty.nix b/home/lander/features/workstation/alacritty.nix
similarity index 88%
rename from home/lander/common/alacritty.nix
rename to home/lander/features/workstation/alacritty.nix
index 6ec6701..7623dfc 100644
--- a/home/lander/common/alacritty.nix
+++ b/home/lander/features/workstation/alacritty.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 let
-  theme = import ../../../lib/theme { inherit pkgs; };
+  theme = import ../../../../lib/theme { inherit pkgs; };
 in
 {
   programs.alacritty = {
diff --git a/home/lander/features/workstation/default.nix b/home/lander/features/workstation/default.nix
new file mode 100644
index 0000000..e8d8deb
--- /dev/null
+++ b/home/lander/features/workstation/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  imports = [
+    ./alacritty.nix
+  ];
+}
diff --git a/home/lander/global/default.nix b/home/lander/global/default.nix
index 490bfd6..18943e3 100644
--- a/home/lander/global/default.nix
+++ b/home/lander/global/default.nix
@@ -12,10 +12,7 @@ in
   imports = [
     inputs.catppuccin.homeManagerModules.catppuccin
 
-    ./git
-    ./starship.nix
-    ./vim.nix
-    ./zsh.nix
+    ../features/cli
   ];
 
   home = {
@@ -32,11 +29,7 @@ in
   };
 
   programs = {
-    eza.enable = true;
-    git.enable = true;
-    gpg.enable = true;
     home-manager.enable = true;
-    jq.enable = true;
   };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
diff --git a/home/lander/wodan.nix b/home/lander/wodan.nix
index 2cf94ea..a795f5d 100644
--- a/home/lander/wodan.nix
+++ b/home/lander/wodan.nix
@@ -2,7 +2,6 @@
 {
   imports = [
     ./global
-
-    ./common/alacritty.nix
+    ./features/workstation
   ];
 }