modules/home

srid · Sep 28, 2024 · 84eef98 · 84eef98
1 parent 32b5ca0
commit 84eef98
Show file tree

Hide file tree

Showing 33 changed files with 49 additions and 47 deletions.
diff --git a/configurations/home/[email protected] b/configurations/home/[email protected]
@@ -5,7 +5,8 @@ let
 in
 {
   imports = [
-    self.homeModules.common-linux
+    self.homeModules.default
+    self.homeModules.linux-only
   ];
   home.username = "srid";
   home.homeDirectory = "/home/srid";

diff --git a/flake-module.nix b/flake-module.nix
@@ -31,6 +31,16 @@ in
       )
       (builtins.readDir "${self}/configurations/nixos");
 
+    homeModules = inputs.nixpkgs.lib.mapAttrs'
+      (fn: _:
+        let
+          inherit (inputs.nixpkgs) lib;
+          name = lib.removeSuffix ".nix" fn;
+        in
+        lib.nameValuePair name "${self}/modules/home/${fn}"
+      )
+      (builtins.readDir "${self}/modules/home");
+
     overlays = lib.mapAttrs'
       (fn: _:
         let name = lib.removeSuffix ".nix" fn; in

diff --git a/flake.nix b/flake.nix
@@ -43,7 +43,6 @@
       [
         ./flake-module.nix
         ./users
-        ./home
         ./nixos
         ./nix-darwin
       ];

diff --git a/home/default.nix b/home/default.nix
diff --git a/home/_1password.nix → modules/home/all/_1password.nix b/home/_1password.nix → modules/home/all/_1password.nix
diff --git a/home/bash.nix → modules/home/all/bash.nix b/home/bash.nix → modules/home/all/bash.nix
diff --git a/home/direnv.nix → modules/home/all/direnv.nix b/home/direnv.nix → modules/home/all/direnv.nix
diff --git a/home/git.nix → modules/home/all/git.nix b/home/git.nix → modules/home/all/git.nix
diff --git a/home/helix.nix → modules/home/all/helix.nix b/home/helix.nix → modules/home/all/helix.nix
diff --git a/home/himalaya.nix → modules/home/all/himalaya.nix b/home/himalaya.nix → modules/home/all/himalaya.nix
diff --git a/home/juspay.nix → modules/home/all/juspay.nix b/home/juspay.nix → modules/home/all/juspay.nix
diff --git a/home/just.nix → modules/home/all/just.nix b/home/just.nix → modules/home/all/just.nix
diff --git a/home/kitty.nix → modules/home/all/kitty.nix b/home/kitty.nix → modules/home/all/kitty.nix
diff --git a/home/neovim.nix → modules/home/all/neovim.nix b/home/neovim.nix → modules/home/all/neovim.nix
diff --git a/home/nix.nix → modules/home/all/nix.nix b/home/nix.nix → modules/home/all/nix.nix
diff --git a/home/nushell.nix → modules/home/all/nushell.nix b/home/nushell.nix → modules/home/all/nushell.nix
diff --git a/home/nushell/config.nu → modules/home/all/nushell/config.nu b/home/nushell/config.nu → modules/home/all/nushell/config.nu
diff --git a/home/nushell/env.nu → modules/home/all/nushell/env.nu b/home/nushell/env.nu → modules/home/all/nushell/env.nu
diff --git a/home/powershell.nix → modules/home/all/powershell.nix b/home/powershell.nix → modules/home/all/powershell.nix
diff --git a/home/ssh.nix → modules/home/all/ssh.nix b/home/ssh.nix → modules/home/all/ssh.nix
diff --git a/home/starship.nix → modules/home/all/starship.nix b/home/starship.nix → modules/home/all/starship.nix
diff --git a/home/terminal.nix → modules/home/all/terminal.nix b/home/terminal.nix → modules/home/all/terminal.nix
diff --git a/home/tmux.nix → modules/home/all/tmux.nix b/home/tmux.nix → modules/home/all/tmux.nix
diff --git a/home/vscode-server.nix → modules/home/all/vscode-server.nix b/home/vscode-server.nix → modules/home/all/vscode-server.nix
diff --git a/home/wezterm/default.nix → modules/home/all/wezterm/default.nix b/home/wezterm/default.nix → modules/home/all/wezterm/default.nix
diff --git a/home/wezterm/wezterm.lua → modules/home/all/wezterm/wezterm.lua b/home/wezterm/wezterm.lua → modules/home/all/wezterm/wezterm.lua
diff --git a/home/zellij.nix → modules/home/all/zellij.nix b/home/zellij.nix → modules/home/all/zellij.nix
diff --git a/home/zsh.nix → modules/home/all/zsh.nix b/home/zsh.nix → modules/home/all/zsh.nix
diff --git a/modules/home/darwin-only.nix b/modules/home/darwin-only.nix
@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./all/zsh.nix
+    ./all/wezterm
+    ./all/himalaya.nix
+    ./all/_1password.nix
+  ];
+}
diff --git a/modules/home/default.nix b/modules/home/default.nix
@@ -0,0 +1,19 @@
+{
+  home.stateVersion = "22.11";
+  imports = [
+    ./all/tmux.nix
+    ./all/neovim.nix
+    # ./helix.nix
+    ./all/ssh.nix
+    ./all/starship.nix
+    ./all/terminal.nix
+    ./all/nix.nix
+    ./all/git.nix
+    ./all/direnv.nix
+    ./all/zellij.nix
+    # ./nushell.nix
+    ./all/just.nix
+    # ./powershell.nix
+    ./all/juspay.nix
+  ];
+}
diff --git a/modules/home/linux-only.nix b/modules/home/linux-only.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./all/bash.nix
+    ./all/vscode-server.nix
+  ];
+}
diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix
@@ -7,7 +7,8 @@
         {
           home-manager.users.${config.people.myself} = {
             imports = [
-              self.homeModules.common-darwin
+              self.homeModules.default
+              self.homeModules.darwin-only
             ];
           };
         }

diff --git a/nixos/default.nix b/nixos/default.nix
@@ -13,7 +13,8 @@
           users.users.${config.people.myself}.isNormalUser = true;
           home-manager.users.${config.people.myself} = {
             imports = [
-              self.homeModules.common-linux
+              self.homeModules.default
+              self.homeModules.linux-only
             ];
           };
         }