From d64bacdb909013cc60b793a7cdfc2bdd36d6c9d4 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com>
Date: Fri, 21 Nov 2025 14:17:20 -0500
Subject: [PATCH] Reorganize home modules into logical categories (#100)

---
 configurations/home/srid@vixen.nix            | 24 +++++++++----------
 configurations/home/srid@zest.nix             | 11 +++++----
 configurations/nixos/pureintent/default.nix   | 12 +++++-----
 modules/home/{all => cli}/bash.nix            |  0
 modules/home/{all => cli}/direnv.nix          |  0
 modules/home/{all => cli}/git.nix             |  0
 modules/home/{all => cli}/just.nix            |  0
 modules/home/{all => cli}/nushell/config.nu   |  0
 modules/home/{all => cli}/nushell/default.nix |  0
 modules/home/{all => cli}/nushell/env.nu      |  0
 modules/home/{all => cli}/starship.nix        |  0
 modules/home/{all => cli}/terminal.nix        |  0
 modules/home/{all => cli}/tmux.nix            |  0
 modules/home/{all => cli}/zellij.nix          |  0
 modules/home/{all => cli}/zsh.nix             |  0
 modules/home/darwin-only.nix                  | 10 ++++----
 modules/home/default.nix                      | 22 ++++++++---------
 modules/home/{all => editors}/emacs.nix       |  0
 modules/home/{all => editors}/helix.nix       |  0
 .../home/{all => editors}/neovim/default.nix  |  0
 .../home/{all => editors}/neovim/lazygit.nix  |  0
 .../{all => editors}/neovim/nvim-tree.nix     |  0
 .../home/{all => editors}/vscode-server.nix   |  0
 modules/home/{all => gui}/1password.nix       |  0
 modules/home/{all => gui}/ghostty.nix         |  0
 modules/home/{all => gui}/obsidian.nix        |  0
 modules/home/linux-only.nix                   |  6 ++---
 .../{all => nix}/buildMachines/default.nix    |  0
 .../buildMachines/sincereintent.nix           |  0
 modules/home/{all/nix.nix => nix/path.nix}    |  0
 modules/home/{all => services}/dropbox.nix    |  0
 .../home/{all => services}/email/default.nix  |  0
 .../home/{all => services}/email/himalaya.nix |  0
 .../{all => services}/email/thunderbird.nix   |  0
 modules/home/{all => services}/syncthing.nix  |  0
 modules/home/{all => services}/ttyd.nix       |  0
 modules/home/{all => services}/vira.nix       |  0
 modules/home/{all => work}/juspay.nix         |  0
 vendor/jumphost-nix                           |  2 +-
 39 files changed, 44 insertions(+), 43 deletions(-)
 rename modules/home/{all => cli}/bash.nix (100%)
 rename modules/home/{all => cli}/direnv.nix (100%)
 rename modules/home/{all => cli}/git.nix (100%)
 rename modules/home/{all => cli}/just.nix (100%)
 rename modules/home/{all => cli}/nushell/config.nu (100%)
 rename modules/home/{all => cli}/nushell/default.nix (100%)
 rename modules/home/{all => cli}/nushell/env.nu (100%)
 rename modules/home/{all => cli}/starship.nix (100%)
 rename modules/home/{all => cli}/terminal.nix (100%)
 rename modules/home/{all => cli}/tmux.nix (100%)
 rename modules/home/{all => cli}/zellij.nix (100%)
 rename modules/home/{all => cli}/zsh.nix (100%)
 rename modules/home/{all => editors}/emacs.nix (100%)
 rename modules/home/{all => editors}/helix.nix (100%)
 rename modules/home/{all => editors}/neovim/default.nix (100%)
 rename modules/home/{all => editors}/neovim/lazygit.nix (100%)
 rename modules/home/{all => editors}/neovim/nvim-tree.nix (100%)
 rename modules/home/{all => editors}/vscode-server.nix (100%)
 rename modules/home/{all => gui}/1password.nix (100%)
 rename modules/home/{all => gui}/ghostty.nix (100%)
 rename modules/home/{all => gui}/obsidian.nix (100%)
 rename modules/home/{all => nix}/buildMachines/default.nix (100%)
 rename modules/home/{all => nix}/buildMachines/sincereintent.nix (100%)
 rename modules/home/{all/nix.nix => nix/path.nix} (100%)
 rename modules/home/{all => services}/dropbox.nix (100%)
 rename modules/home/{all => services}/email/default.nix (100%)
 rename modules/home/{all => services}/email/himalaya.nix (100%)
 rename modules/home/{all => services}/email/thunderbird.nix (100%)
 rename modules/home/{all => services}/syncthing.nix (100%)
 rename modules/home/{all => services}/ttyd.nix (100%)
 rename modules/home/{all => services}/vira.nix (100%)
 rename modules/home/{all => work}/juspay.nix (100%)

diff --git a/configurations/home/srid@vixen.nix b/configurations/home/srid@vixen.nix
index bf20677..d2b19d5 100644
--- a/configurations/home/srid@vixen.nix
+++ b/configurations/home/srid@vixen.nix
@@ -1,7 +1,7 @@
 # This machine uses Omarchy
 #
 # So we consciously pick what we need
-{ flake, pkgs, lib, ... }:
+{ flake, ... }:
 let
   inherit (flake) inputs;
   inherit (inputs) self;
@@ -10,19 +10,19 @@ in
 {
   imports = [
     "${homeMod}/claude-code"
-    "${homeMod}/all/git.nix"
-    "${homeMod}/all/just.nix"
-    "${homeMod}/all/juspay.nix"
-    "${homeMod}/all/direnv.nix"
-    "${homeMod}/all/starship.nix"
-    "${homeMod}/all/bash.nix"
-    "${homeMod}/all/terminal.nix"
-    "${homeMod}/all/1password.nix"
-    "${homeMod}/all/obsidian.nix"
+    "${homeMod}/cli/git.nix"
+    "${homeMod}/cli/just.nix"
+    "${homeMod}/work/juspay.nix"
+    "${homeMod}/cli/direnv.nix"
+    "${homeMod}/cli/starship.nix"
+    "${homeMod}/cli/bash.nix"
+    "${homeMod}/cli/terminal.nix"
+    "${homeMod}/gui/1password.nix"
+    "${homeMod}/gui/obsidian.nix"
 
     # Remote builders
-    # "${homeMod}/all/buildMachines"
-    # "${homeMod}/all/buildMachines/sincereintent.nix"
+    # "${homeMod}/nix/buildMachines"
+    # "${homeMod}/nix/buildMachines/sincereintent.nix"
   ];
 
   home.username = "srid";
diff --git a/configurations/home/srid@zest.nix b/configurations/home/srid@zest.nix
index dc6a1ba..6f744ef 100644
--- a/configurations/home/srid@zest.nix
+++ b/configurations/home/srid@zest.nix
@@ -8,14 +8,15 @@ in
   imports = [
     flake.inputs.self.homeModules.default
     flake.inputs.self.homeModules.darwin-only
-    "${homeMod}/all/1password.nix"
+    "${homeMod}/gui/1password.nix"
     "${homeMod}/claude-code"
-    "${homeMod}/all/juspay.nix"
-    "${homeMod}/all/obsidian.nix"
+
+    "${homeMod}/work/juspay.nix"
+    "${homeMod}/gui/obsidian.nix"
 
     # Remote builders
-    # "${homeMod}/all/buildMachines"
-    # "${homeMod}/all/buildMachines/sincereintent.nix"
+    # "${homeMod}/nix/buildMachines"
+    # "${homeMod}/nix/buildMachines/sincereintent.nix"
   ];
 
   home.username = "srid";
diff --git a/configurations/nixos/pureintent/default.nix b/configurations/nixos/pureintent/default.nix
index adc20d0..0c6c66f 100644
--- a/configurations/nixos/pureintent/default.nix
+++ b/configurations/nixos/pureintent/default.nix
@@ -1,4 +1,4 @@
-{ config, flake, pkgs, lib, ... }:
+{ config, flake, lib, ... }:
 
 let
   inherit (flake) inputs;
@@ -16,13 +16,13 @@ in
 
   users.users.${flake.config.me.username}.linger = true;
   home-manager.sharedModules = [
-    "${homeMod}/all/vira.nix"
-    "${homeMod}/all/juspay.nix"
-    # (self + /modules/home/all/dropbox.nix)
+    "${homeMod}/services/vira.nix"
+    "${homeMod}/work/juspay.nix"
+    # (self + /modules/home/services/dropbox.nix)
 
     # Remote builders
-    "${homeMod}/all/buildMachines"
-    "${homeMod}/all/buildMachines/sincereintent.nix"
+    "${homeMod}/nix/buildMachines"
+    "${homeMod}/nix/buildMachines/sincereintent.nix"
     {
       services.ttyd = {
         enable = true;
diff --git a/modules/home/all/bash.nix b/modules/home/cli/bash.nix
similarity index 100%
rename from modules/home/all/bash.nix
rename to modules/home/cli/bash.nix
diff --git a/modules/home/all/direnv.nix b/modules/home/cli/direnv.nix
similarity index 100%
rename from modules/home/all/direnv.nix
rename to modules/home/cli/direnv.nix
diff --git a/modules/home/all/git.nix b/modules/home/cli/git.nix
similarity index 100%
rename from modules/home/all/git.nix
rename to modules/home/cli/git.nix
diff --git a/modules/home/all/just.nix b/modules/home/cli/just.nix
similarity index 100%
rename from modules/home/all/just.nix
rename to modules/home/cli/just.nix
diff --git a/modules/home/all/nushell/config.nu b/modules/home/cli/nushell/config.nu
similarity index 100%
rename from modules/home/all/nushell/config.nu
rename to modules/home/cli/nushell/config.nu
diff --git a/modules/home/all/nushell/default.nix b/modules/home/cli/nushell/default.nix
similarity index 100%
rename from modules/home/all/nushell/default.nix
rename to modules/home/cli/nushell/default.nix
diff --git a/modules/home/all/nushell/env.nu b/modules/home/cli/nushell/env.nu
similarity index 100%
rename from modules/home/all/nushell/env.nu
rename to modules/home/cli/nushell/env.nu
diff --git a/modules/home/all/starship.nix b/modules/home/cli/starship.nix
similarity index 100%
rename from modules/home/all/starship.nix
rename to modules/home/cli/starship.nix
diff --git a/modules/home/all/terminal.nix b/modules/home/cli/terminal.nix
similarity index 100%
rename from modules/home/all/terminal.nix
rename to modules/home/cli/terminal.nix
diff --git a/modules/home/all/tmux.nix b/modules/home/cli/tmux.nix
similarity index 100%
rename from modules/home/all/tmux.nix
rename to modules/home/cli/tmux.nix
diff --git a/modules/home/all/zellij.nix b/modules/home/cli/zellij.nix
similarity index 100%
rename from modules/home/all/zellij.nix
rename to modules/home/cli/zellij.nix
diff --git a/modules/home/all/zsh.nix b/modules/home/cli/zsh.nix
similarity index 100%
rename from modules/home/all/zsh.nix
rename to modules/home/cli/zsh.nix
diff --git a/modules/home/darwin-only.nix b/modules/home/darwin-only.nix
index d03c22d..57be8d9 100644
--- a/modules/home/darwin-only.nix
+++ b/modules/home/darwin-only.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ ... }:
 {
   imports = [
-    ./all/zsh.nix
-    ./all/bash.nix
-    ./all/nushell
-    # ./all/emacs.nix
+    ./cli/zsh.nix
+    ./cli/bash.nix
+    ./cli/nushell
+    # ./editors/emacs.nix
   ];
 }
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 0c51b79..d26c74b 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -1,16 +1,16 @@
 {
   home.stateVersion = "24.05";
   imports = [
-    ./all/tmux.nix
-    # ./all/neovim
-    ./all/helix.nix
-    ./all/starship.nix
-    ./all/terminal.nix
-    ./all/nix.nix
-    ./all/git.nix
-    ./all/direnv.nix
-    # ./all/zellij.nix
-    ./all/just.nix
-    ./all/ttyd.nix
+    ./cli/tmux.nix
+    # ./editors/neovim
+    ./editors/helix.nix
+    ./cli/starship.nix
+    ./cli/terminal.nix
+    ./nix/path.nix
+    ./cli/git.nix
+    ./cli/direnv.nix
+    # ./cli/zellij.nix
+    ./cli/just.nix
+    ./services/ttyd.nix
   ];
 }
diff --git a/modules/home/all/emacs.nix b/modules/home/editors/emacs.nix
similarity index 100%
rename from modules/home/all/emacs.nix
rename to modules/home/editors/emacs.nix
diff --git a/modules/home/all/helix.nix b/modules/home/editors/helix.nix
similarity index 100%
rename from modules/home/all/helix.nix
rename to modules/home/editors/helix.nix
diff --git a/modules/home/all/neovim/default.nix b/modules/home/editors/neovim/default.nix
similarity index 100%
rename from modules/home/all/neovim/default.nix
rename to modules/home/editors/neovim/default.nix
diff --git a/modules/home/all/neovim/lazygit.nix b/modules/home/editors/neovim/lazygit.nix
similarity index 100%
rename from modules/home/all/neovim/lazygit.nix
rename to modules/home/editors/neovim/lazygit.nix
diff --git a/modules/home/all/neovim/nvim-tree.nix b/modules/home/editors/neovim/nvim-tree.nix
similarity index 100%
rename from modules/home/all/neovim/nvim-tree.nix
rename to modules/home/editors/neovim/nvim-tree.nix
diff --git a/modules/home/all/vscode-server.nix b/modules/home/editors/vscode-server.nix
similarity index 100%
rename from modules/home/all/vscode-server.nix
rename to modules/home/editors/vscode-server.nix
diff --git a/modules/home/all/1password.nix b/modules/home/gui/1password.nix
similarity index 100%
rename from modules/home/all/1password.nix
rename to modules/home/gui/1password.nix
diff --git a/modules/home/all/ghostty.nix b/modules/home/gui/ghostty.nix
similarity index 100%
rename from modules/home/all/ghostty.nix
rename to modules/home/gui/ghostty.nix
diff --git a/modules/home/all/obsidian.nix b/modules/home/gui/obsidian.nix
similarity index 100%
rename from modules/home/all/obsidian.nix
rename to modules/home/gui/obsidian.nix
diff --git a/modules/home/linux-only.nix b/modules/home/linux-only.nix
index 32125a7..5e3b700 100644
--- a/modules/home/linux-only.nix
+++ b/modules/home/linux-only.nix
@@ -1,8 +1,8 @@
 {
   imports = [
-    ./all/bash.nix
+    ./cli/bash.nix
     ./claude-code
-    # ./all/zsh.nix
-    # ./all/vscode-server.nix
+    # ./cli/zsh.nix
+    # ./editors/vscode-server.nix
   ];
 }
diff --git a/modules/home/all/buildMachines/default.nix b/modules/home/nix/buildMachines/default.nix
similarity index 100%
rename from modules/home/all/buildMachines/default.nix
rename to modules/home/nix/buildMachines/default.nix
diff --git a/modules/home/all/buildMachines/sincereintent.nix b/modules/home/nix/buildMachines/sincereintent.nix
similarity index 100%
rename from modules/home/all/buildMachines/sincereintent.nix
rename to modules/home/nix/buildMachines/sincereintent.nix
diff --git a/modules/home/all/nix.nix b/modules/home/nix/path.nix
similarity index 100%
rename from modules/home/all/nix.nix
rename to modules/home/nix/path.nix
diff --git a/modules/home/all/dropbox.nix b/modules/home/services/dropbox.nix
similarity index 100%
rename from modules/home/all/dropbox.nix
rename to modules/home/services/dropbox.nix
diff --git a/modules/home/all/email/default.nix b/modules/home/services/email/default.nix
similarity index 100%
rename from modules/home/all/email/default.nix
rename to modules/home/services/email/default.nix
diff --git a/modules/home/all/email/himalaya.nix b/modules/home/services/email/himalaya.nix
similarity index 100%
rename from modules/home/all/email/himalaya.nix
rename to modules/home/services/email/himalaya.nix
diff --git a/modules/home/all/email/thunderbird.nix b/modules/home/services/email/thunderbird.nix
similarity index 100%
rename from modules/home/all/email/thunderbird.nix
rename to modules/home/services/email/thunderbird.nix
diff --git a/modules/home/all/syncthing.nix b/modules/home/services/syncthing.nix
similarity index 100%
rename from modules/home/all/syncthing.nix
rename to modules/home/services/syncthing.nix
diff --git a/modules/home/all/ttyd.nix b/modules/home/services/ttyd.nix
similarity index 100%
rename from modules/home/all/ttyd.nix
rename to modules/home/services/ttyd.nix
diff --git a/modules/home/all/vira.nix b/modules/home/services/vira.nix
similarity index 100%
rename from modules/home/all/vira.nix
rename to modules/home/services/vira.nix
diff --git a/modules/home/all/juspay.nix b/modules/home/work/juspay.nix
similarity index 100%
rename from modules/home/all/juspay.nix
rename to modules/home/work/juspay.nix
diff --git a/vendor/jumphost-nix b/vendor/jumphost-nix
index dadd760..77fc2b8 160000
--- a/vendor/jumphost-nix
+++ b/vendor/jumphost-nix
@@ -1 +1 @@
-Subproject commit dadd76093aa907d49d6515e272dba632bbffd620
+Subproject commit 77fc2b85b3c7a830f2ae7ab0b6716b10e0b480f1