feat(audit): address batch 3 of missing scripts

- Implement nomarchy-pkg-install, nomarchy-pkg-drop, nomarchy-pkg-aur-add (stub)
- Implement nomarchy-theme, nomarchy-font, nomarchy-wallpaper wrappers
- Update docs/SCRIPTS.md with 'kept' status for new scripts

core/system/hardware.nix

@@ -10,9 +10,18 @@ in
     isT2Mac = mkEnableOption "Apple T2 MacBook specific hardware fixes";
     isFramework = mkEnableOption "Framework laptop specific hardware fixes";
     hasIPU7Camera = mkEnableOption "Intel IPU7 camera support";
+    fwupd = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Whether to enable fwupd firmware update service.";
+    };
   };
 
   config = mkMerge [
+    (mkIf cfg.fwupd {
+      services.fwupd.enable = true;
+    })
+
     (mkIf cfg.isXPS {
       services.udev.extraRules = ''
         ACTION=="add", SUBSYSTEM=="pci", KERNEL=="0000:00:19.0", ATTR{power/control}="on"

core/system/scripts-derivation.nix

@@ -30,6 +30,9 @@ let
     bc
     supergfxctl
     systemd
+    fwupd
+    hyprland
+    swayosd
   ];
 in
 pkgs.stdenv.mkDerivation {

docs/SCRIPTS.md

@@ -24,7 +24,7 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
 - `delete-dead` — Phase B verdict: remove and update callers.
 - `stub-with-notify` — Phase B verdict: temporary `notify-send` stub.
 
-## Scripts (131)
+## Scripts (162)
 
 | Script | Location | Callers | Status | Notes |
 | --- | --- | --- | --- | --- |
@@ -46,13 +46,15 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
 | `nomarchy-cmd-share` | `features/scripts/utils` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-cmd-terminal-cwd` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/plain-bindings.conf,features/desktop/hyprland/config/bindings.conf | `kept` |  |
 | `nomarchy-config-direct-boot` | `features/scripts/utils` | — | `unused?` |  |
+| `nomarchy-debug` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` |  |
 | `nomarchy-drive-info` | `features/scripts/utils` | features/scripts/utils/nomarchy-drive-select | `kept` |  |
 | `nomarchy-drive-select` | `features/scripts/utils` | features/scripts/utils/nomarchy-drive-info,features/scripts/utils/nomarchy-drive-set-password | `kept` |  |
 | `nomarchy-drive-set-password` | `features/scripts/utils` | features/scripts/utils/nomarchy-drive-select,features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-env-update` | `features/scripts/utils` | core/home/bash.nix,core/system/scripts/nomarchy-pkg-add, +8 more | `kept` |  |
+| `nomarchy-font` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,core/system/fonts.nix, +6 more | `kept` |  |
 | `nomarchy-font-current` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu | `kept` |  |
-| `nomarchy-font-list` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +1 more | `kept` |  |
+| `nomarchy-font-list` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-font, +2 more | `kept` |  |
-| `nomarchy-font-set` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +3 more | `kept` |  |
+| `nomarchy-font-set` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-font, +4 more | `kept` |  |
 | `nomarchy-haptic-touchpad` | `core/system/scripts` | core/system/hardware.nix | `kept` |  |
 | `nomarchy-hibernation-available` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-hibernation-remove` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
@@ -61,6 +63,13 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
 | `nomarchy-hw-asus-rog` | `core/system/scripts` | features/scripts/utils/nomarchy-on-boot | `kept` |  |
 | `nomarchy-hw-match` | `core/system/scripts` | features/scripts/utils/nomarchy-on-boot | `kept` |  |
 | `nomarchy-hw-vulkan` | `core/system/scripts` | features/scripts/utils/nomarchy-voxtype-install | `kept` |  |
+| `nomarchy-hyprland-active-window-transparency-toggle` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf | `kept` |  |
+| `nomarchy-hyprland-monitor-scaling-cycle` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/tiling-v2.conf,features/scripts/utils/nomarchy-menu, +1 more | `kept` |  |
+| `nomarchy-hyprland-window-close-all` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/tiling.conf,core/home/config/nomarchy/default/hypr/bindings/tiling-v2.conf, +3 more | `kept` |  |
+| `nomarchy-hyprland-window-gaps-toggle` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,features/scripts/utils/nomarchy-menu | `kept` |  |
+| `nomarchy-hyprland-window-pop` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/tiling-v2.conf | `kept` |  |
+| `nomarchy-hyprland-window-single-square-aspect-toggle` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,features/scripts/utils/nomarchy-menu | `kept` |  |
+| `nomarchy-hyprland-workspace-layout-toggle` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/tiling-v2.conf,features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-launch-about` | `features/scripts/utils` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-launch-audio` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,features/desktop/waybar/config/config.jsonc, +2 more | `kept` |  |
 | `nomarchy-launch-bluetooth` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,features/desktop/waybar/config/config.jsonc, +1 more | `kept` |  |
@@ -82,22 +91,36 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
 | `nomarchy-notification-dismiss` | `features/scripts/utils` | — | `unused?` |  |
 | `nomarchy-npx-install` | `features/scripts/utils` | — | `unused?` |  |
 | `nomarchy-on-boot` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/autostart.conf | `kept` |  |
-| `nomarchy-pkg-add` | `core/system/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-voxtype-install, +1 more | `kept` |  |
+| `nomarchy-pkg-add` | `core/system/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-pkg-install, +2 more | `kept` |  |
-| `nomarchy-pkg-remove` | `core/system/scripts` | — | `unused?` |  |
+| `nomarchy-pkg-aur-add` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` |  |
+| `nomarchy-pkg-drop` | `features/scripts/utils` | features/scripts/utils/nomarchy-voxtype-remove | `kept` |  |
+| `nomarchy-pkg-install` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` |  |
+| `nomarchy-pkg-remove` | `core/system/scripts` | features/scripts/utils/nomarchy-pkg-drop | `kept` |  |
 | `nomarchy-powerprofiles-list` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-preflight-migration` | `core/system/scripts` | features/scripts/utils/nomarchy-env-update,features/scripts/utils/nomarchy-migrate-state | `kept` |  |
 | `nomarchy-refresh-config` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-refresh-fastfetch | `kept` |  |
 | `nomarchy-refresh-fastfetch` | `features/scripts/utils` | — | `unused?` |  |
-| `nomarchy-restart-app` | `features/scripts/utils` | core/system/scripts/nomarchy-restart-xcompose,features/desktop/scripts/nomarchy-restart-hypridle, +3 more | `kept` |  |
+| `nomarchy-refresh-hyprland` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` |  |
+| `nomarchy-refresh-waybar` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` |  |
+| `nomarchy-reinstall` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` |  |
+| `nomarchy-restart-app` | `features/scripts/utils` | core/system/scripts/nomarchy-restart-xcompose,features/scripts/utils/nomarchy-restart-hypridle, +3 more | `kept` |  |
 | `nomarchy-restart-bluetooth` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-restart-btop` | `features/scripts/utils` | themes/engine/scripts/nomarchy-theme-set | `kept` |  |
+| `nomarchy-restart-hyprctl` | `features/scripts/utils` | — | `unused?` |  |
+| `nomarchy-restart-hypridle` | `features/scripts/utils` | features/scripts/utils/nomarchy-menu | `kept` |  |
+| `nomarchy-restart-hyprsunset` | `features/scripts/utils` | features/scripts/utils/nomarchy-menu | `kept` |  |
+| `nomarchy-restart-mako` | `features/scripts/utils` | — | `unused?` |  |
 | `nomarchy-restart-opencode` | `features/scripts/utils` | themes/engine/scripts/nomarchy-theme-set | `kept` |  |
 | `nomarchy-restart-pipewire` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
+| `nomarchy-restart-swayosd` | `features/scripts/utils` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-restart-terminal` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` |  |
 | `nomarchy-restart-tmux` | `features/scripts/utils` | — | `unused?` |  |
 | `nomarchy-restart-trackpad` | `core/system/scripts` | — | `unused?` |  |
+| `nomarchy-restart-walker` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +1 more | `kept` |  |
+| `nomarchy-restart-waybar` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +4 more | `kept` |  |
 | `nomarchy-restart-wifi` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-restart-xcompose` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
+| `nomarchy-rollback` | `features/scripts/utils` | installer/disko-golden.nix | `kept` |  |
 | `nomarchy-setup-dns` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-setup-fido2` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-setup-fingerprint` | `core/system/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu | `kept` |  |
@@ -109,6 +132,8 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
 | `nomarchy-sudo-keepalive` | `core/system/scripts` | — | `unused?` |  |
 | `nomarchy-sudo-passwordless-toggle` | `core/system/scripts` | — | `unused?` |  |
 | `nomarchy-sudo-reset` | `core/system/scripts` | — | `unused?` |  |
+| `nomarchy-swayosd-brightness` | `core/system/scripts` | core/system/scripts/nomarchy-brightness-display,core/system/scripts/nomarchy-brightness-display-apple | `kept` |  |
+| `nomarchy-swayosd-kbd-brightness` | `core/system/scripts` | core/system/scripts/nomarchy-brightness-keyboard | `kept` |  |
 | `nomarchy-sync` | `features/scripts/utils` | README.md | `kept` |  |
 | `nomarchy-system-logout` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-system-reboot` | `core/system/scripts` | core/home/config/nomarchy-skill/SKILL.md,core/system/scripts/nomarchy-hibernation-setup, +2 more | `kept` |  |
@@ -117,15 +142,16 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
 | `nomarchy-test-installer` | `features/scripts/utils` | features/scripts/utils/nomarchy-test-vm,README.md | `kept` |  |
 | `nomarchy-test-live-iso` | `features/scripts/utils` | hosts/live-iso.nix | `kept` |  |
 | `nomarchy-test-vm` | `features/scripts/utils` | features/scripts/utils/nomarchy-test-live-iso | `kept` |  |
+| `nomarchy-theme` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +14 more | `kept` |  |
 | `nomarchy-theme-bg-install` | `themes/engine/scripts` | — | `unused?` |  |
-| `nomarchy-theme-bg-next` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,README.md | `kept` |  |
+| `nomarchy-theme-bg-next` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-wallpaper, +1 more | `kept` |  |
 | `nomarchy-theme-bg-set` | `themes/engine/scripts` | — | `unused?` |  |
 | `nomarchy-theme-current` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md | `kept` |  |
 | `nomarchy-theme-install` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md | `kept` |  |
-| `nomarchy-theme-list` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-welcome | `kept` |  |
+| `nomarchy-theme-list` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-theme, +1 more | `kept` |  |
 | `nomarchy-theme-refresh` | `themes/engine/scripts` | — | `unused?` |  |
 | `nomarchy-theme-remove` | `themes/engine/scripts` | — | `unused?` |  |
-| `nomarchy-theme-set` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-on-boot, +7 more | `kept` |  |
+| `nomarchy-theme-set` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-on-boot, +8 more | `kept` |  |
 | `nomarchy-theme-set-keyboard` | `themes/engine/scripts` | features/scripts/utils/nomarchy-on-boot | `kept` |  |
 | `nomarchy-theme-set-keyboard-asus-rog` | `themes/engine/scripts` | features/scripts/utils/nomarchy-on-boot,themes/engine/scripts/nomarchy-theme-set-keyboard | `kept` |  |
 | `nomarchy-theme-set-keyboard-f16` | `themes/engine/scripts` | features/scripts/utils/nomarchy-on-boot,themes/engine/scripts/nomarchy-theme-set-keyboard | `kept` |  |
@@ -137,6 +163,7 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
 | `nomarchy-toggle-idle` | `core/system/scripts` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,features/desktop/waybar/config/config.jsonc, +2 more | `kept` |  |
 | `nomarchy-toggle-nightlight` | `themes/engine/scripts` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,core/home/config/nomarchy-skill/SKILL.md, +1 more | `kept` |  |
 | `nomarchy-toggle-notification-silencing` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,features/desktop/waybar/config/config.jsonc, +1 more | `kept` |  |
+| `nomarchy-toggle-screensaver` | `features/scripts/utils` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-toggle-suspend` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-toggle-waybar` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,core/home/config/nomarchy-skill/SKILL.md, +1 more | `kept` |  |
 | `nomarchy-tui-install` | `features/scripts/utils` | features/scripts/utils/nomarchy-tui-remove-all | `kept` |  |
@@ -145,12 +172,16 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
 | `nomarchy-tz-select` | `core/system/scripts` | features/desktop/waybar/config/config.jsonc,features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-update` | `core/system/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/desktop/waybar/config/config.jsonc, +3 more | `kept` |  |
 | `nomarchy-update-available` | `features/scripts/utils` | features/desktop/waybar/config/config.jsonc,features/desktop/waybar/themes/summer-night/config.jsonc | `kept` |  |
+| `nomarchy-update-firmware` | `features/scripts/utils` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-update-time` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
+| `nomarchy-upload-log` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-debug | `kept` |  |
+| `nomarchy-version` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-debug, +1 more | `kept` |  |
 | `nomarchy-voxtype-config` | `features/scripts/utils` | features/desktop/waybar/config/config.jsonc,features/desktop/waybar/themes/summer-night/config.jsonc | `kept` |  |
 | `nomarchy-voxtype-install` | `features/scripts/utils` | — | `unused?` |  |
 | `nomarchy-voxtype-model` | `features/scripts/utils` | features/desktop/waybar/config/config.jsonc,features/desktop/waybar/themes/summer-night/config.jsonc | `kept` |  |
 | `nomarchy-voxtype-remove` | `features/scripts/utils` | — | `unused?` |  |
 | `nomarchy-voxtype-status` | `features/scripts/utils` | features/desktop/waybar/config/config.jsonc,features/desktop/waybar/themes/summer-night/config.jsonc | `kept` |  |
+| `nomarchy-wallpaper` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/autostart.conf,features/desktop/hyprland/default.nix, +2 more | `kept` |  |
 | `nomarchy-webapp-handler-hey` | `features/scripts/utils` | — | `unused?` |  |
 | `nomarchy-webapp-handler-zoom` | `features/scripts/utils` | — | `unused?` |  |
 | `nomarchy-webapp-install` | `features/scripts/utils` | features/scripts/utils/nomarchy-webapp-remove-all | `kept` |  |
@@ -168,19 +199,10 @@ Tokens grepped from `core/`, `features/`, `themes/`, `installer/`, `hosts/`, `bi
 | --- | --- | --- |
 | `nomarchy-backup` | features/scripts/utils/nomarchy-sync | `missing` |
 | `nomarchy-cmd-` | core/home/config/nomarchy/default/hypr/bindings/media.conf,core/home/config/nomarchy/default/hypr/bindings/utilities.conf, +14 more | `missing` |
-| `nomarchy-debug` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
 | `nomarchy-docs-keybindings` | bin/utils/nomarchy-docs-keybindings | `missing` |
 | `nomarchy-docs-scripts` | bin/utils/nomarchy-docs-scripts | `missing` |
 | `nomarchy-dryrun` | installer/install.sh | `missing` |
-| `nomarchy-font` | core/home/config/nomarchy-skill/SKILL.md,core/system/fonts.nix, +6 more | `missing` |
+| `nomarchy-font-selector` | features/scripts/utils/nomarchy-font,themes/engine/switcher.nix | `missing` |
-| `nomarchy-font-selector` | themes/engine/switcher.nix | `missing` |
-| `nomarchy-hyprland-active-window-transparency-toggle` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf | `missing` |
-| `nomarchy-hyprland-monitor-scaling-cycle` | core/home/config/nomarchy/default/hypr/bindings/tiling-v2.conf,features/scripts/utils/nomarchy-menu, +1 more | `missing` |
-| `nomarchy-hyprland-window-close-all` | core/home/config/nomarchy/default/hypr/bindings/tiling.conf,core/home/config/nomarchy/default/hypr/bindings/tiling-v2.conf, +3 more | `missing` |
-| `nomarchy-hyprland-window-gaps-toggle` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,features/scripts/utils/nomarchy-menu | `missing` |
-| `nomarchy-hyprland-window-pop` | core/home/config/nomarchy/default/hypr/bindings/tiling-v2.conf,features/desktop/scripts/nomarchy-hyprland-window-pop | `missing` |
-| `nomarchy-hyprland-window-single-square-aspect-toggle` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,features/scripts/utils/nomarchy-menu | `missing` |
-| `nomarchy-hyprland-workspace-layout-toggle` | core/home/config/nomarchy/default/hypr/bindings/tiling-v2.conf,features/scripts/utils/nomarchy-menu | `missing` |
 | `nomarchy-install` | core/home/config/nomarchy-skill/SKILL.md,hosts/installer-iso.nix, +2 more | `missing` |
 | `nomarchy-install-` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
 | `nomarchy-install-docker-dbs` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
@@ -190,47 +212,27 @@ Tokens grepped from `core/`, `features/`, `themes/`, `installer/`, `hosts/`, `bi
 | `nomarchy-manual` | features/scripts/utils/nomarchy-menu,themes/engine/scripts/nomarchy-theme-install | `missing` |
 | `nomarchy-menu-rows` | bin/utils/nomarchy-docs-scripts | `missing` |
 | `nomarchy-nopasswd-` | core/system/scripts/nomarchy-sudo-passwordless-toggle | `missing` |
-| `nomarchy-pkg` | core/home/config/nomarchy-skill/SKILL.md,core/system/scripts/nomarchy-pkg-add, +4 more | `missing` |
+| `nomarchy-pkg` | core/home/config/nomarchy-skill/SKILL.md,core/system/scripts/nomarchy-pkg-add, +6 more | `missing` |
-| `nomarchy-pkg-` | core/home/config/nomarchy-skill/SKILL.md,core/system/scripts/nomarchy-pkg-add, +4 more | `missing` |
+| `nomarchy-pkg-` | core/home/config/nomarchy-skill/SKILL.md,core/system/scripts/nomarchy-pkg-add, +6 more | `missing` |
-| `nomarchy-pkg-aur-add` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
-| `nomarchy-pkg-drop` | features/scripts/utils/nomarchy-voxtype-remove | `missing` |
-| `nomarchy-pkg-install` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
 | `nomarchy-plymouth` | themes/engine/plymouth.nix | `missing` |
 | `nomarchy-refresh-` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-refresh-config, +1 more | `missing` |
-| `nomarchy-refresh-hyprland` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
+| `nomarchy-restart` | core/home/config/nomarchy-skill/SKILL.md,core/system/scripts/nomarchy-restart-xcompose, +10 more | `missing` |
-| `nomarchy-refresh-waybar` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
+| `nomarchy-restart-` | core/home/config/nomarchy-skill/SKILL.md,core/system/scripts/nomarchy-restart-xcompose, +10 more | `missing` |
-| `nomarchy-reinstall` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
-| `nomarchy-restart` | core/home/config/nomarchy-skill/SKILL.md,core/system/scripts/nomarchy-restart-xcompose, +9 more | `missing` |
-| `nomarchy-restart-` | core/home/config/nomarchy-skill/SKILL.md,core/system/scripts/nomarchy-restart-xcompose, +9 more | `missing` |
-| `nomarchy-restart-hypridle` | features/scripts/utils/nomarchy-menu | `missing` |
-| `nomarchy-restart-hyprsunset` | features/scripts/utils/nomarchy-menu | `missing` |
-| `nomarchy-restart-swayosd` | features/scripts/utils/nomarchy-menu | `missing` |
-| `nomarchy-restart-walker` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +1 more | `missing` |
-| `nomarchy-restart-waybar` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +3 more | `missing` |
-| `nomarchy-rollback` | installer/disko-golden.nix | `missing` |
 | `nomarchy-screenrecord-filename` | features/scripts/utils/nomarchy-cmd-screenrecord | `missing` |
 | `nomarchy-scripts` | core/system/scripts/nomarchy-preflight-migration,features/scripts/battery-monitor.nix, +1 more | `missing` |
 | `nomarchy-sddm-theme` | themes/engine/sddm.nix | `missing` |
 | `nomarchy-setup-` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu | `missing` |
 | `nomarchy-skill` | core/home/configs.nix | `missing` |
-| `nomarchy-swayosd-brightness` | core/system/scripts/nomarchy-brightness-display,core/system/scripts/nomarchy-brightness-display-apple, +1 more | `missing` |
-| `nomarchy-swayosd-kbd-brightness` | core/system/scripts/nomarchy-brightness-keyboard,features/desktop/scripts/nomarchy-swayosd-kbd-brightness | `missing` |
 | `nomarchy-system-scripts` | core/system/hardware.nix,core/system/scripts-derivation.nix, +1 more | `missing` |
-| `nomarchy-theme` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +13 more | `missing` |
+| `nomarchy-theme-` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +15 more | `missing` |
-| `nomarchy-theme-` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +13 more | `missing` |
 | `nomarchy-theme-engine-scripts` | themes/engine/scripts.nix | `missing` |
 | `nomarchy-theme-next` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
-| `nomarchy-theme-selector` | themes/engine/switcher.nix | `missing` |
+| `nomarchy-theme-selector` | features/scripts/utils/nomarchy-theme,themes/engine/switcher.nix | `missing` |
 | `nomarchy-themes-no-images` | themes/engine/files.nix | `missing` |
-| `nomarchy-toggle-` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,core/home/config/nomarchy-skill/SKILL.md, +4 more | `missing` |
+| `nomarchy-toggle-` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,core/home/config/nomarchy-skill/SKILL.md, +3 more | `missing` |
-| `nomarchy-toggle-screensaver` | features/scripts/utils/nomarchy-menu | `missing` |
 | `nomarchy-update-` | features/desktop/waybar/config/config.jsonc,features/desktop/waybar/themes/summer-night/config.jsonc, +1 more | `missing` |
-| `nomarchy-update-firmware` | features/scripts/utils/nomarchy-menu | `missing` |
-| `nomarchy-upload-log` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
-| `nomarchy-version` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-snapshot | `missing` |
 | `nomarchy-vm` | features/scripts/utils/nomarchy-test-vm | `missing` |
-| `nomarchy-wallpaper` | core/home/config/nomarchy/default/hypr/autostart.conf,features/desktop/hyprland/default.nix, +2 more | `missing` |
+| `nomarchy-wallpaper-selector` | features/scripts/utils/nomarchy-wallpaper,themes/engine/switcher.nix | `missing` |
-| `nomarchy-wallpaper-selector` | themes/engine/switcher.nix | `missing` |
 | `nomarchy-webapp-handler` | features/scripts/utils/nomarchy-webapp-remove,features/scripts/utils/nomarchy-webapp-remove-all | `missing` |
 | `nomarchy-windows` | features/scripts/utils/nomarchy-windows-vm | `missing` |
 
@@ -256,14 +258,14 @@ Walked from `features/scripts/utils/nomarchy-menu`. Each `case` arm in a `show_*
 | `show_share_menu` | Clipboard | `nomarchy-cmd-share` | `kept` |
 | `show_share_menu` | File | `nomarchy-cmd-share` | `kept` |
 | `show_share_menu` | Folder | `nomarchy-cmd-share` | `kept` |
-| `show_toggle_menu` | Screensaver | `nomarchy-toggle-screensaver` | `missing` |
+| `show_toggle_menu` | Screensaver | `nomarchy-toggle-screensaver` | `kept` |
 | `show_toggle_menu` | Nightlight | `nomarchy-toggle-nightlight` | `kept` |
 | `show_toggle_menu` | Idle | `nomarchy-toggle-idle` | `kept` |
 | `show_toggle_menu` | Bar | `nomarchy-toggle-waybar` | `kept` |
-| `show_toggle_menu` | Layout | `nomarchy-hyprland-workspace-layout-toggle` | `missing` |
+| `show_toggle_menu` | Layout | `nomarchy-hyprland-workspace-layout-toggle` | `kept` |
-| `show_toggle_menu` | Ratio | `nomarchy-hyprland-window-single-square-aspect-toggle` | `missing` |
+| `show_toggle_menu` | Ratio | `nomarchy-hyprland-window-single-square-aspect-toggle` | `kept` |
-| `show_toggle_menu` | Gaps | `nomarchy-hyprland-window-gaps-toggle` | `missing` |
+| `show_toggle_menu` | Gaps | `nomarchy-hyprland-window-gaps-toggle` | `kept` |
-| `show_toggle_menu` | Scaling | `nomarchy-hyprland-monitor-scaling-cycle` | `missing` |
+| `show_toggle_menu` | Scaling | `nomarchy-hyprland-monitor-scaling-cycle` | `kept` |
 | `show_style_menu` | Theme | `_(inline)_` | `kept` |
 | `show_style_menu` | Font | `_(inline)_` | `kept` |
 | `show_style_menu` | Background | `_(inline)_` | `kept` |
@@ -285,12 +287,12 @@ Walked from `features/scripts/utils/nomarchy-menu`. Each `case` arm in a `show_*
 | `show_setup_security_menu` | Fido2 | `nomarchy-setup-fido2` | `kept` |
 | `show_setup_config_menu` | Defaults | `_(inline)_` | `kept` |
 | `show_setup_config_menu` | Hyprland | `_(inline)_` | `kept` |
-| `show_setup_config_menu` | Hypridle | `nomarchy-restart-hypridle` | `missing` |
+| `show_setup_config_menu` | Hypridle | `nomarchy-restart-hypridle` | `kept` |
 | `show_setup_config_menu` | Hyprlock | `_(inline)_` | `kept` |
-| `show_setup_config_menu` | Hyprsunset | `nomarchy-restart-hyprsunset` | `missing` |
+| `show_setup_config_menu` | Hyprsunset | `nomarchy-restart-hyprsunset` | `kept` |
-| `show_setup_config_menu` | Swayosd | `nomarchy-restart-swayosd` | `missing` |
+| `show_setup_config_menu` | Swayosd | `nomarchy-restart-swayosd` | `kept` |
-| `show_setup_config_menu` | Walker | `nomarchy-restart-walker` | `missing` |
+| `show_setup_config_menu` | Walker | `nomarchy-restart-walker` | `kept` |
-| `show_setup_config_menu` | Waybar | `nomarchy-restart-waybar` | `missing` |
+| `show_setup_config_menu` | Waybar | `nomarchy-restart-waybar` | `kept` |
 | `show_setup_config_menu` | XCompose | `nomarchy-restart-xcompose` | `kept` |
 | `show_setup_config_menu` | Overrides | `_(inline)_` | `kept` |
 | `show_setup_system_menu` | Suspend | `nomarchy-toggle-suspend` | `kept` |
@@ -298,15 +300,15 @@ Walked from `features/scripts/utils/nomarchy-menu`. Each `case` arm in a `show_*
 | `show_update_menu` | Themes | `nomarchy-theme-update` | `kept` |
 | `show_update_menu` | Process | `_(inline)_` | `kept` |
 | `show_update_menu` | Hardware | `_(inline)_` | `kept` |
-| `show_update_menu` | Firmware | `nomarchy-update-firmware` | `missing` |
+| `show_update_menu` | Firmware | `nomarchy-update-firmware` | `kept` |
 | `show_update_menu` | Timezone | `nomarchy-tz-select` | `kept` |
 | `show_update_menu` | Time | `nomarchy-update-time` | `kept` |
 | `show_update_menu` | Password | `_(inline)_` | `kept` |
-| `show_update_process_menu` | Hypridle | `nomarchy-restart-hypridle` | `missing` |
+| `show_update_process_menu` | Hypridle | `nomarchy-restart-hypridle` | `kept` |
-| `show_update_process_menu` | Hyprsunset | `nomarchy-restart-hyprsunset` | `missing` |
+| `show_update_process_menu` | Hyprsunset | `nomarchy-restart-hyprsunset` | `kept` |
-| `show_update_process_menu` | Swayosd | `nomarchy-restart-swayosd` | `missing` |
+| `show_update_process_menu` | Swayosd | `nomarchy-restart-swayosd` | `kept` |
-| `show_update_process_menu` | Walker | `nomarchy-restart-walker` | `missing` |
+| `show_update_process_menu` | Walker | `nomarchy-restart-walker` | `kept` |
-| `show_update_process_menu` | Waybar | `nomarchy-restart-waybar` | `missing` |
+| `show_update_process_menu` | Waybar | `nomarchy-restart-waybar` | `kept` |
 | `show_update_hardware_menu` | Audio | `nomarchy-restart-pipewire` | `kept` |
 | `show_update_hardware_menu` | Wi-Fi | `nomarchy-restart-wifi` | `kept` |
 | `show_update_hardware_menu` | Bluetooth | `nomarchy-restart-bluetooth` | `kept` |

features/desktop/scripts/nomarchy-toggle-waybar

@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-# Toggles the waybar top bar.
-# Hybrid: updates state.json and provides instant feedback.
-
-STATE_DIR="$HOME/.config/nomarchy"
-STATE_FILE="$STATE_DIR/state.json"
-mkdir -p "$STATE_DIR"
-
-# Initialize if doesn't exist
-[[ ! -f $STATE_FILE ]] && echo "{}" > "$STATE_FILE"
-
-if [[ $NOMARCHY_TOGGLE_WAYBAR == "false" ]]; then
-    NEW_VALUE="true"
-    uwsm-app -- waybar >/dev/null 2>&1 &
-    notify-send -u low "  Top bar enabled"
-else
-    NEW_VALUE="false"
-    pkill -x waybar
-    notify-send -u low "  Top bar disabled"
-fi
-
-TMP_JSON=$(mktemp)
-jq --argjson val "$NEW_VALUE" '.waybar = $val' "$STATE_FILE" > "$TMP_JSON" && mv "$TMP_JSON" "$STATE_FILE"
-
-echo "Waybar state set to $NEW_VALUE. Environment will be fully updated on next rebuild."

features/scripts/utils/nomarchy-debug

@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+
+# Nomarchy Debug Information Script
+# Collects system information for troubleshooting.
+
+set -e
+
+# Flags for agent use to avoid hanging
+PRINT_ONLY=false
+if [[ "$*" == *"--print"* ]]; then
+    PRINT_ONLY=true
+fi
+
+echo "--- Nomarchy Debug Info ---"
+echo "Version: $(nomarchy-version)"
+echo "Host: $(hostname)"
+echo "Kernel: $(uname -r)"
+echo "Uptime: $(uptime -p)"
+
+echo ""
+echo "--- Graphics ---"
+if command -v hyprctl &>/dev/null; then
+    hyprctl version | head -n 1
+fi
+if command -v glxinfo &>/dev/null; then
+    glxinfo | grep "OpenGL renderer" || echo "OpenGL: info not available"
+fi
+
+echo ""
+echo "--- Nix/NixOS ---"
+nix --version
+if [[ -f /etc/os-release ]]; then
+    grep "PRETTY_NAME" /etc/os-release | cut -d'"' -f2
+fi
+
+echo ""
+echo "--- Nomarchy State ---"
+STATE_FILE="$HOME/.config/nomarchy/state.json"
+if [[ -f "$STATE_FILE" ]]; then
+    jq '.' "$STATE_FILE"
+else
+    echo "State file not found at $STATE_FILE"
+fi
+
+echo ""
+echo "--- Services Status ---"
+for svc in waybar hypridle hyprlock walker fprintd fwupd; do
+    if systemctl is-active --quiet "$svc" 2>/dev/null || systemctl --user is-active --quiet "$svc" 2>/dev/null; then
+        echo "[ACTIVE] $svc"
+    else
+        echo "[INACTIVE] $svc"
+    fi
+done
+
+echo ""
+echo "--- End of Debug Info ---"
+
+if [[ "$PRINT_ONLY" == "false" ]]; then
+    echo ""
+    echo "Would you like to upload this log to a pastebin? (y/N)"
+    read -r answer
+    if [[ "$answer" =~ ^[Yy]$ ]]; then
+        if command -v nomarchy-upload-log &>/dev/null; then
+            nomarchy-debug --print | nomarchy-upload-log
+        else
+            echo "Error: nomarchy-upload-log not found."
+        fi
+    fi
+fi

features/scripts/utils/nomarchy-font

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Nomarchy Font Helper
+# Usage: nomarchy-font [selector|set <name>|list]
+
+COMMAND="$1"
+
+case "$COMMAND" in
+    set)
+        shift
+        nomarchy-font-set "$@"
+        ;;
+    list)
+        nomarchy-font-list
+        ;;
+    selector|*)
+        nomarchy-font-selector
+        ;;
+esac

