refactor: Move sw into properly nested modules with unconditional import

sw/default.nix

@@ -10,19 +10,14 @@
 # Software Module Entry Point
 # ============================================================================
 # This module manages the software configuration for the system. It provides
-# options to select the system type ('desktop' or 'kiosk') and handles
-# the conditional importation of the appropriate sub-modules.
+# enable options for each system type (desktop, headless, builders, etc.)
+# that can be enabled independently or in combination. Each type is a proper
+# NixOS submodule with its own enable flag and type-specific options.
 
 with lib;
 
 let
   cfg = config.athenix.sw;
-
-  # Normalize type to always be a list
-  swTypes = if isList cfg.type then cfg.type else [ cfg.type ];
-
-  # Helper to check if a type is enabled
-  hasType = type: elem type swTypes;
 in
 {
   imports = [
@@ -31,169 +26,83 @@ in
     ./gc.nix
     ./updater.nix
     ./update-ref.nix
+    ./desktop
+    ./headless
+    ./builders
+    ./tablet-kiosk
+    ./stateless-kiosk
     inputs.home-manager.nixosModules.home-manager
     inputs.agenix.nixosModules.default
     inputs.disko.nixosModules.disko
   ];
 
   options.athenix.sw = {
-    enable = mkEnableOption "Standard Workstation Configuration";
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enable standard workstation configuration with base packages.
 
+        Provides:
+        - Base CLI tools (htop, git, binutils)
+        - Shell configuration (Zsh)
+        - Secret management (agenix)
+        - Oh My Posh shell theme
+
+        This is typically enabled automatically when any sw type is enabled.
+      '';
+    };
+
+    # DEPRECATED: Backwards compatibility for external modules
+    # Use athenix.sw.<type>.enable instead
     type = mkOption {
-      type = types.oneOf [
-        (types.enum [
-          "desktop"
-          "tablet-kiosk"
-          "headless"
-          "stateless-kiosk"
-          "builders"
-        ])
-        (types.listOf (
-          types.enum [
-            "desktop"
-            "tablet-kiosk"
-            "headless"
-            "stateless-kiosk"
-            "builders"
-          ]
-        ))
-      ];
-      default = "desktop";
-      description = "Type(s) of system configuration. Can be a single type or a list of types to combine multiple configurations.";
+      type = types.nullOr (types.either types.str (types.listOf types.str));
+      default = null;
+      description = "DEPRECATED: Use athenix.sw.<type>.enable instead. Legacy type selection.";
+      visible = false;
     };
 
     extraPackages = mkOption {
       type = types.listOf types.package;
       default = [ ];
-      description = "Extra packages to install.";
+      description = ''
+        Additional system packages to install beyond the defaults.
+        These packages are added to environment.systemPackages.
+      '';
+      example = lib.literalExpression "[ pkgs.vim pkgs.wget pkgs.curl ]";
     };
 
     excludePackages = mkOption {
       type = types.listOf types.package;
       default = [ ];
-      description = "Packages to exclude from the default list.";
-    };
-
-    kioskUrl = mkOption {
-      type = types.str;
-      default = "https://ha.factory.uga.edu";
-      description = "URL to open in Chromium kiosk mode.";
-    };
-
-    # Builders-specific options
-    builders = mkOption {
-      type = types.submodule {
-        options = {
-          giteaRunner = {
-            enable = mkEnableOption "Gitea Actions self-hosted runner";
-
-            url = mkOption {
-              type = types.str;
-              description = "Gitea instance URL for the runner";
-            };
-
-            tokenFile = mkOption {
-              type = types.path;
-              default = "/var/lib/gitea-runner-token";
-              description = ''
-                Path to file containing Gitea runner token.
-                Generate in Gitea repository settings under Actions > Runners.
-                The token must have runner registration access.
-              '';
-            };
-
-            extraLabels = mkOption {
-              type = types.listOf types.str;
-              default = [ ];
-              description = "Extra labels to identify this runner in workflows";
-            };
-
-            name = mkOption {
-              type = types.str;
-              default = "athenix";
-              description = "Name of the Gitea runner service";
-            };
-          };
-        };
-      };
-      default = { };
-      description = "Builder-specific configuration options";
+      description = ''
+        Packages to exclude from the default package list.
+        Useful for removing unwanted default packages.
+      '';
+      example = lib.literalExpression "[ pkgs.htop ]";
     };
   };
 
-  config = mkIf cfg.enable (mkMerge [
-    {
-      # ========== System-Wide Configuration ==========
-      nixpkgs.config.allowUnfree = true;
+  config = mkIf cfg.enable {
+    # ========== System-Wide Configuration ==========
+    nixpkgs.config.allowUnfree = true;
 
-      # ========== Shell Configuration ==========
-      programs.zsh.enable = true;
-      programs.nix-ld.enable = true; # Allow running non-NixOS binaries
+    # ========== Shell Configuration ==========
+    programs.zsh.enable = true;
+    programs.nix-ld.enable = true; # Allow running non-NixOS binaries
 
-      # ========== Base Packages ==========
-      environment.systemPackages =
-        with pkgs;
-        subtractLists cfg.excludePackages [
-          htop # System monitor
-          binutils # Binary utilities
-          zsh # Z shell
-          git # Version control
-          oh-my-posh # Shell prompt theme
-          age # Simple file encryption tool
-          age-plugin-fido2-hmac # age FIDO2 support
-          inputs.agenix.packages.${stdenv.hostPlatform.system}.default # Secret management
-        ];
-    }
-    # ========== Software Profile Imports ==========
-    (mkIf (hasType "desktop") (
-      import ./desktop {
-        inherit
-          config
-          lib
-          pkgs
-          inputs
-          ;
-      }
-    ))
-    (mkIf (hasType "tablet-kiosk") (
-      import ./tablet-kiosk {
-        inherit
-          config
-          lib
-          pkgs
-          inputs
-          ;
-      }
-    ))
-    (mkIf (hasType "headless") (
-      import ./headless {
-        inherit
-          config
-          lib
-          pkgs
-          inputs
-          ;
-      }
-    ))
-    (mkIf (hasType "stateless-kiosk") (
-      import ./stateless-kiosk {
-        inherit
-          config
-          lib
-          pkgs
-          inputs
-          ;
-      }
-    ))
-    (mkIf (hasType "builders") (
-      import ./builders {
-        inherit
-          config
-          lib
-          pkgs
-          inputs
-          ;
-      }
-    ))
-  ]);
+    # ========== Base Packages ==========
+    environment.systemPackages =
+      with pkgs;
+      subtractLists cfg.excludePackages [
+        htop # System monitor
+        binutils # Binary utilities
+        zsh # Z shell
+        git # Version control
+        oh-my-posh # Shell prompt theme
+        age # Simple file encryption tool
+        age-plugin-fido2-hmac # age FIDO2 support
+        inputs.agenix.packages.${stdenv.hostPlatform.system}.default # Secret management
+      ];
+  };
 }