up

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
-          '';
-        };
-      };
     };
   };
 

modules/home-manager/darwin/default.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./ghostty.nix
-  ];
-}

modules/home-manager/nixos/default.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./zellij.nix
-  ];
-}

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
+      '';
+    };
+  };
+}

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";
+    };
   };
 }

modules/home/nixos/default.nix

@@ -0,0 +1,12 @@
+{
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./zellij.nix
+  ];
+
+  home = {
+    packages = pkgs.callPackage ../../nixos/packages.nix {};
+  };
+}

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;
-      };
     };
   };
 }