docs(hyprland): minimize disabled config diff

2026-10-10 12:51:41 -04:00
parent 56507866bb
commit 7cf7ad819f
6 changed files with 153 additions and 182 deletions
--- a/configs/nixos/modules/desktop/session/hyprland/hyprlock.nix
+++ b/configs/nixos/modules/desktop/session/hyprland/hyprlock.nix
@@ -1,52 +1,47 @@
 {
  config,
  lib,
-  # pkgs,
+  pkgs,
  ...
 }:
 # The lock screen: a hyprlock session-lock surface the compositor owns.
 let
  user = config.user.name;

-  /*
-    Slice 1 disables the lock keybinds, so their supporting values stay
-    commented out with the bind block.
+  # The hyprlock this module installs, used by the lock keybind below.
+  hyprlock = "${config.home-manager.users.${user}.programs.hyprlock.package}/bin/hyprlock";

-    # The hyprlock this module installs, used by the lock keybind below.
-    hyprlock = "${config.home-manager.users.${user}.programs.hyprlock.package}/bin/hyprlock";
+  sleepIcon = builtins.fromJSON ''"\udb81\udcb2"'';
+  sleepOffIcon = builtins.fromJSON ''"\udb81\udcb3"'';

-    sleepIcon = builtins.fromJSON ''"\udb81\udcb2"'';
-    sleepOffIcon = builtins.fromJSON ''"\udb81\udcb3"'';
+  idleLockToggle = pkgs.writeShellScript "lockscreen-idle-inhibit-toggle" ''
+    unit=lockscreen-idle-inhibit.service

-    idleLockToggle = pkgs.writeShellScript "lockscreen-idle-inhibit-toggle" ''
-      unit=lockscreen-idle-inhibit.service
+    refresh_waybar() {
+      ${pkgs.procps}/bin/pkill -RTMIN+9 waybar >/dev/null 2>&1 || true
+    }

-      refresh_waybar() {
-        ${pkgs.procps}/bin/pkill -RTMIN+9 waybar >/dev/null 2>&1 || true
-      }
+    if ${pkgs.systemd}/bin/systemctl --user is-active --quiet "$unit"; then
+      ${pkgs.systemd}/bin/systemctl --user stop "$unit"
+      refresh_waybar
+      ${pkgs.swayosd}/bin/swayosd-client --custom-message "${sleepIcon}"
+      exit 0
+    fi

-      if ${pkgs.systemd}/bin/systemctl --user is-active --quiet "$unit"; then
-        ${pkgs.systemd}/bin/systemctl --user stop "$unit"
-        refresh_waybar
-        ${pkgs.swayosd}/bin/swayosd-client --custom-message "${sleepIcon}"
-        exit 0
-      fi
-
-      if ${pkgs.systemd}/bin/systemd-run \
-        --user \
-        --collect \
-        --unit=lockscreen-idle-inhibit \
-        --description="Disable idle-triggered screen locking" \
-        ${pkgs.systemd}/bin/systemd-inhibit \
-        --what=idle \
-        --who=lockscreen-hotkey \
-        --why="lock screen disabled by hotkey" \
-        ${pkgs.coreutils}/bin/sleep infinity >/dev/null; then
-        refresh_waybar
-        ${pkgs.swayosd}/bin/swayosd-client --custom-message "${sleepOffIcon}"
-      fi
-    '';
-  */
+    if ${pkgs.systemd}/bin/systemd-run \
+      --user \
+      --collect \
+      --unit=lockscreen-idle-inhibit \
+      --description="Disable idle-triggered screen locking" \
+      ${pkgs.systemd}/bin/systemd-inhibit \
+      --what=idle \
+      --who=lockscreen-hotkey \
+      --why="lock screen disabled by hotkey" \
+      ${pkgs.coreutils}/bin/sleep infinity >/dev/null; then
+      refresh_waybar
+      ${pkgs.swayosd}/bin/swayosd-client --custom-message "${sleepOffIcon}"
+    fi
+  '';
 in
 {
  options.modules.desktop.session.hyprland.hyprlock.enable =
@@ -87,14 +82,14 @@ in
        };
      };

+      # Lock on Super+X.
+      # The guard drops the keypress when a locker is already up, so a second
+      # hyprlock never stacks over the first.
      /*
-        Slice 1 disables external Hyprland binds while the compositor config
-        moves to a minimal Lua baseline.
-
-        wayland.windowManager.hyprland.settings.bind = [
-          "$mod, X, exec, ${pkgs.procps}/bin/pidof hyprlock || ${hyprlock}"
-          "$mod CTRL, X, exec, ${idleLockToggle}"
-        ];
+      wayland.windowManager.hyprland.settings.bind = [
+        "$mod, X, exec, ${pkgs.procps}/bin/pidof hyprlock || ${hyprlock}"
+        "$mod CTRL, X, exec, ${idleLockToggle}"
+      ];
      */
    };
  };
