From 88bcacf521c31c2520b852e5b75c80cdf3eeb205 Mon Sep 17 00:00:00 2001
From: Christoph Schmatzler <christoph@schmatzler.com>
Date: Sat, 16 Aug 2025 14:46:16 +0200
Subject: [PATCH] up

---
 modules/darwin/default.nix                    | 23 ++++---------------
 modules/home-manager/darwin/default.nix       |  5 ----
 modules/home-manager/nixos/default.nix        |  5 ----
 modules/{home-manager => home}/atuin.nix      |  0
 modules/{home-manager => home}/bat.nix        |  0
 modules/home/darwin/default.nix               | 23 +++++++++++++++++++
 .../{home-manager => home}/darwin/ghostty.nix |  0
 modules/{home-manager => home}/default.nix    | 14 ++++++++---
 modules/{home-manager => home}/eza.nix        |  0
 modules/{home-manager => home}/fish.nix       |  0
 modules/{home-manager => home}/git.nix        |  0
 modules/{home-manager => home}/lazygit.nix    |  0
 modules/{home-manager => home}/mise.nix       |  0
 .../{home-manager => home}/neovim/autocmd.nix |  0
 .../{home-manager => home}/neovim/default.nix |  0
 .../neovim/mappings.nix                       |  0
 .../{home-manager => home}/neovim/options.nix |  0
 .../neovim/plugins/blink-cmp.nix              |  0
 .../neovim/plugins/conform.nix                |  0
 .../neovim/plugins/grug-far.nix               |  0
 .../neovim/plugins/lazygit.nix                |  0
 .../neovim/plugins/lsp.nix                    |  0
 .../neovim/plugins/mini.nix                   |  0
 .../neovim/plugins/oil.nix                    |  0
 .../neovim/plugins/treesitter.nix             |  0
 modules/home/nixos/default.nix                | 12 ++++++++++
 .../{home-manager => home}/nixos/zellij.nix   |  0
 modules/{home-manager => home}/ssh.nix        |  0
 modules/{home-manager => home}/starship.nix   |  0
 modules/{home-manager => home}/zellij.nix     |  0
 modules/{home-manager => home}/zoxide.nix     |  0
 modules/{home-manager => home}/zsh.nix        |  0
 modules/nixos/default.nix                     | 12 +++-------
 33 files changed, 53 insertions(+), 41 deletions(-)
 delete mode 100644 modules/home-manager/darwin/default.nix
 delete mode 100644 modules/home-manager/nixos/default.nix
 rename modules/{home-manager => home}/atuin.nix (100%)
 rename modules/{home-manager => home}/bat.nix (100%)
 create mode 100644 modules/home/darwin/default.nix
 rename modules/{home-manager => home}/darwin/ghostty.nix (100%)
 rename modules/{home-manager => home}/default.nix (61%)
 rename modules/{home-manager => home}/eza.nix (100%)
 rename modules/{home-manager => home}/fish.nix (100%)
 rename modules/{home-manager => home}/git.nix (100%)
 rename modules/{home-manager => home}/lazygit.nix (100%)
 rename modules/{home-manager => home}/mise.nix (100%)
 rename modules/{home-manager => home}/neovim/autocmd.nix (100%)
 rename modules/{home-manager => home}/neovim/default.nix (100%)
 rename modules/{home-manager => home}/neovim/mappings.nix (100%)
 rename modules/{home-manager => home}/neovim/options.nix (100%)
 rename modules/{home-manager => home}/neovim/plugins/blink-cmp.nix (100%)
 rename modules/{home-manager => home}/neovim/plugins/conform.nix (100%)
 rename modules/{home-manager => home}/neovim/plugins/grug-far.nix (100%)
 rename modules/{home-manager => home}/neovim/plugins/lazygit.nix (100%)
 rename modules/{home-manager => home}/neovim/plugins/lsp.nix (100%)
 rename modules/{home-manager => home}/neovim/plugins/mini.nix (100%)
 rename modules/{home-manager => home}/neovim/plugins/oil.nix (100%)
 rename modules/{home-manager => home}/neovim/plugins/treesitter.nix (100%)
 create mode 100644 modules/home/nixos/default.nix
 rename modules/{home-manager => home}/nixos/zellij.nix (100%)
 rename modules/{home-manager => home}/ssh.nix (100%)
 rename modules/{home-manager => home}/starship.nix (100%)
 rename modules/{home-manager => home}/zellij.nix (100%)
 rename modules/{home-manager => home}/zoxide.nix (100%)
 rename modules/{home-manager => home}/zsh.nix (100%)

diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 70917ee..b4bf5e7 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -6,9 +6,7 @@
   user,
   sops-nix,
   ...
