Hopefully fix hyprland not waking from swayidle and use movewindow instead of swapwindow
All checks were successful
/ check (push) Successful in 5m11s

This commit is contained in:
Daniel Flanagan 2024-12-20 13:18:26 -06:00
parent 50c06ebd7f
commit 4982ab72e3
3 changed files with 13 additions and 12 deletions

View file

@ -84,6 +84,7 @@ $rosewater: #f5e0dc;
} }
.workspace { .workspace {
/* height: 100%; */
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
color: #666666; color: #666666;

View file

@ -58,8 +58,9 @@ in {
# NOTE: maybe check out hypridle? # NOTE: maybe check out hypridle?
(lib.concatStringsSep " " [ (lib.concatStringsSep " " [
"swayidle -w" "swayidle -w"
"timeout 300 'notify-send \"Idling in 300 seconds\"' resume 'notify-send \"Idling cancelled.\"'" "before-sleep 'swaylock'"
"timeout 480 'notify-send -u critical \"Idling in 120 seconds\"'" "timeout 300 'notify-send \"Idling in 5 minutes\"' resume 'notify-send \"Idling cancelled.\"'"
"timeout 480 'notify-send -u critical \"Idling in 2 minutes\"'"
"timeout 510 'notify-send -u critical \"Idling in 90 seconds\"'" "timeout 510 'notify-send -u critical \"Idling in 90 seconds\"'"
"timeout 540 'notify-send -u critical \"Idling in 60 seconds!\"'" "timeout 540 'notify-send -u critical \"Idling in 60 seconds!\"'"
"timeout 570 'notify-send -u critical \"Idling in 30 seconds!\"'" "timeout 570 'notify-send -u critical \"Idling in 30 seconds!\"'"
@ -73,12 +74,9 @@ in {
"timeout 597 'notify-send -u critical \"Idling in 3 seconds!\"'" "timeout 597 'notify-send -u critical \"Idling in 3 seconds!\"'"
"timeout 598 'notify-send -u critical \"Idling in 2 seconds!\"'" "timeout 598 'notify-send -u critical \"Idling in 2 seconds!\"'"
"timeout 599 'notify-send -u critical \"Idling in 1 second!\"'" "timeout 599 'notify-send -u critical \"Idling in 1 second!\"'"
"timeout 600 'swaylock --daemonize'" "timeout 600 'swaylock -f'"
"timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'" "timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'"
"after-resume 'maybe-good-morning'"
"before-sleep 'swaylock --daemonize'"
]) ])
''swayidle -w timeout 600 'notify-send "Locking in 30 seconds..."' timeout 630 'swaylock -f' timeout 660 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on && maybe-good-morning' before-sleep 'swaylock -f'"''
]; ];
env = [ env = [
@ -184,10 +182,10 @@ in {
"$mod, l, movefocus, r" "$mod, l, movefocus, r"
"$mod, k, movefocus, u" "$mod, k, movefocus, u"
"$mod, j, movefocus, d" "$mod, j, movefocus, d"
"$mod SHIFT, H, swapwindow, l" "$mod SHIFT, H, movewindow, l"
"$mod SHIFT, L, swapwindow, r" "$mod SHIFT, L, movewindow, r"
"$mod SHIFT, K, swapwindow, u" "$mod SHIFT, K, movewindow, u"
"$mod SHIFT, J, swapwindow, d" "$mod SHIFT, J, movewindow, d"
"$mod SHIFT, V, exec, swayosd-client --input-volume mute-toggle" "$mod SHIFT, V, exec, swayosd-client --input-volume mute-toggle"
", XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle" ", XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle"
@ -236,7 +234,7 @@ in {
"CTRL SHIFT $mod, L, exec, swaylock" "CTRL SHIFT $mod, L, exec, swaylock"
"$mod CTRL, space, exec, makoctl dismiss" "$mod CTRL, space, exec, makoctl dismiss"
"$mod SHIFT CTRL, space, exec, makoctl restore" "$mod SHIFT CTRL, space, exec, makoctl restore"
"$mod SHIFT, space, exec, makoctl invoke" "$mod SHIFT, space, exec, makoctl invoke default"
"$mod, E, exec, thunar" "$mod, E, exec, thunar"
]; ];

View file

@ -33,8 +33,10 @@
on-notify=exec ${pkgs.mpv}/bin/mpv --volume=50 ~/.notify.wav on-notify=exec ${pkgs.mpv}/bin/mpv --volume=50 ~/.notify.wav
actions=1 actions=1
icons=1 icons=1
width=400
height=150
background-color=${bg}AA background-color=${bg}DD
text-color=${text} text-color=${text}
border-color=${primary} border-color=${primary}
progress-color=${primary} progress-color=${primary}