cleaned up configuration structure to have common modules folder

flake.nix

@@ -75,8 +75,6 @@
     # callPackage = nixpkgs.lib.callPackageWith (nixpkgs // {lib = lib;});
     # lib = callPackage ./lib {} // nixpkgs.lib;
   in {
-    packages = forEachPkgs (import ./pkgs);
-
     formatter = forEachPkgs (pkgs: pkgs.alejandra);
 
     devShells = forEachPkgs (pkgs: {

homes/ester/default.nix

@@ -6,9 +6,7 @@
 }: let
   userConfig = osConfig.host.users.ester;
 in {
-  imports = [
-    ../../home-modules
-  ];
+  imports = [];
 
   config = {
     home = {

homes/eve/default.nix

@@ -6,9 +6,7 @@
 }: let
   userConfig = osConfig.host.users.eve;
 in {
-  imports = [
-    ../../home-modules
-  ];
+  imports = [];
 
   config = {
     home = {

homes/leyla/default.nix

@@ -5,7 +5,6 @@
 }: {
   imports = [
     ./packages.nix
-    ../../home-modules
   ];
 
   config = {

hosts/defiant/configuration.nix

@@ -7,8 +7,6 @@
   imports = [
     inputs.disko.nixosModules.disko
     ../../enviroments/server
-
-    ../../host-modules
   ];
 
   nixpkgs.config.allowUnfree = true;

hosts/horizon/configuration.nix

@@ -3,7 +3,6 @@
     inputs.nixos-hardware.nixosModules.framework-11th-gen-intel
 
     ../../enviroments/client
-    ../../host-modules
   ];
 
   nixpkgs.config.allowUnfree = true;

hosts/horizon/hardware-configuration.nix

@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {

hosts/twilight/configuration.nix

@@ -1,8 +1,6 @@
 {pkgs, ...}: {
   imports = [
     ../../enviroments/client
-
-    ../../host-modules
   ];
 
   nixpkgs.config.allowUnfree = true;

modules/default.nix

@@ -0,0 +1,7 @@
+# this folder is for modules that are common between nixos, home-manager, and darwin
+{...}: {
+  imports = [
+    ./overlays
+    ./pkgs
+  ];
+}

modules/overlays/default.nix

@@ -0,0 +1,3 @@
+# this folder is for derivation overlays
+{...}: {
+}

modules/pkgs/default.nix

@@ -1,3 +1,4 @@
+# this folder is for custom derivations
 {...}: {
   # package = pkgs.callPackage ./package.nix {};
 }

overlays/default.nix

@@ -1,2 +0,0 @@
-{...}: {
-}

util/default.nix

@@ -17,12 +17,17 @@
   forEachSystem = nixpkgs.lib.genAttrs systems;
   pkgsFor = system: nixpkgs.legacyPackages.${system};
 
+  home-manager-shared-modules = [
+    ../modules
+    ../home-modules
+  ];
   home-manager-config = nixpkgs: {
     home-manager.useGlobalPkgs = true;
     home-manager.useUserPackages = true;
     home-manager.backupFileExtension = "backup";
     home-manager.extraSpecialArgs = {inherit inputs;};
     home-manager.users = import ../homes nixpkgs;
+    home-manager.sharedModules = home-manager-shared-modules;
   };
 in {
   forEachPkgs = lambda: forEachSystem (system: lambda (pkgsFor system));
@@ -42,7 +47,8 @@ in {
         sops-nix.nixosModules.sops
         home-manager.nixosModules.home-manager
         home-manager-config
-        ../overlays
+        ../modules
+        ../host-modules
         ../hosts/${host}
       ];
     };
@@ -53,8 +59,9 @@ in {
       extraSpecialArgs = {
         inherit inputs util outputs osConfig;
       };
-      modules = [
-        ../overlays
+      modules =
+        home-manager-shared-modules
+        ++ [
           ../homes/${user}
         ];
     };