From b771b737d006e82f40ae674aeb0f4e70afed20b8 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Tue, 5 May 2026 16:13:26 -0500
Subject: [PATCH] Make host role options nested with .enable to match home
 modules and avoid conflicts

---
 hosts/roles/default.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/hosts/roles/default.nix b/hosts/roles/default.nix
index f89b1d9..c2dd0cc 100644
--- a/hosts/roles/default.nix
+++ b/hosts/roles/default.nix
@@ -1,15 +1,15 @@
 { lib, ... }: {
   options.roles = {
-    citrix = lib.mkEnableOption "Citrix Workspace client";
-    zoom = lib.mkEnableOption "Zoom client";
-    gui = lib.mkEnableOption "GUI environment";
-    games = lib.mkEnableOption "Gaming packages and Steam";
-    kvm = lib.mkEnableOption "Virtualization support (libvirtd, waydroid)";
-    kmscon = lib.mkEnableOption "Console improvements";
-    auto-cpufreq = lib.mkEnableOption "CPU power management";
-    gnome-calendar = lib.mkEnableOption "GNOME Calendar integration";
-    tlp = lib.mkEnableOption "TLP power management";
-    wine = lib.mkEnableOption "Wine for Windows compatibility";
+    citrix = { enable = lib.mkEnableOption "Citrix Workspace client"; };
+    zoom = { enable = lib.mkEnableOption "Zoom client"; };
+    gui = { enable = lib.mkEnableOption "GUI environment"; };
+    games = { enable = lib.mkEnableOption "Gaming packages and Steam"; };
+    kvm = { enable = lib.mkEnableOption "Virtualization support (libvirtd, waydroid)"; };
+    kmscon = { enable = lib.mkEnableOption "Console improvements"; };
+    auto-cpufreq = { enable = lib.mkEnableOption "CPU power management"; };
+    gnome-calendar = { enable = lib.mkEnableOption "GNOME Calendar integration"; };
+    tlp = { enable = lib.mkEnableOption "TLP power management"; };
+    wine = { enable = lib.mkEnableOption "Wine for Windows compatibility"; };
 
     # Window manager selection
     wm = lib.mkOption {
@@ -19,8 +19,8 @@
     };
 
     # Special host-specific roles
-    primary = lib.mkEnableOption "Primary workstation designation";
-    lmstudio = lib.mkEnableOption "LM Studio AI tools";
-    ollama = lib.mkEnableOption "Ollama AI server";
+    primary = { enable = lib.mkEnableOption "Primary workstation designation"; };
+    lmstudio = { enable = lib.mkEnableOption "LM Studio AI tools"; };
+    ollama = { enable = lib.mkEnableOption "Ollama AI server"; };
   };
 }
\ No newline at end of file