diff --git a/.gitignore b/.gitignore
index fa425ae..16475c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 .tmp
 result
 .aider*
+.claude
diff --git a/flake.nix b/flake.nix
index aa557af..1c2d989 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,13 +66,8 @@
       mkHost =
         system: profile: modules:
         let
-          # Auto-import profile-specific module based on profile parameter
-          profileModule =
-            if profile == "server" then ./common/server-node.nix
-            else if profile == "workstation" then ./common/workstation-node.nix
-            else if profile == "desktop" then ./common/desktop-node.nix
-            else if profile == "cloud" then ./common/cloud-node.nix
-            else null;
+          # Profile parameter is only used by home-manager for user environment
+          # NixOS system configuration is handled via explicit imports in host configs
         in
         nixpkgs.lib.nixosSystem {
           system = system;
@@ -105,7 +100,7 @@
                 };
               };
             }
-          ] ++ nixpkgs.lib.optional (profileModule != null) profileModule ++ modules;
+          ] ++ modules;
           specialArgs = {
             inherit inputs self;
           };
@@ -136,9 +131,9 @@
     in
     {
       nixosConfigurations = {
-        c1 = mkHost "x86_64-linux" "server" [ ./hosts/c1 ];
-        c2 = mkHost "x86_64-linux" "server" [ ./hosts/c2 ];
-        c3 = mkHost "x86_64-linux" "server" [ ./hosts/c3 ];
+        c1 = mkHost "x86_64-linux" "minimal" [ ./hosts/c1 ];
+        c2 = mkHost "x86_64-linux" "minimal" [ ./hosts/c2 ];
+        c3 = mkHost "x86_64-linux" "minimal" [ ./hosts/c3 ];
         alo-cloud-1 = mkHost "aarch64-linux" "cloud" [ ./hosts/alo-cloud-1 ];
         zippy = mkHost "x86_64-linux" "minimal" [
           ethereum-nix.nixosModules.default
diff --git a/home/profiles/minimal.nix b/home/profiles/minimal.nix
new file mode 100644
index 0000000..027467b
--- /dev/null
+++ b/home/profiles/minimal.nix
@@ -0,0 +1,5 @@
+{ pkgs }:
+{
+  # Minimal profile: reuses server.nix for basic package list
+  packages = (import ./server.nix { inherit pkgs; }).packages;
+}
diff --git a/home/programs/minimal.nix b/home/programs/minimal.nix
new file mode 100644
index 0000000..e5718af
--- /dev/null
+++ b/home/programs/minimal.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+{
+  # Minimal profile: reuses server.nix for basic CLI programs
+  imports = [ ./server.nix ];
+}
diff --git a/hosts/alo-cloud-1/default.nix b/hosts/alo-cloud-1/default.nix
index b320478..d8569d9 100644
--- a/hosts/alo-cloud-1/default.nix
+++ b/hosts/alo-cloud-1/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ../../common/global
+    ../../common/cloud-node.nix  # Minimal system with Consul
     ./hardware.nix
     ./reverse-proxy.nix
   ];
diff --git a/hosts/chilly/default.nix b/hosts/chilly/default.nix
index 7098cc9..f3cfbf5 100644
--- a/hosts/chilly/default.nix
+++ b/hosts/chilly/default.nix
@@ -8,6 +8,7 @@
   imports = [
     ../../common/encrypted-btrfs-layout.nix
     ../../common/global
+    ../../common/workstation-node.nix # Dev tools (deploy-rs, docker, nix-ld)
     ../../common/cluster-member.nix  # Consul + storage clients
     ../../common/cluster-tools.nix    # Nomad CLI (no service)
     ./hardware.nix
diff --git a/hosts/sparky/default.nix b/hosts/sparky/default.nix
index ce34dc2..54e71f6 100644
--- a/hosts/sparky/default.nix
+++ b/hosts/sparky/default.nix
@@ -3,6 +3,7 @@
   imports = [
     ../../common/encrypted-btrfs-layout.nix
     ../../common/global
+    ../../common/desktop-node.nix     # Hyprland + GUI environment
     ../../common/cluster-member.nix  # Consul + storage clients
     ../../common/cluster-tools.nix    # Nomad CLI (no service)
     ./hardware.nix