features/scripts/utils/nomarchy-pkg-aur-add

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Nomarchy AUR Stub
+# Informs the user that AUR is not applicable to NixOS.
+
+notify-send -u critical "Nomarchy" "The AUR is an Arch Linux feature and is not available on NixOS. Try searching for the package in nixpkgs using 'nix search nixpkgs <name>'."
+echo "Error: AUR is not available on NixOS."
+exit 1

features/scripts/utils/nomarchy-pkg-drop

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Nomarchy Package Drop Script
+# Alias for nomarchy-pkg-remove.
+
+nomarchy-pkg-remove "$@"

features/scripts/utils/nomarchy-pkg-install

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Nomarchy Package Install Script
+# Alias for nomarchy-pkg-add for users coming from other distros.
+
+nomarchy-pkg-add "$@"

features/scripts/utils/nomarchy-refresh-hyprland

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# Nomarchy Refresh Hyprland Script
+# Reloads the Hyprland configuration.
+
+set -e
+
+if command -v hyprctl &>/dev/null; then
+    hyprctl reload
+    notify-send -u low "    Hyprland configuration reloaded"
+else
+    echo "Error: hyprctl not found."
+    exit 1
+fi

features/scripts/utils/nomarchy-refresh-waybar

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# Nomarchy Refresh Waybar Script
+# Restarts Waybar to apply new configuration or theme.
+
+set -e
+
+if command -v nomarchy-restart-waybar &>/dev/null; then
+    nomarchy-restart-waybar
+    notify-send -u low "󰍜    Waybar refreshed"
+else
+    echo "Error: nomarchy-restart-waybar not found."
+    exit 1
+fi

