Rearrange things

home-manager/image.nix

@@ -1,4 +1,4 @@
-{ lib, inputs, hostname, username, desktop, hmStateVersion, system, isimage, ... }: {
+{ lib, inputs, hostname, username, desktop, hmStateVersion, isImage, ... }: {
   imports = [ 
     # Common configs
     ./common/software/cli
@@ -16,10 +16,10 @@
   ++ lib.optional (builtins.isString desktop) ./common/software/gui                    # GUI packages
   ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop}             # Machine-agnostic desktop configs
   ++ lib.optional (builtins.isString desktop) ./hosts/${hostname}/desktops/${desktop}  # Machine-specific desktop configs
-  ++ lib.optional (builtins.isString isiamge) ./common/image-specific.nix              # Image specific items
+  ++ lib.optional (builtins.isString isImage) ./common/image-specific.nix              # Image specific items
   ;
 
-  programs.atuin.enable = mkDefault false; 
+  programs.atuin.enable = lib.mkDefault false; 
   
   news.display = "silent";
   home = {

lib/default.nix

@@ -175,7 +175,7 @@
     format = format;
 
     modules = [
-      ../nixos/small.nix
+      ../nixos/base.nix
       ../nixos/common/modules/installer.nix
       inputs.sops-nix.nixosModules.sops
     ];

nixos/base.nix

@@ -0,0 +1,27 @@
+{ inputs, lib,hostname, username, desktop, ... }: {
+  imports = [ 
+    # Services
+    ./common/services/tailscale.nix
+    ./common/services/promtail.nix
+    ./common/services/telegraf.nix
+
+    # NixOS Modules
+    ./common/modules/networking.nix      # Initial Networking configs
+    ./common/modules/nixos.nix           # Common NixOS Configurations
+    ./common/modules/remote-builders.nix # Add remote builders
+
+    ./users/${username}
+    ./hosts/${hostname}
+  ]; 
+ 
+  documentation = {
+    enable = false;
+    man.enable = false;
+    info.enable = false;
+    doc.enable = false; 
+    dev.enable = false;
+    nixos.enable = false;
+  };
+ 
+  programs.fish.enable = true;
+}

nixos/default.nix

@@ -1,4 +1,4 @@
-{ inputs, lib, hostname, username, desktop, ... }: {
+{ ... }: {
   imports = [ 
     # Modules
     ./small.nix

nixos/small.nix

@@ -1,14 +1,12 @@
 { inputs, lib,hostname, username, desktop, ... }: {
   imports = [ 
     # Modules
+    ./base.nix
     inputs.disko.nixosModules.disko
     
     # Services
     ./common/services/openssh.nix
     ./common/services/fail2ban.nix
-    ./common/services/tailscale.nix
-    ./common/services/promtail.nix
-    ./common/services/telegraf.nix
 
     # Software
     ./common/software/cli/scripts.nix
@@ -19,17 +17,5 @@
     ./common/modules/nixos.nix           # Common NixOS Configurations
     ./common/modules/remote-builders.nix # Add remote builders
 
-    ./users/${username}
-    ./hosts/${hostname}
   ] ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop};
- 
-  documentation = {
-    enable = false;
-    man.enable = false;
-    info.enable = false;
-    doc.enable = false; 
-    dev.enable = false;
-    nixos.enable = false;
-  };
-  programs.fish.enable = true;
 }