fixup gtklock layout, fade to black before suspend

This commit is contained in:
Henry Hiles 2026-11-17 12:00:32 -05:00
commit 554fdffd6a
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
2 changed files with 119 additions and 85 deletions

View file

@ -16,110 +16,131 @@ let
layout = pkgs.writeText "gtklock.ui" '' layout = pkgs.writeText "gtklock.ui" ''
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<object class="GtkBox" id="window-box"> <object class="GtkScrolledWindow" id="window-box">
<property name="name">window-box</property> <property name="name">window-box</property>
<property name="halign">center</property> <!-- Never ask for more width than the screen has: the lock surface has to stay the size
<property name="valign">center</property> the compositor gave it, or it gets disconnected and the session stays locked. -->
<property name="orientation">vertical</property> <property name="hscrollbar-policy">external</property>
<property name="vscrollbar-policy">never</property>
<child> <child>
<object class="GtkBox" id="info-box"> <object class="GtkViewport">
<property name="name">info-box</property> <property name="shadow-type">none</property>
<property name="orientation">vertical</property>
<child> <child>
<object class="GtkBox" id="time-box"> <object class="GtkBox" id="content-box">
<property name="name">time-box</property> <property name="name">content-box</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkLabel" id="clock-label"> <object class="GtkBox" id="info-box">
<property name="name">clock-label</property> <property name="name">info-box</property>
</object> <property name="orientation">vertical</property>
</child>
<child>
<object class="GtkLabel" id="date-label">
<property name="name">date-label</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkRevealer" id="body-revealer">
<property name="transition-type">none</property>
<child>
<object class="GtkGrid" id="body-grid">
<property name="halign">center</property>
<property name="row-spacing">8</property>
<child>
<object class="GtkLabel" id="input-label">
<property name="no-show-all">1</property>
</object>
</child>
<child>
<object class="GtkEntry" id="input-field">
<property name="name">input-field</property>
<property name="width-request">300</property>
<property name="xalign">0.5</property>
<property name="visibility">0</property>
<property name="caps-lock-warning">0</property>
<property name="input-purpose">password</property>
<property name="placeholder-text">Input Password</property>
<signal name="activate" handler="window_pw_check"/>
</object>
<packing>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkRevealer" id="message-revealer">
<property name="transition-type">none</property>
<property name="no-show-all">1</property>
<child> <child>
<object class="GtkScrolledWindow" id="message-scrolled-window"> <object class="GtkBox" id="time-box">
<property name="hscrollbar-policy">never</property> <property name="name">time-box</property>
<property name="max-content-height">256</property> <property name="orientation">vertical</property>
<property name="propagate-natural-height">1</property>
<child> <child>
<object class="GtkViewport"> <object class="GtkLabel" id="clock-label">
<child> <property name="name">clock-label</property>
<object class="GtkBox" id="message-box"> </object>
<property name="orientation">vertical</property> </child>
<property name="homogeneous">1</property> <child>
</object> <object class="GtkLabel" id="date-label">
</child> <property name="name">date-label</property>
</object> </object>
</child> </child>
</object> </object>
</child> </child>
</object> </object>
<packing>
<property name="top-attach">1</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkRevealer" id="body-revealer">
<property name="halign">center</property> <property name="transition-type">none</property>
<property name="spacing">8</property>
<child> <child>
<object class="GtkLabel" id="warning-label"> <object class="GtkGrid" id="body-grid">
<property name="name">warning-label</property> <property name="halign">center</property>
</object> <property name="row-spacing">8</property>
</child> <child>
<child> <object class="GtkLabel" id="input-label">
<object class="GtkLabel" id="error-label"> <property name="no-show-all">1</property>
<property name="name">error-label</property> </object>
</object> </child>
</child> <child>
<child> <object class="GtkEntry" id="input-field">
<object class="GtkButton" id="unlock-button"> <property name="name">input-field</property>
<property name="no-show-all">1</property> <property name="width-request">300</property>
<signal name="clicked" handler="window_pw_check"/> <property name="xalign">0.5</property>
<property name="visibility">0</property>
<property name="caps-lock-warning">0</property>
<property name="input-purpose">password</property>
<property name="placeholder-text">Input Password</property>
<signal name="activate" handler="window_pw_check"/>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkRevealer" id="message-revealer">
<property name="transition-type">none</property>
<property name="no-show-all">1</property>
<child>
<object class="GtkScrolledWindow" id="message-scrolled-window">
<property name="hscrollbar-policy">never</property>
<property name="max-content-height">256</property>
<property name="propagate-natural-height">1</property>
<child>
<object class="GtkViewport">
<child>
<object class="GtkBox" id="message-box">
<property name="orientation">vertical</property>
<property name="homogeneous">1</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="halign">center</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="error-label">
<property name="name">error-label</property>
<property name="wrap">1</property>
<property name="justify">center</property>
</object>
</child>
<child>
<object class="GtkLabel" id="warning-label">
<property name="name">warning-label</property>
<property name="wrap">1</property>
<property name="justify">center</property>
</object>
</child>
<child>
<object class="GtkButton" id="unlock-button">
<property name="no-show-all">1</property>
<signal name="clicked" handler="window_pw_check"/>
</object>
</child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">2</property>
</packing>
</child>
</object> </object>
</child> </child>
</object> </object>
<packing>
<property name="top-attach">2</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
@ -157,6 +178,11 @@ in
background-position: center; background-position: center;
} }
#window-box,
#window-box viewport {
background: none;
}
#clock-label { #clock-label {
font-size: 96pt; font-size: 96pt;
color: white; color: white;

View file

@ -38,6 +38,11 @@ let
before_sleep_cmd = loginctl lock-session 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 in
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
@ -54,6 +59,8 @@ in
input { input {
touch { edge-swipe-size 24; } touch { edge-swipe-size 24; }
// The power key is bound below instead.
disable-power-key-handling
} }
layout { layout {
@ -115,6 +122,7 @@ in
spawn-at-startup "${lib.getExe pkgs.hypridle}" "--config" "${hypridleConfig}" spawn-at-startup "${lib.getExe pkgs.hypridle}" "--config" "${hypridleConfig}"
binds { binds {
XF86PowerOff allow-when-locked=true { spawn "${suspend}"; }
XF86AudioRaiseVolume allow-when-locked=true { spawn "${swayosd-client}" "--output-volume" "raise"; } XF86AudioRaiseVolume allow-when-locked=true { spawn "${swayosd-client}" "--output-volume" "raise"; }
XF86AudioLowerVolume allow-when-locked=true { spawn "${swayosd-client}" "--output-volume" "lower"; } XF86AudioLowerVolume allow-when-locked=true { spawn "${swayosd-client}" "--output-volume" "lower"; }
} }