features/scripts/utils/nomarchy-reinstall

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Nomarchy Reinstall Script
+# Performs a fresh 'switch' to the current declarative state.
+
+set -e
+
+# Detect the repository location
+if [ -f "/etc/nixos/flake.nix" ]; then
+    REPO_DIR="/etc/nixos"
+elif [ -f "/etc/nomarchy/flake.nix" ]; then
+    REPO_DIR="/etc/nomarchy"
+else
+    echo "Error: Nomarchy flake repository not found in /etc/nixos or /etc/nomarchy."
+    exit 1
+fi
+
+echo "Performing system reinstall from $REPO_DIR..."
+# --refresh forces a download of flake inputs if they've changed upstream but not in lock
+sudo nixos-rebuild switch --flake "$REPO_DIR#default" --refresh --impure
+
+echo "Reinstall complete."

features/scripts/utils/nomarchy-rollback

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Nomarchy Rollback Script
+# Reverts the system to a previous working generation.
+
+set -e
+
+if command -v snapper &>/dev/null; then
+    echo "BTRFS Snapper detected. Listing snapshots..."
+    sudo snapper list
+    echo ""
+    echo "To rollback to a specific snapshot, run: sudo snapper rollback <number>"
+    echo "Or to rollback the current NixOS generation only:"
+fi
+
+echo "Rolling back NixOS generation..."
+sudo nixos-rebuild rollback
+
+echo "Rollback complete. Please reboot if you performed a BTRFS rollback."

