WIP

khaneliman · Jan 3, 2025 · 2c8e5ac · 2c8e5ac
1 parent 5f53a00
commit 2c8e5ac
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/flake-modules/packages.nix b/flake-modules/packages.nix
@@ -8,6 +8,10 @@
       ...
     }:
     {
+      imports = [
+        # ../packages/default.nix
+      ];
+
       # packages = import ../docs {
       #   inherit system;
       #   inherit (inputs) nixpkgs;

diff --git a/flake.nix b/flake.nix
@@ -4,7 +4,11 @@
   outputs =
     inputs@{ flake-parts, self, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
-      imports = [ ./flake-modules ];
+      imports = [
+        ./flake-modules
+        # inputs.flake-parts.flakeModules.flakeModules
+        # inputs.flake-parts.flakeModules.modules
+      ];
 
       systems = [
         "x86_64-linux"
@@ -18,23 +22,20 @@
         #     ];
         #   };
         #
-        homes.modules = with inputs; [
-          anyrun.homeManagerModules.default
-          catppuccin.homeManagerModules.catppuccin
-          hypr-socket-watch.homeManagerModules.default
-          nix-index-database.hmModules.nix-index
-          nur.hmModules.nur
-          sops-nix.homeManagerModules.sops
-        ];
-
-        systems = {
-          modules = {
-            darwin = with inputs; [ sops-nix.darwinModules.sops ];
-            nixos = with inputs; [
-              lanzaboote.nixosModules.lanzaboote
-              sops-nix.nixosModules.sops
-            ];
-          };
+        modules = {
+          darwin = with inputs; [ sops-nix.darwinModules.sops ];
+          homes = with inputs; [
+            anyrun.homeManagerModules.default
+            catppuccin.homeManagerModules.catppuccin
+            hypr-socket-watch.homeManagerModules.default
+            nix-index-database.hmModules.nix-index
+            nur.hmModules.nur
+            sops-nix.homeManagerModules.sops
+          ];
+          nixos = with inputs; [
+            lanzaboote.nixosModules.lanzaboote
+            sops-nix.nixosModules.sops
+          ];
         };
 
         deploy = {