From b1b43bb7f0800b8de9047c69aa069d2b63b5dae8 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Sun, 24 Nov 2024 22:29:00 -0600
Subject: [PATCH] cleaned up configuration structure to have common modules
 folder

---
 flake.nix                                |  2 --
 homes/ester/default.nix                  |  4 +---
 homes/eve/default.nix                    |  4 +---
 homes/leyla/default.nix                  |  1 -
 hosts/defiant/configuration.nix          |  2 --
 hosts/horizon/configuration.nix          |  1 -
 hosts/horizon/hardware-configuration.nix |  1 -
 hosts/twilight/configuration.nix         |  2 --
 modules/default.nix                      |  7 +++++++
 modules/overlays/default.nix             |  3 +++
 {pkgs => modules/pkgs}/default.nix       |  1 +
 overlays/default.nix                     |  2 --
 util/default.nix                         | 17 ++++++++++++-----
 13 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 modules/default.nix
 create mode 100644 modules/overlays/default.nix
 rename {pkgs => modules/pkgs}/default.nix (60%)
 delete mode 100644 overlays/default.nix

diff --git a/flake.nix b/flake.nix
index 1d95a4f..642e031 100644
--- a/flake.nix
+++ b/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: {
diff --git a/homes/ester/default.nix b/homes/ester/default.nix
index bf37a9d..29d668f 100644
--- a/homes/ester/default.nix
+++ b/homes/ester/default.nix
@@ -6,9 +6,7 @@
 }: let
   userConfig = osConfig.host.users.ester;
 in {
-  imports = [
-    ../../home-modules
-  ];
+  imports = [];
 
   config = {
     home = {
diff --git a/homes/eve/default.nix b/homes/eve/default.nix
index 21b4a8a..0c6c0b2 100644
--- a/homes/eve/default.nix
+++ b/homes/eve/default.nix
@@ -6,9 +6,7 @@
 }: let
   userConfig = osConfig.host.users.eve;
 in {
-  imports = [
-    ../../home-modules
-  ];
+  imports = [];
 
   config = {
     home = {
diff --git a/homes/leyla/default.nix b/homes/leyla/default.nix
index 1a1d284..a879526 100644
--- a/homes/leyla/default.nix
+++ b/homes/leyla/default.nix
@@ -5,7 +5,6 @@
 }: {
   imports = [
     ./packages.nix
-    ../../home-modules
   ];
 
   config = {
diff --git a/hosts/defiant/configuration.nix b/hosts/defiant/configuration.nix
index 2068b6f..178aedf 100644
--- a/hosts/defiant/configuration.nix
+++ b/hosts/defiant/configuration.nix
@@ -7,8 +7,6 @@
   imports = [
     inputs.disko.nixosModules.disko
     ../../enviroments/server
-
-    ../../host-modules
   ];
 
   nixpkgs.config.allowUnfree = true;
diff --git a/hosts/horizon/configuration.nix b/hosts/horizon/configuration.nix
index c784ef6..50b574b 100644
--- a/hosts/horizon/configuration.nix
+++ b/hosts/horizon/configuration.nix
@@ -3,7 +3,6 @@
     inputs.nixos-hardware.nixosModules.framework-11th-gen-intel
 
     ../../enviroments/client
-    ../../host-modules
   ];
 
   nixpkgs.config.allowUnfree = true;
diff --git a/hosts/horizon/hardware-configuration.nix b/hosts/horizon/hardware-configuration.nix
index e333702..ed6246a 100644
--- a/hosts/horizon/hardware-configuration.nix
+++ b/hosts/horizon/hardware-configuration.nix
@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {
diff --git a/hosts/twilight/configuration.nix b/hosts/twilight/configuration.nix
index 182c867..872e944 100644
--- a/hosts/twilight/configuration.nix
+++ b/hosts/twilight/configuration.nix
@@ -1,8 +1,6 @@
 {pkgs, ...}: {
   imports = [
     ../../enviroments/client
-
-    ../../host-modules
   ];
 
   nixpkgs.config.allowUnfree = true;
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 0000000..3dd1923
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,7 @@
+# this folder is for modules that are common between nixos, home-manager, and darwin
+{...}: {
+  imports = [
+    ./overlays
+    ./pkgs
+  ];
+}
diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix
new file mode 100644
index 0000000..08085f5
--- /dev/null
+++ b/modules/overlays/default.nix
@@ -0,0 +1,3 @@
+# this folder is for derivation overlays
+{...}: {
+}
diff --git a/pkgs/default.nix b/modules/pkgs/default.nix
similarity index 60%
rename from pkgs/default.nix
rename to modules/pkgs/default.nix
index b02ba6c..3e4456b 100644
--- a/pkgs/default.nix
+++ b/modules/pkgs/default.nix
@@ -1,3 +1,4 @@
+# this folder is for custom derivations
 {...}: {
   # package = pkgs.callPackage ./package.nix {};
 }
diff --git a/overlays/default.nix b/overlays/default.nix
deleted file mode 100644
index ea8f50d..0000000
--- a/overlays/default.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-{...}: {
-}
diff --git a/util/default.nix b/util/default.nix
index c64bd4d..ae298ad 100644
--- a/util/default.nix
+++ b/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,9 +59,10 @@ in {
       extraSpecialArgs = {
         inherit inputs util outputs osConfig;
       };
-      modules = [
-        ../overlays
-        ../homes/${user}
-      ];
+      modules =
+        home-manager-shared-modules
+        ++ [
+          ../homes/${user}
+        ];
     };
 }