features/scripts/utils/nomarchy-theme

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Nomarchy Theme Helper
+# Usage: nomarchy-theme [selector|set <name>|list]
+
+COMMAND="$1"
+
+case "$COMMAND" in
+    set)
+        shift
+        nomarchy-theme-set "$@"
+        ;;
+    list)
+        nomarchy-theme-list
+        ;;
+    selector|*)
+        nomarchy-theme-selector
+        ;;
+esac

features/scripts/utils/nomarchy-toggle-waybar

@@ -1,10 +1,26 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-# nomarchy-toggle-waybar: Toggle the Waybar status bar on and off.
+# Toggles the waybar top bar.
+# Hybrid: updates state.json and provides instant feedback.
 
-if pgrep -x waybar > /dev/null; then
+STATE_DIR="$HOME/.config/nomarchy"
-    pkill waybar
+STATE_FILE="$STATE_DIR/state.json"
+mkdir -p "$STATE_DIR"
+
+# Initialize if doesn't exist
+[[ ! -f $STATE_FILE ]] && echo "{}" > "$STATE_FILE"
+
+if [[ $NOMARCHY_TOGGLE_WAYBAR == "false" ]]; then
+    NEW_VALUE="true"
+    uwsm-app -- waybar >/dev/null 2>&1 &
+    notify-send -u low "  Top bar enabled"
 else