--- a/configs/nixos/modules/desktop/session/mako.nix
+++ b/configs/nixos/modules/desktop/session/mako.nix
@@ -1,19 +1,14 @@
 {
  config,
  lib,
-  # pkgs,
+  pkgs,
  ...
 }:
 # mako as the notification daemon: toasts, a do-not-disturb mode, and history recall.
 let
  user = config.user.name;

-  /*
-    Slice 1 disables the Mako recall keybind, so its supporting value stays
-    commented out with the bind block.
-
-    makoctl = "${pkgs.mako}/bin/makoctl";
-  */
+  makoctl = "${pkgs.mako}/bin/makoctl";
 in
 {
  options.modules.desktop.session.mako.enable = lib.mkEnableOption "the mako notification daemon";
@@ -37,13 +32,13 @@ in
        };
      };

+      # Recall the last notification from history, keyboard-only like the rest
+      # of the session.
+      # $mod is defined by the compositor config these binds share.
      /*
-        Slice 1 disables external Hyprland binds while the compositor config
-        moves to a minimal Lua baseline.
-
-        wayland.windowManager.hyprland.settings.bind = [
-          "$mod, N, exec, ${makoctl} restore"
-        ];
+      wayland.windowManager.hyprland.settings.bind = [
+        "$mod, N, exec, ${makoctl} restore"
+      ];
      */
    };
  };
--- a/configs/nixos/modules/desktop/session/rofi.nix
+++ b/configs/nixos/modules/desktop/session/rofi.nix
@@ -1,31 +1,26 @@
 {
  config,
  lib,
-  # pkgs,
+  pkgs,
  ...
 }:
 # rofi as the desktop launcher and dmenu-style menu frontend.
 let
  user = config.user.name;

-  /*
-    Slice 1 disables the Rofi keybinds, so their supporting script stays
-    commented out with the bind block.
-
-    # A session menu built on the same themed rofi, so the power actions look
-    # like every other menu the launcher drives.
-    powerMenu = pkgs.writeShellScript "rofi-power-menu" ''
-      chosen=$(printf '%s\n' Lock Suspend 'Log out' Reboot 'Shut down' \
-        | ${pkgs.rofi}/bin/rofi -dmenu -i -p Power)
-      case "$chosen" in
-        Lock) ${pkgs.systemd}/bin/loginctl lock-session ;;
-        Suspend) ${pkgs.systemd}/bin/systemctl suspend ;;
-        'Log out') ${pkgs.systemd}/bin/loginctl terminate-session "$XDG_SESSION_ID" ;;
-        Reboot) ${pkgs.systemd}/bin/systemctl reboot ;;
-        'Shut down') ${pkgs.systemd}/bin/systemctl poweroff ;;
-      esac
-    '';
-  */
+  # A session menu built on the same themed rofi, so the power actions look
+  # like every other menu the launcher drives.
+  powerMenu = pkgs.writeShellScript "rofi-power-menu" ''
+    chosen=$(printf '%s\n' Lock Suspend 'Log out' Reboot 'Shut down' \
+      | ${pkgs.rofi}/bin/rofi -dmenu -i -p Power)
+    case "$chosen" in
+      Lock) ${pkgs.systemd}/bin/loginctl lock-session ;;
+      Suspend) ${pkgs.systemd}/bin/systemctl suspend ;;
+      'Log out') ${pkgs.systemd}/bin/loginctl terminate-session "$XDG_SESSION_ID" ;;
+      Reboot) ${pkgs.systemd}/bin/systemctl reboot ;;
+      'Shut down') ${pkgs.systemd}/bin/systemctl poweroff ;;
+    esac
+  '';
 in
 {
  options.modules.desktop.session.rofi.enable = lib.mkEnableOption "the rofi launcher";
@@ -45,14 +40,13 @@ in
        };
      };

+      # The launcher and the session menu, kept next to the tool they drive.
+      # $mod is defined by the compositor config these binds share.
      /*
-        Slice 1 disables external Hyprland binds while the compositor config
-        moves to a minimal Lua baseline.
-
-        wayland.windowManager.hyprland.settings.bind = [
-          "$mod, R, exec, ${pkgs.rofi}/bin/rofi -show drun"
-          "$mod SHIFT, X, exec, ${powerMenu}"
-        ];
+      wayland.windowManager.hyprland.settings.bind = [
+        "$mod, R, exec, ${pkgs.rofi}/bin/rofi -show drun"
+        "$mod SHIFT, X, exec, ${powerMenu}"
+      ];
      */
    };
  };