Refactor common modules.

CLAUDE.md

@@ -6,17 +6,23 @@ NixOS cluster configuration using flakes. Homelab infrastructure with Nomad/Cons
 
 ```
 ├── common/
-│   ├── global/          # Applied to all hosts (backup, sops, users, etc.)
-│   ├── compute-node.nix # Nomad client + Consul agent + NFS client
-│   ├── cluster-node.nix # Nomad server + Consul server (for quorum members)
-│   ├── nfs-services-server.nix   # NFS server + btrfs replication (zippy)
-│   └── nfs-services-standby.nix  # NFS standby + receive replication (c1, c2)
+│   ├── global/                    # Applied to all hosts (backup, sops, users, etc.)
+│   ├── minimal-node.nix           # Base (ssh, user, boot, impermanence)
+│   ├── cluster-member.nix         # Consul + storage clients (NFS/CIFS/GlusterFS)
+│   ├── nomad-worker.nix           # Nomad client (runs jobs) + Docker + NFS deps
+│   ├── nomad-server.nix           # Enables Consul + Nomad server mode
+│   ├── cluster-tools.nix          # Just CLI tools (nomad, wander, damon)
+│   ├── workstation-node.nix       # Dev tools (wget, deploy-rs, docker, nix-ld)
+│   ├── desktop-node.nix           # Hyprland + GUI environment
+│   ├── nfs-services-server.nix    # NFS server + btrfs replication (zippy)
+│   └── nfs-services-standby.nix   # NFS standby + receive replication (c1)
 ├── hosts/
-│   ├── c1/, c2/, c3/    # Cattle nodes (compute, quorum members)
-│   ├── zippy/           # Primary storage + NFS server + stateful workloads
+│   ├── c1/, c2/, c3/    # Cattle nodes (quorum + workers)
+│   ├── zippy/           # Primary storage + NFS server + worker (not quorum)
+│   ├── chilly/          # Home Assistant VM + cluster member (Consul only)
+│   ├── sparky/          # Desktop + cluster member (Consul only)
 │   ├── fractal/         # (Proxmox, will become NixOS storage node)
-│   ├── sunny/           # (Standalone ethereum node, not in cluster)
-│   └── chilly/          # (Home Assistant VM, not in cluster)
+│   └── sunny/           # (Standalone ethereum node, not in cluster)
 ├── docs/
 │   ├── CLUSTER_REVAMP.md    # Master plan for architecture changes
 │   ├── MIGRATION_TODO.md    # Tracking checklist for migration
@@ -35,11 +41,32 @@ NixOS cluster configuration using flakes. Homelab infrastructure with Nomad/Cons
 - `/data/shared` - CIFS from fractal (existing, unchanged)
 
 ### Hosts
-- **c1, c2, c3**: Cattle nodes, run most workloads, Nomad/Consul quorum
-- **zippy**: Primary NFS server, runs databases (affinity), replicates to c1 every 5min
+- **c1, c2, c3**: Cattle nodes, run most workloads, Nomad/Consul quorum members
+- **zippy**: Primary NFS server, runs workloads (affinity), NOT quorum, replicates to c1 every 5min
+- **chilly**: Home Assistant VM, cluster member (Consul agent + CLI tools), no workloads
+- **sparky**: Desktop/laptop, cluster member (Consul agent + CLI tools), no workloads
 - **fractal**: Storage node (Proxmox/ZFS), will join quorum after GlusterFS removed
-- **sunny**: Standalone ethereum staking node
-- **chilly**: Home Assistant VM
+- **sunny**: Standalone ethereum staking node (not in cluster)
+
+## Config Architecture
+
+**Modular role-based configs** (compose as needed):
+- `minimal-node.nix` - Base for all systems (SSH, user, boot, impermanence)
+- `cluster-member.nix` - Consul agent + shared storage mounts (no Nomad)
+- `nomad-worker.nix` - Nomad client to run jobs (requires cluster-member)
+- `nomad-server.nix` - Enables Consul + Nomad server mode (for quorum members)
+- `cluster-tools.nix` - Just CLI tools (no services)
+
+**Machine type configs** (via flake profile):
+- `workstation-node.nix` - Dev tools (deploy-rs, docker, nix-ld, emulation)
+- `desktop-node.nix` - Extends workstation + Hyprland/GUI
+
+**Host composition examples**:
+- c1/c2/c3: `cluster-member + nomad-worker + nomad-server` (quorum + runs jobs)
+- zippy: `cluster-member + nomad-worker` (runs jobs, not quorum)
+- chilly/sparky: `cluster-member + cluster-tools` (Consul + CLI only)
+
+**Key insight**: Profiles (workstation/desktop) no longer imply cluster membership. Hosts explicitly declare roles via imports.
 
 ## Key Patterns