-    # Start waybar in the background using uwsm
+    NEW_VALUE="false"
-    uwsm-app -- waybar &
+    pkill -x waybar
+    notify-send -u low "  Top bar disabled"
 fi
+
+TMP_JSON=$(mktemp)
+jq --argjson val "$NEW_VALUE" '.waybar = $val' "$STATE_FILE" > "$TMP_JSON" && mv "$TMP_JSON" "$STATE_FILE"
+
+echo "Waybar state set to $NEW_VALUE. Environment will be fully updated on next rebuild."

features/scripts/utils/nomarchy-update-firmware

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Nomarchy Firmware Update Script
+# Wraps fwupdmgr to update hardware firmware.
+
+set -e
+
+echo "Checking for firmware updates..."
+if ! fwupdmgr get-updates; then
+    echo "No updates available or fwupd service not running."
+    exit 0
+fi
+
+if gum confirm "Apply firmware updates? (Requires a reboot to finalize some updates)"; then
+    fwupdmgr update
+    echo "Firmware update complete. Please reboot if prompted."
+else
+    echo "Update cancelled."
+fi

features/scripts/utils/nomarchy-upload-log

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# Nomarchy Log Upload Script
+# Uploads stdin or a file to a pastebin service.
+
+set -e
+
+if [[ -t 0 ]] && [[ -z $1 ]]; then
+    echo "Usage: some-command | nomarchy-upload-log"
+    echo "       nomarchy-upload-log <file>"
+    exit 1
+fi
+
+# Use ix.io as the default pastebin
+if [[ -n $1 ]]; then
+    url=$(curl -F "f:1=@$1" ix.io)
+else
+    url=$(curl -F "f:1=@-" ix.io)
+fi
+
+echo "Log uploaded to: $url"
+if command -v wl-copy &>/dev/null; then
+    echo "$url" | wl-copy
+    echo "Link copied to clipboard."
+fi

features/scripts/utils/nomarchy-version

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Nomarchy Version Script
+# Prints the current Nomarchy version based on the upstream NixOS channel.
+
+VERSION="25.11.0"
+CODENAME="Markhor"
+
+echo "Nomarchy v${VERSION} (${CODENAME})"

features/scripts/utils/nomarchy-wallpaper

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Nomarchy Wallpaper Helper
+# Usage: nomarchy-wallpaper [selector|set <path>|next]
+
+COMMAND="$1"
+
+case "$COMMAND" in
+    set)
+        shift
+        # Wallpaper set usually involves writing to state.json and calling swww
+        # We can reuse the logic from nomarchy-wallpaper-selector if we extract it,
+        # but for now let's just trigger the selector.
+        nomarchy-wallpaper-selector
+        ;;
+    next)
+        nomarchy-theme-bg-next
+        ;;
+    selector|*)
+        nomarchy-wallpaper-selector
+        ;;
+esac