-}: let
-  setWallpaperScript = import ./libs/wallpaper.nix {inherit pkgs;};
-in {
+}: {
   imports = [
     ../core.nix
     ../tailscale.nix
@@ -48,26 +46,13 @@ in {
       lib,
       ...
     }: {
-      _module.args = {inherit user;};
+      _module.args = {inherit user constants;};
       imports = [
         nixvim.homeModules.nixvim
-        ../home-manager
-        ../home-manager/darwin
+        ../home/default.nix
+        ../home/darwin/default.nix
       ];
       fonts.fontconfig.enable = true;
-      home = {
-        packages =
-          pkgs.callPackage ../packages.nix {}
-          ++ pkgs.callPackage ./packages.nix {};
-        stateVersion = constants.stateVersions.homeManager;
-
-        activation = {
-          "setWallpaper" = lib.hm.dag.entryAfter ["revealHomeLibraryDirectory"] ''
-            echo "[+] Setting wallpaper"
-            ${setWallpaperScript}/bin/set-wallpaper-script
-          '';
-        };
-      };
     };
   };
 
diff --git a/modules/home-manager/darwin/default.nix b/modules/home-manager/darwin/default.nix
deleted file mode 100644
index 380f597..0000000
--- a/modules/home-manager/darwin/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./ghostty.nix
-  ];
-}
diff --git a/modules/home-manager/nixos/default.nix b/modules/home-manager/nixos/default.nix
deleted file mode 100644
index 5d60337..0000000
--- a/modules/home-manager/nixos/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./zellij.nix
-  ];
-}
diff --git a/modules/home-manager/atuin.nix b/modules/home/atuin.nix
similarity index 100%
rename from modules/home-manager/atuin.nix
rename to modules/home/atuin.nix
diff --git a/modules/home-manager/bat.nix b/modules/home/bat.nix
similarity index 100%
rename from modules/home-manager/bat.nix
rename to modules/home/bat.nix
diff --git a/modules/home/darwin/default.nix b/modules/home/darwin/default.nix
new file mode 100644
index 0000000..3e9d46a
--- /dev/null
+++ b/modules/home/darwin/default.nix
@@ -0,0 +1,23 @@
+{
+  pkgs,
+  config,
+  lib,
+  constants,
+  ...
+}: let
+  setWallpaperScript = import ../../darwin/lib/wallpaper.nix {inherit pkgs;};
+in {
+  imports = [
+    ./ghostty.nix
+  ];
+
+  home = {
+    packages = pkgs.callPackage ../../darwin/packages.nix {};
+    activation = {
+      "setWallpaper" = lib.hm.dag.entryAfter ["revealHomeLibraryDirectory"] ''
+        echo "[+] Setting wallpaper"
+        ${setWallpaperScript}/bin/set-wallpaper-script
+      '';
+    };
+  };
+}
diff --git a/modules/home-manager/darwin/ghostty.nix b/modules/home/darwin/ghostty.nix
similarity index 100%
rename from modules/home-manager/darwin/ghostty.nix
rename to modules/home/darwin/ghostty.nix
diff --git a/modules/home-manager/default.nix b/modules/home/default.nix
similarity index 61%
rename from modules/home-manager/default.nix
rename to modules/home/default.nix
index faab906..609642c 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home/default.nix
@@ -1,4 +1,8 @@
 {
+  pkgs,
+  constants,
+  ...
+}: {
   imports = [
     ./fish.nix
     ./starship.nix
@@ -21,8 +25,12 @@
     nix-direnv.enable = true;
   };
 
-  home.shellAliases = {
-    v = "nvim";
-    lg = "lazygit";
+  home = {
+    packages = pkgs.callPackage ../packages.nix {};
+    stateVersion = constants.stateVersions.homeManager;
+    shellAliases = {
+      v = "nvim";
+      lg = "lazygit";
+    };
   };
 }
diff --git a/modules/home-manager/eza.nix b/modules/home/eza.nix
similarity index 100%
rename from modules/home-manager/eza.nix
rename to modules/home/eza.nix
diff --git a/modules/home-manager/fish.nix b/modules/home/fish.nix
similarity index 100%
rename from modules/home-manager/fish.nix
rename to modules/home/fish.nix
diff --git a/modules/home-manager/git.nix b/modules/home/git.nix
similarity index 100%
rename from modules/home-manager/git.nix
rename to modules/home/git.nix
diff --git a/modules/home-manager/lazygit.nix b/modules/home/lazygit.nix
similarity index 100%
rename from modules/home-manager/lazygit.nix
rename to modules/home/lazygit.nix
diff --git a/modules/home-manager/mise.nix b/modules/home/mise.nix
similarity index 100%
rename from modules/home-manager/mise.nix
rename to modules/home/mise.nix
diff --git a/modules/home-manager/neovim/autocmd.nix b/modules/home/neovim/autocmd.nix
similarity index 100%
rename from modules/home-manager/neovim/autocmd.nix
rename to modules/home/neovim/autocmd.nix
diff --git a/modules/home-manager/neovim/default.nix b/modules/home/neovim/default.nix
similarity index 100%
rename from modules/home-manager/neovim/default.nix
rename to modules/home/neovim/default.nix
diff --git a/modules/home-manager/neovim/mappings.nix b/modules/home/neovim/mappings.nix
similarity index 100%
rename from modules/home-manager/neovim/mappings.nix
rename to modules/home/neovim/mappings.nix
diff --git a/modules/home-manager/neovim/options.nix b/modules/home/neovim/options.nix
similarity index 100%
rename from modules/home-manager/neovim/options.nix
rename to modules/home/neovim/options.nix
diff --git a/modules/home-manager/neovim/plugins/blink-cmp.nix b/modules/home/neovim/plugins/blink-cmp.nix
similarity index 100%
rename from modules/home-manager/neovim/plugins/blink-cmp.nix
rename to modules/home/neovim/plugins/blink-cmp.nix
diff --git a/modules/home-manager/neovim/plugins/conform.nix b/modules/home/neovim/plugins/conform.nix
similarity index 100%
rename from modules/home-manager/neovim/plugins/conform.nix
rename to modules/home/neovim/plugins/conform.nix
diff --git a/modules/home-manager/neovim/plugins/grug-far.nix b/modules/home/neovim/plugins/grug-far.nix
similarity index 100%
rename from modules/home-manager/neovim/plugins/grug-far.nix
rename to modules/home/neovim/plugins/grug-far.nix
diff --git a/modules/home-manager/neovim/plugins/lazygit.nix b/modules/home/neovim/plugins/lazygit.nix
similarity index 100%
rename from modules/home-manager/neovim/plugins/lazygit.nix
rename to modules/home/neovim/plugins/lazygit.nix
diff --git a/modules/home-manager/neovim/plugins/lsp.nix b/modules/home/neovim/plugins/lsp.nix
similarity index 100%
rename from modules/home-manager/neovim/plugins/lsp.nix
rename to modules/home/neovim/plugins/lsp.nix
diff --git a/modules/home-manager/neovim/plugins/mini.nix b/modules/home/neovim/plugins/mini.nix
similarity index 100%
rename from modules/home-manager/neovim/plugins/mini.nix
rename to modules/home/neovim/plugins/mini.nix
diff --git a/modules/home-manager/neovim/plugins/oil.nix b/modules/home/neovim/plugins/oil.nix
similarity index 100%
rename from modules/home-manager/neovim/plugins/oil.nix
rename to modules/home/neovim/plugins/oil.nix
diff --git a/modules/home-manager/neovim/plugins/treesitter.nix b/modules/home/neovim/plugins/treesitter.nix
similarity index 100%
rename from modules/home-manager/neovim/plugins/treesitter.nix
rename to modules/home/neovim/plugins/treesitter.nix
diff --git a/modules/home/nixos/default.nix b/modules/home/nixos/default.nix
new file mode 100644
index 0000000..4b21ce3
--- /dev/null
+++ b/modules/home/nixos/default.nix
@@ -0,0 +1,12 @@
+{
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./zellij.nix
+  ];
+
+  home = {
+    packages = pkgs.callPackage ../../nixos/packages.nix {};
+  };
+}
diff --git a/modules/home-manager/nixos/zellij.nix b/modules/home/nixos/zellij.nix
similarity index 100%
rename from modules/home-manager/nixos/zellij.nix
rename to modules/home/nixos/zellij.nix
diff --git a/modules/home-manager/ssh.nix b/modules/home/ssh.nix
similarity index 100%
rename from modules/home-manager/ssh.nix
rename to modules/home/ssh.nix
diff --git a/modules/home-manager/starship.nix b/modules/home/starship.nix
similarity index 100%
rename from modules/home-manager/starship.nix
rename to modules/home/starship.nix
diff --git a/modules/home-manager/zellij.nix b/modules/home/zellij.nix
similarity index 100%
rename from modules/home-manager/zellij.nix
rename to modules/home/zellij.nix
diff --git a/modules/home-manager/zoxide.nix b/modules/home/zoxide.nix
similarity index 100%
rename from modules/home-manager/zoxide.nix
rename to modules/home/zoxide.nix
diff --git a/modules/home-manager/zsh.nix b/modules/home/zsh.nix
similarity index 100%
rename from modules/home-manager/zsh.nix
rename to modules/home/zsh.nix
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 6e00faa..69ee099 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -54,18 +54,12 @@
       lib,
       ...
     }: {
-      _module.args = {inherit user;};
+      _module.args = {inherit user constants;};
       imports = [
         nixvim.homeModules.nixvim
-        ../home-manager
-        ../home-manager/nixos
+        ../home/default.nix
+        ../home/nixos/default.nix
       ];
-      home = {
-        packages =
-          pkgs.callPackage ../packages.nix {}
-          ++ pkgs.callPackage ./packages.nix {};
-        stateVersion = constants.stateVersions.homeManager;
-      };
     };
   };
 }