From 554fdffd6a426a8d79df848156d91e3cdbd5dbf7 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 17 Nov 2026 12:00:32 -0500 Subject: [PATCH] fixup gtklock layout, fade to black before suspend --- modules/graphical/gtklock.nix | 198 +++++++++++++++++++--------------- modules/mobile/niri.nix | 8 ++ 2 files changed, 120 insertions(+), 86 deletions(-) diff --git a/modules/graphical/gtklock.nix b/modules/graphical/gtklock.nix index c9fefd4..ce08c25 100644 --- a/modules/graphical/gtklock.nix +++ b/modules/graphical/gtklock.nix @@ -16,110 +16,131 @@ let layout = pkgs.writeText "gtklock.ui" '' - + window-box - center - center - vertical + + external + never - - info-box - vertical + + none - - time-box + + content-box + center + center vertical - - clock-label - - - - - date-label - - - - - - - - - none - - - center - 8 - - - 1 - - - - - input-field - 300 - 0.5 - 0 - 0 - password - Input Password - - - - 0 - - - - - none - 1 + + info-box + vertical - - never - 256 - 1 + + time-box + vertical - - - - vertical - 1 - - + + clock-label + + + + + date-label - - 1 - - - center - 8 + + none - - warning-label - - - - - error-label - - - - - 1 - + + center + 8 + + + 1 + + + + + input-field + 300 + 0.5 + 0 + 0 + password + Input Password + + + + 0 + 0 + + + + + none + 1 + + + never + 256 + 1 + + + + + vertical + 1 + + + + + + + + + 0 + 1 + + + + + center + vertical + + + error-label + 1 + center + + + + + warning-label + 1 + center + + + + + 1 + + + + + + 0 + 2 + + - - 2 - @@ -157,6 +178,11 @@ in background-position: center; } + #window-box, + #window-box viewport { + background: none; + } + #clock-label { font-size: 96pt; color: white; diff --git a/modules/mobile/niri.nix b/modules/mobile/niri.nix index d5f7001..ea9fb42 100644 --- a/modules/mobile/niri.nix +++ b/modules/mobile/niri.nix @@ -38,6 +38,11 @@ let before_sleep_cmd = loginctl lock-session } ''; + + suspend = pkgs.writeShellScript "suspend" '' + ${lib.getExe pkgs.niri} msg action power-off-monitors + exec ${config.systemd.package}/bin/systemctl suspend + ''; in { nixpkgs.overlays = [ @@ -54,6 +59,8 @@ in input { touch { edge-swipe-size 24; } + // The power key is bound below instead. + disable-power-key-handling } layout { @@ -115,6 +122,7 @@ in spawn-at-startup "${lib.getExe pkgs.hypridle}" "--config" "${hypridleConfig}" binds { + XF86PowerOff allow-when-locked=true { spawn "${suspend}"; } XF86AudioRaiseVolume allow-when-locked=true { spawn "${swayosd-client}" "--output-volume" "raise"; } XF86AudioLowerVolume allow-when-locked=true { spawn "${swayosd-client}" "--output-volume" "lower"; } }