treewide: restructure options

flake.nix

@@ -9,7 +9,7 @@
     nixpkgs,
     ...
   } @ inputs: let
-    mkNixosSystem = name: hostPath:
+    mkNixosSystem = _name: hostPath:
       nixos-stable.lib.nixosSystem {
         modules = [
           hostPath
@@ -18,7 +18,7 @@
         specialArgs = {inherit self inputs;};
       };
 
-    mkDarwinSystem = name: hostPath:
+    mkDarwinSystem = _name: hostPath:
       nix-darwin.lib.darwinSystem {
         modules = [
           hostPath

hosts/anemone/default.nix

@@ -18,24 +18,11 @@
 
   disabledModules = ["profiles/base.nix"];
 
-  settings = {
-    programs = {
-      enable = false;
-      cli.enable = true;
-      tui.enable = true;
-      categories = {
-        enable = false;
-        core.enable = true;
-      };
-    };
-    system = {
-      hostName = "anemone";
-      services = {
-        enable = false;
-        networking.enable = true;
-      };
-    };
-    desktop.enable = false;
+  profile = "server";
+  nest = {
+    system.hostName = "anemone";
+    services.enable = false;
+    programs.enable = false;
   };
 
   services.openssh = {

hosts/earthy/default.nix

@@ -9,17 +9,17 @@
     "${self}/modules/nixos"
   ];
 
-  settings = {
-    system = {
-      hostName = "earthy";
-      services.sync.enable = true;
+  profile = "desktop";
+  nest = {
+    system.hostName = "earthy";
+    services = {
+      syncthing.enable = true;
+      selfhost = {
+        mpd.enable = true;
+      };
     };
-  };
-
-  services.openssh = {
-    enable = true;
-    settings = {
-      PermitRootLogin = "yes";
+    programs = {
+      terminal.emulator.alacritty.enable = true;
     };
   };
 
@@ -34,21 +34,28 @@
     in ["${automount_opts},credentials=${config.age.secrets.samba.path}"];
   };
 
-  # tlp
-  services.tlp = {
-    enable = true;
-    settings = {
-      CPU_ENERGY_PERF_POLICY_AC = "performance";
-      CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power";
-      PLATFORM_PROFILE_ON_AC = "performance";
-      PLATFORM_PROFILE_ON_BAT = "low-power";
-      WIFI_PWR_ON_AC = "off"; # default: off
-      WIFI_PWR_ON_BAT = "off"; # default: on  todo)) trying to resolve samba frozen unit session slice issue
+  services = {
+    tlp = {
+      enable = true;
+      settings = {
+        CPU_ENERGY_PERF_POLICY_AC = "performance";
+        CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power";
+        PLATFORM_PROFILE_ON_AC = "performance";
+        PLATFORM_PROFILE_ON_BAT = "low-power";
+        WIFI_PWR_ON_AC = "off"; # default: off
+        WIFI_PWR_ON_BAT = "off"; # default: on  todo)) trying to resolve samba frozen unit session slice issue
+      };
     };
-  };
 
-  # fwupd
-  services.fwupd = {
-    enable = true;
+    openssh = {
+      enable = true;
+      settings = {
+        PermitRootLogin = "yes";
+      };
+    };
+
+    fwupd = {
+      enable = true;
+    };
   };
 }

hosts/starling/default.nix

@@ -4,7 +4,7 @@
   config,
   ...
 }: let
-  cfg = config.settings;
+  cfg = config.nest;
 in {
   imports = [
     "${self}/modules/darwin"
@@ -16,7 +16,8 @@ in {
     hostName = "starling";
   };
 
-  settings = {
+  profile = "desktop";
+  nest = {
     system = {
       user = let
         home = "/Users/${cfg.system.user.name}";
@@ -30,8 +31,9 @@ in {
         group = "staff";
         flakeDir = "${home}/Documents/git/flake";
       };
-      services.sync.enable = true;
     };
+    services.syncthing.enable = true; # TODO enable syncthing (disabled in module) - requires disabling syncthing network which is flagged
+    programs.terminal.emulator.alacritty.enable = true;
   };
 
   nix = {

modules/darwin/default.nix

@@ -1,13 +1,15 @@
 {config, ...}: let
-  inherit (config.settings.system) user;
+  inherit (config.nest.system) user;
 in {
   imports = [
-    ../shared
     ./desktop
     ./home
     ./homebrew.nix
     ./nix
     ./services
+
+    ../shared
+    ../lib
   ];
 
   users.users.${user.name}.home = user.home;

modules/darwin/desktop/aerospace.nix

@@ -3,11 +3,11 @@
     enable = false;
 
     settings = {
-      gaps = {
-        outer.left = 8;
-        outer.bottom = 8;
-        outer.top = 8;
-        outer.right = 8;
+      gaps.outer = {
+        left = 8;
+        bottom = 8;
+        top = 8;
+        right = 8;
       };
       mode.main.binding =
         {

modules/darwin/home/default.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  inherit (config.settings.system) user;
+  inherit (config.nest.system) user;
 in {
   home-manager.users.${user.name} = {
     imports = [

modules/darwin/home/glide-wm.nix

@@ -4,7 +4,7 @@
   osConfig,
   ...
 }: let
-  inherit (osConfig.settings.system.user) flakeDir;
+  inherit (osConfig.nest.system.user) flakeDir;
   mkLink = config.lib.file.mkOutOfStoreSymlink;
   settingsFile = mkLink "${flakeDir}/modules/darwin/home/glide.toml";
 in {

modules/lib/default.nix

@@ -0,0 +1,89 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkEnableOption toUpper getAttrFromPath concatStringsSep optionalString;
+
+  traceLogs = true;
+  trace = msg: x:
+    if traceLogs
+    then builtins.trace msg x
+    else x;
+in {
+  _module.args.lib' = {
+    # __functor allows a description to be optionally attached
+    # e.g. lib'.programType.cli "description" or lib'.programType.cli
+    programType = let
+      base = type: {
+        programType = type;
+        description = null;
+        __functor = self: description: self // {inherit description;};
+      };
+    in {
+      cli = base "cli";
+      gui = base "gui";
+    };
+
+    # group constructor (so the tree walker knows its a group)
+    mkProgramGroup = name: children: {inherit name children;};
+
+    mkProgramOptions = tree: let
+      # resolve a list-path against the final merged config
+      # e.g. ["nest" "programs" "shell" "git" "enable"]
+      get = path: getAttrFromPath path config;
+
+      # walk the tree recursively
+      #
+      # treePath:
+      # relative path from tree root
+      # grows on every decent (groups + plain attrsets)
+      # e.g. ["terminal" "tools"]
+      #
+      # parentEnablePaths:
+      # paths of every parent group enable
+      # grows on group nodes (mkProgramGroup)
+      # e.g. [["nest" "programs" "terminal" "tools" "enable"]]
+      #
+      # plain attrsets don't add parentEnablePaths, but treePath still advances
+      walk = treePath: parentEnablePaths:
+        builtins.mapAttrs (
+          name: value:
+            if value ? programType
+            # leaf node (program)
+            then let
+              typ = value.programType;
+              desc = value.description or "${toUpper typ} program ${name}";
+              default =
+                config.nest.programs.enable # global master
+                && config.nest.programs.${typ} # type (e.g. nest.programs.cli)
+                && builtins.all (x: x) (map get parentEnablePaths); # all parent groups enabled
+              defaultText =
+                "nest.programs.enable and nest.programs.${typ}"
+                + optionalString (parentEnablePaths != [])
+                (" and " + concatStringsSep " and " (map (concatStringsSep ".") parentEnablePaths));
+            in
+              trace "PROGRAM: name=${name}, treePath=[${concatStringsSep "," treePath}], parentEnablePaths=[${concatStringsSep "; " (map (concatStringsSep ".") parentEnablePaths)}], default=${builtins.toString default}"
+              {enable = mkEnableOption desc // {inherit default defaultText;};}
+              // builtins.removeAttrs value ["programType" "description" "__functor"]
+            # group node
+            else if value ? children
+            then let
+              fullPath = treePath ++ [name]; # e.g. ["terminal" "tools" "ripgrep"]
+              ancestorPath = ["nest" "programs"] ++ fullPath ++ ["enable"];
+            in
+              trace "GROUP: name=${value.name}, fullPath=[${concatStringsSep "," fullPath}], ancestorPath=[${concatStringsSep "," ancestorPath}]"
+              {enable = mkEnableOption value.name;}
+              // walk fullPath (parentEnablePaths ++ [ancestorPath]) (value.children)
+            # plain attrset (structural grouping without option)
+            else if builtins.isAttrs value
+            then
+              trace "ATTRSET: name=${name}, treePath=[${concatStringsSep "," treePath}] recursing"
+              (walk (treePath ++ [name]) parentEnablePaths value)
+            # pass through unchanged
+            else trace "VALUE: name=${name} (non-attrs, passing through)" value
+        );
+    in
+      walk [] [] tree;
+  };
+}

modules/nixos/default.nix

@@ -4,7 +4,7 @@
   config,
   ...
 }: let
-  inherit (config.settings.system) user;
+  inherit (config.nest.system) user;
 
   keys = [
     "${self}/keys/anemone.pub"
@@ -22,13 +22,20 @@ in {
     ./themes
 
     ../shared
+    ../lib
   ];
 
   users.users.${user.name} = {
     inherit (user) home;
     isNormalUser = true;
     extraGroups = ["networkmanager" "wheel" "dialout"];
-    shell = pkgs.zsh;
+    shell =
+      if user.shell == "zsh"
+      then pkgs.zsh
+      else if user.shell == "nushell"
+      then pkgs.nushell
+      else pkgs.bash;
+
     initialHashedPassword = "";
     openssh.authorizedKeys.keyFiles = keys;
   };

modules/nixos/desktop/niri.nix

@@ -5,11 +5,11 @@
   lib,
   ...
 }: let
-  cfg = config.settings.desktop.niri;
+  cfg = config.nest.desktop;
 in {
   imports = [inputs.niri.nixosModules.niri];
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (cfg.enable && cfg.niri.enable) {
     niri-flake.cache.enable = true;
     nixpkgs.overlays = [inputs.niri.overlays.niri];
 

modules/nixos/home/default.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  inherit (config.settings.system) user;
+  inherit (config.nest.system) user;
 in {
   home-manager.users.${user.name} = {
     imports = [

modules/nixos/home/desktop/niri/binds.nix

@@ -5,10 +5,10 @@
   osConfig,
   ...
 }: let
-  cfg = osConfig.settings.desktop.niri;
+  cfg = osConfig.nest.desktop;
   wpctl = lib.getExe' pkgs.wireplumber "wpctl";
 in {
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (cfg.enable && cfg.niri.enable) {
     programs.niri.settings.binds =
       {
         # ==== Actions ====

modules/nixos/home/desktop/niri/default.nix

@@ -5,13 +5,13 @@
   lib,
   ...
 }: let
-  cfg = osConfig.settings.desktop.niri;
+  cfg = osConfig.nest.desktop;
 in {
   imports = [
     ./binds.nix
   ];
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (cfg.enable && cfg.niri.enable) {
     programs.niri.settings = {
       animations.enable = true;
       prefer-no-csd = true;