diff --git a/configs/nixos/hosts/zeus/default.nix b/configs/nixos/hosts/zeus/default.nix index 9e49cd8..56bdf2f 100644 --- a/configs/nixos/hosts/zeus/default.nix +++ b/configs/nixos/hosts/zeus/default.nix @@ -49,8 +49,19 @@ modules.desktop.apps.vencord.enable = true; home-manager.users.${config.user.name}.wayland.windowManager.hyprland.settings.monitor = [ - "HDMI-A-1,1920x1080@120,0x0,1,transform,3" - "DP-3,2560x1440@239.96,1080x0,1" + { + output = "HDMI-A-1"; + mode = "1920x1080@120"; + position = "0x0"; + scale = 1; + transform = 3; + } + { + output = "DP-3"; + mode = "2560x1440@239.96"; + position = "1080x0"; + scale = 1; + } ]; } diff --git a/configs/nixos/modules/desktop/session/hyprland/default.nix b/configs/nixos/modules/desktop/session/hyprland/default.nix index 7cc25db..acfbfdf 100644 --- a/configs/nixos/modules/desktop/session/hyprland/default.nix +++ b/configs/nixos/modules/desktop/session/hyprland/default.nix @@ -1,31 +1,12 @@ { config, lib, - pkgs, ... }: # The Hyprland compositor. let cfg = config.modules.desktop.session.hyprland; # NOLINT(let_order) - cursor = config.stylix.cursor; - - # Numbered-workspace switch and move for 1..9, the operator's i3 muscle memory. - workspaceBinds = lib.concatMap (n: [ - "$mod, ${toString n}, workspace, ${toString n}" - "$mod SHIFT, ${toString n}, movetoworkspace, ${toString n}" - ]) (lib.range 1 9); - user = config.user.name; - - # Flip the tiling strategy between the two built-in layouts, since neither a - # dispatcher nor a keyword toggles it on its own. - toggleLayout = pkgs.writeShellScript "hypr-toggle-layout" '' - if [ "$(hyprctl getoption -j general:layout | ${pkgs.jq}/bin/jq -r .str)" = dwindle ]; then - hyprctl keyword general:layout master - else - hyprctl keyword general:layout dwindle - fi - ''; in { options.modules.desktop.session.hyprland = { @@ -56,134 +37,21 @@ in # uwsm owns the systemd graphical-session targets. systemd.enable = false; - # Write the native hyprlang hyprland.conf, whose variable and bind syntax - # the settings below are expressed in. - configType = "hyprlang"; + # Write the native Lua Hyprland config. Home Manager renders the Nix + # settings below as hl.* calls. + configType = "lua"; + importantPrefixes = [ "config" ]; settings = { - "$mod" = "SUPER"; - "$terminal" = "ghostty"; - - # Session variables handed to the compositor directly. - # UWSM launches the session without the shell profile that would carry - # them, so a variable the compositor or its children must see is set - # here rather than through home-manager's sessionVariables. - env = [ - # Chromium and Electron apps read this to select native Wayland; - # nixpkgs wrappers (Obsidian's included) gate their Wayland flags on - # it, so without it they run under XWayland and blur at this DPI. - "NIXOS_OZONE_WL,1" - ] - # Bibata ships XCursor only. - # The hyprcursor variables name the same theme, which Hyprland - # resolves through its XCursor fallback. - ++ lib.optionals (cursor != null) [ - "XCURSOR_THEME,${cursor.name}" - "XCURSOR_SIZE,${toString cursor.size}" - "HYPRCURSOR_THEME,${cursor.name}" - "HYPRCURSOR_SIZE,${toString cursor.size}" - ]; - - input = { - kb_layout = "us"; - # Caps is a second Escape. - # Shift+Caps still toggles a real CapsLock. - kb_options = "caps:escape_shifted_capslock"; - # Snappy key repeat. - repeat_delay = 250; - repeat_rate = 45; - accel_profile = "flat"; - touchpad = { - natural_scroll = true; - tap-to-click = true; - disable_while_typing = true; - }; - }; - - general = { - gaps_in = 4; - gaps_out = 8; - border_size = 2; - layout = "dwindle"; - }; - - decoration = { - rounding = 6; - blur.enabled = cfg.blur; - }; - - # XWayland clients render at the panel's native resolution instead of - # being raster-scaled by the compositor at the fractional monitor scale. - xwayland.force_zero_scaling = true; - - animations = { - enabled = true; - bezier = [ "ease, 0.25, 0.1, 0.25, 1.0" ]; - # Durations are in centiseconds. - # Short values keep the motion subtle. - animation = [ - "windows, 1, 3, ease" - "fade, 1, 3, ease" - # Layer surfaces like the launcher fade in a touch quicker than windows. - "layersIn, 1, 2, ease" - "fadeLayersIn, 1, 2, ease" - "workspaces, 1, 3, ease" - "border, 1, 3, ease" - ]; - }; - - dwindle = { - preserve_split = true; - }; + config.general.layout = "dwindle"; bind = [ - "$mod, Return, exec, $terminal" - - # Move focus. - "$mod, H, movefocus, l" - "$mod, J, movefocus, d" - "$mod, K, movefocus, u" - "$mod, L, movefocus, r" - - # Move the window within the layout. - "$mod SHIFT, H, movewindow, l" - "$mod SHIFT, J, movewindow, d" - "$mod SHIFT, K, movewindow, u" - "$mod SHIFT, L, movewindow, r" - - # Resize the active window. - "$mod ALT, H, resizeactive, -40 0" - "$mod ALT, J, resizeactive, 0 40" - "$mod ALT, K, resizeactive, 0 -40" - "$mod ALT, L, resizeactive, 40 0" - - "$mod, Space, togglefloating," - "$mod, F, fullscreen," - # togglesplit is a dwindle layout message, reached through layoutmsg. - "$mod, T, layoutmsg, togglesplit" - "$mod SHIFT, T, exec, ${toggleLayout}" - "$mod SHIFT, Q, killactive," - "$mod CTRL, Q, forcekillactive," - ] - ++ workspaceBinds; - - # Volume and brightness keys repeat while held, each raising a popup - # through the OSD client. - # Volume is capped at 100 percent. - # The client floors brightness so a full hold cannot black the screen out. - binde = [ - ", XF86AudioRaiseVolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume raise --max-volume 100" - ", XF86AudioLowerVolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume lower" - ", XF86MonBrightnessUp, exec, ${pkgs.swayosd}/bin/swayosd-client --brightness raise" - ", XF86MonBrightnessDown, exec, ${pkgs.swayosd}/bin/swayosd-client --brightness lower" - ]; - - # Mute and media transport still fire while the session is locked. - bindl = [ - ", XF86AudioMute, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume mute-toggle" - ", XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause" - ", XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next" - ", XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous" + { + _args = [ + "SUPER + Return" + (lib.generators.mkLuaInline ''hl.dsp.exec_cmd("ghostty")'') + ]; + } ]; }; }; diff --git a/configs/nixos/modules/desktop/session/hyprland/hyprlock.nix b/configs/nixos/modules/desktop/session/hyprland/hyprlock.nix index b83a453..117ed29 100644 --- a/configs/nixos/modules/desktop/session/hyprland/hyprlock.nix +++ b/configs/nixos/modules/desktop/session/hyprland/hyprlock.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: # The lock screen: a hyprlock session-lock surface the compositor owns. @@ -9,39 +8,6 @@ let user = config.user.name; # 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"''; - - 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 - } - - 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 - ''; in { options.modules.desktop.session.hyprland.hyprlock.enable = @@ -82,13 +48,15 @@ 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. - wayland.windowManager.hyprland.settings.bind = [ - "$mod, X, exec, ${pkgs.procps}/bin/pidof hyprlock || ${hyprlock}" - "$mod CTRL, X, exec, ${idleLockToggle}" - ]; + /* + 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}" + ]; + */ }; }; } diff --git a/configs/nixos/modules/desktop/session/mako.nix b/configs/nixos/modules/desktop/session/mako.nix index f335717..6ab238a 100644 --- a/configs/nixos/modules/desktop/session/mako.nix +++ b/configs/nixos/modules/desktop/session/mako.nix @@ -1,14 +1,11 @@ { config, lib, - pkgs, ... }: # mako as the notification daemon: toasts, a do-not-disturb mode, and history recall. let user = config.user.name; - - makoctl = "${pkgs.mako}/bin/makoctl"; in { options.modules.desktop.session.mako.enable = lib.mkEnableOption "the mako notification daemon"; @@ -32,12 +29,14 @@ 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. - wayland.windowManager.hyprland.settings.bind = [ - "$mod, N, exec, ${makoctl} restore" - ]; + /* + 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" + ]; + */ }; }; } diff --git a/configs/nixos/modules/desktop/session/rofi.nix b/configs/nixos/modules/desktop/session/rofi.nix index 261cb7d..01fdfb4 100644 --- a/configs/nixos/modules/desktop/session/rofi.nix +++ b/configs/nixos/modules/desktop/session/rofi.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: # rofi as the desktop launcher and dmenu-style menu frontend. @@ -10,17 +9,6 @@ let # 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"; @@ -40,12 +28,15 @@ in }; }; - # The launcher and the session menu, kept next to the tool they drive. - # $mod is defined by the compositor config these binds share. - wayland.windowManager.hyprland.settings.bind = [ - "$mod, R, exec, ${pkgs.rofi}/bin/rofi -show drun" - "$mod SHIFT, X, exec, ${powerMenu}" - ]; + /* + 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}" + ]; + */ }; }; } diff --git a/configs/nixos/modules/desktop/utilities/clipboard.nix b/configs/nixos/modules/desktop/utilities/clipboard.nix index 4579982..fac4cf1 100644 --- a/configs/nixos/modules/desktop/utilities/clipboard.nix +++ b/configs/nixos/modules/desktop/utilities/clipboard.nix @@ -8,20 +8,10 @@ let user = config.user.name; - cliphist = "${pkgs.cliphist}/bin/cliphist"; - rofi = "${pkgs.rofi}/bin/rofi"; - wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy"; - # The picker reuses the themed rofi, so history looks like every other menu # the launcher drives. # decode is needed because list emits id-prefixed lines rather than the copied # bytes, so the chosen id has to be resolved back before it can be re-copied. - picker = pkgs.writeShellScript "clipboard-picker" '' - ${cliphist} list \ - | ${rofi} -dmenu -i -p Clipboard \ - | ${cliphist} decode \ - | ${wl-copy} - ''; in { options.modules.desktop.utilities.clipboard.enable = @@ -39,10 +29,14 @@ in # session so uwsm starts and stops them with it. services.cliphist.enable = true; - # $mod is defined by the compositor config these binds share. - wayland.windowManager.hyprland.settings.bind = [ - "$mod SHIFT, V, exec, ${picker}" - ]; + /* + Slice 1 disables external Hyprland binds while the compositor config + moves to a minimal Lua baseline. + + wayland.windowManager.hyprland.settings.bind = [ + "$mod SHIFT, V, exec, ${picker}" + ]; + */ }; }; } diff --git a/configs/nixos/modules/desktop/utilities/recording.nix b/configs/nixos/modules/desktop/utilities/recording.nix index 50385d5..7cfc356 100644 --- a/configs/nixos/modules/desktop/utilities/recording.nix +++ b/configs/nixos/modules/desktop/utilities/recording.nix @@ -1,43 +1,18 @@ { config, lib, - pkgs, ... }: # Keybound screen recording: pick a region, then toggle a video-only capture. let user = config.user.name; - slurp = "${pkgs.slurp}/bin/slurp"; - wf-recorder = "${pkgs.wf-recorder}/bin/wf-recorder"; - notify-send = "${pkgs.libnotify}/bin/notify-send"; - pgrep = "${pkgs.procps}/bin/pgrep"; - pkill = "${pkgs.procps}/bin/pkill"; - date = "${pkgs.coreutils}/bin/date"; - mkdir = "${pkgs.coreutils}/bin/mkdir"; - xdgUserDir = "${pkgs.xdg-user-dirs}/bin/xdg-user-dir"; - # A single key both starts and stops. # A running wf-recorder is stopped with SIGINT so it finalises the file. # Otherwise slurp picks a region and wf-recorder runs in the foreground until # that stop arrives, so this instance lives for the whole recording and then # reports it saved. # No -a means no audio is captured. - toggle = pkgs.writeShellScript "screen-record-toggle" '' - if ${pgrep} -x wf-recorder >/dev/null; then - ${pkill} -INT -x wf-recorder - exit 0 - fi - - region=$(${slurp}) || exit 0 - dir="$(${xdgUserDir} VIDEOS)/Recordings" - ${mkdir} -p "$dir" - file="$dir/recording-$(${date} +%Y%m%d-%H%M%S).mp4" - - ${notify-send} -a "Screen recording" "Recording started" "Region capture, no audio." - ${wf-recorder} -g "$region" -f "$file" - ${notify-send} -a "Screen recording" "Recording saved" "$file" - ''; in { options.modules.desktop.utilities.recording.enable = @@ -45,10 +20,14 @@ in config = lib.mkIf config.modules.desktop.utilities.recording.enable { home-manager.users.${user} = { - # $mod is defined by the compositor config these binds share. - wayland.windowManager.hyprland.settings.bind = [ - "$mod SHIFT, R, exec, ${toggle}" - ]; + /* + Slice 1 disables external Hyprland binds while the compositor config + moves to a minimal Lua baseline. + + wayland.windowManager.hyprland.settings.bind = [ + "$mod SHIFT, R, exec, ${toggle}" + ]; + */ }; }; } diff --git a/configs/nixos/modules/desktop/utilities/screenshot.nix b/configs/nixos/modules/desktop/utilities/screenshot.nix index 1d723ef..69efe15 100644 --- a/configs/nixos/modules/desktop/utilities/screenshot.nix +++ b/configs/nixos/modules/desktop/utilities/screenshot.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: # Keyboard-driven screenshots copy to the clipboard before Satty opens for @@ -9,28 +8,8 @@ let user = config.user.name; - grimblast = "${pkgs.grimblast}/bin/grimblast"; - satty = "${pkgs.satty}/bin/satty"; - tee = "${pkgs.coreutils}/bin/tee"; - wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy"; - xdgUserDir = "${pkgs.xdg-user-dirs}/bin/xdg-user-dir"; - # Copy the original screenshot before Satty opens. # Satty copies and saves annotated screenshots when the user presses Enter. - capture = - target: - pkgs.writeShellScript "screenshot-${target}" '' - dir="$(${xdgUserDir} PICTURES)/Screenshots" - mkdir -p "$dir" - ${grimblast} save ${target} - \ - | ${tee} >(${wl-copy}) \ - | ${satty} --filename - \ - --output-filename "$dir/screenshot-%Y%m%d-%H%M%S.png" \ - --copy-command ${wl-copy} \ - --save-after-copy \ - --early-exit \ - --actions-on-enter save-to-clipboard - ''; in { options.modules.desktop.utilities.screenshot.enable = @@ -38,22 +17,20 @@ in config = lib.mkIf config.modules.desktop.utilities.screenshot.enable { home-manager.users.${user} = { - # satty is a one-shot annotation surface, so float it rather than letting - # it claim a tile in the layout. - # windowrule v3 syntax: space-separated field/value tokens, comma - # separated, with matchers under a match: prefix and effects bare. - wayland.windowManager.hyprland.settings.windowrule = [ - "float 1, match:class ^(com\\.gabm\\.satty)$" - ]; + /* + Slice 1 disables external Hyprland rules and binds while the compositor + config moves to a minimal Lua baseline. - # Print with plain/Shift/Ctrl for region/window/full. - # Super+L is already the hjkl focus and movement bind, so screenshots take - # the Print key instead. - wayland.windowManager.hyprland.settings.bind = [ - ", Print, exec, ${capture "area"}" - "SHIFT, Print, exec, ${capture "active"}" - "CTRL, Print, exec, ${capture "screen"}" - ]; + wayland.windowManager.hyprland.settings.windowrule = [ + "float 1, match:class ^(com\\.gabm\\.satty)$" + ]; + + wayland.windowManager.hyprland.settings.bind = [ + ", Print, exec, ${capture "area"}" + "SHIFT, Print, exec, ${capture "active"}" + "CTRL, Print, exec, ${capture "screen"}" + ]; + */ }; }; }