From 3d09e641398777f9e5d4b964bd580e9ac78c6b0f Mon Sep 17 00:00:00 2001
From: martyTF <marty@marty.tf>
Date: Tue, 16 Dec 2025 16:50:47 +0100
Subject: [PATCH] modularizing modules ig

---
 configuration.nix                  |  5 ++++-
 flake.nix                          |  9 ++++++---
 imports.nix                        | 29 ++++++++++++++++++++++++----
 modules/imports.nix                | 31 +++++++++++++++++++++++++-----
 modules/window_manager/imports.nix | 25 ++++++++++++++++++++----
 system/imports.nix                 |  2 +-
 6 files changed, 83 insertions(+), 18 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 98deeb3..3fec801 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -10,7 +10,10 @@
 }:
 
 {
-  nix.settings.experimental-features = [ "flakes" "nix-command" ];
+  nix.settings.experimental-features = [
+    "flakes"
+    "nix-command"
+  ];
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
diff --git a/flake.nix b/flake.nix
index ed971fa..6d6eba1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,22 +22,25 @@
         marty-pc = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
-            ./configuration.nix
             ./marty-pc.nix
+            ./configuration.nix
+
           ];
         };
         marty-server = nixpkgs.lib.nixosSystem {
           system = "x86_64";
           modules = [
-            ./configuration.nix
             ./marty-server.nix
+            ./configuration.nix
+
           ];
         };
         marty-latitude = nixpkgs.lib.nixosSystem {
           system = "x86_64";
           modules = [
-            ./configuration.nix
             ./marty-latitude.nix
+            ./configuration.nix
+
           ];
         };
       };
diff --git a/imports.nix b/imports.nix
index 5881ab0..3795046 100644
--- a/imports.nix
+++ b/imports.nix
@@ -5,9 +5,30 @@
   ...
 }:
 
+let
+  modules =
+    if config.networking.hostName == "marty-pc" then
+      [
+        ./system/import_system.nix
+        ./modules/imports.nix
+
+      ]
+    else if config.networking.hostName == "marty-latitude" then
+      [
+        ./system/import_system.nix
+        ./modules/imports.nix
+
+      ]
+    else if config.networking.hostName == "marty-server" then
+      [
+        ./system/import_system.nix
+        ./modules/imports.nix
+
+      ]
+    else
+      [ ];
+in
+
 {
-  imports = [
-    ./system/imports.nix
-    ./modules/imports.nix
-  ];
+  imports = modules;
 }
diff --git a/modules/imports.nix b/modules/imports.nix
index aeaf08c..961fa89 100644
--- a/modules/imports.nix
+++ b/modules/imports.nix
@@ -5,10 +5,31 @@
   ...
 }:
 
+let
+  modules =
+    if config.networking.hostName == "marty-pc" then
+      [
+        ./git.nix
+        ./vscodium.nix
+        ./window_manager/imports.nix
+
+      ]
+    else if config.networking.hostName == "marty-latitude" then
+      [
+        ./git.nix
+        ./vscodium.nix
+        ./window_manager/imports.nix
+
+      ]
+    else if config.networking.hostName == "marty-server" then
+      [
+        ./git.nix
+
+      ]
+    else
+      [ ];
+in
+
 {
-  imports = [
-    ./window_manager/imports.nix
-    ./git.nix
-    ./vscodium.nix
-  ];
+  imports = modules;
 }
diff --git a/modules/window_manager/imports.nix b/modules/window_manager/imports.nix
index 387d7b1..ffd5a01 100644
--- a/modules/window_manager/imports.nix
+++ b/modules/window_manager/imports.nix
@@ -5,9 +5,26 @@
   ...
 }:
 
+let
+  modules =
+    if config.networking.hostName == "marty-pc" then
+      [
+        ./hyprland.nix
+        ./waybar.nix
+      ]
+    else if config.networking.hostName == "marty-latitude" then
+      [
+        ./hyprland.nix
+        ./waybar.nix
+      ]
+    else if config.networking.hostName == "marty-server" then
+      [
+
+      ]
+    else
+      [ ];
+in
+
 {
-  imports = [
-    ./hyprland.nix
-    ./waybar.nix
-  ];
+  imports = modules;
 }
diff --git a/system/imports.nix b/system/imports.nix
index 3d1ec92..393374f 100644
--- a/system/imports.nix
+++ b/system/imports.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-{
+./system/imports.nix ./modules/imports.nix {
   imports = [
     ./boot.nix
   ];