fix locking bugs

This commit is contained in:
notgne2 2023-01-07 21:23:29 -07:00
parent 1f3a437adb
commit 21ddbd068e
Signed by: notgne2
SSH Key Fingerprint: SHA256:qlFCAimT/PvNIG3u+aYT9pIqFCWgu6sNsWjpV1vHLIE
3 changed files with 9 additions and 5 deletions

View File

@ -7,8 +7,11 @@ inputs: {
with lib; let with lib; let
cfg = config.ezpcusr; cfg = config.ezpcusr;
lockCommand = pkgs.writeScript "lock.sh" '' # lockCommand = pkgs.writeScript "lock.sh" ''
${pkgs.swaylock-effects}/bin/swaylock -f --clock --indicator --screenshots --effect-scale 0.8 --effect-blur 8x3 --effect-vignette 0.2:0.5 --fade-in 0.5 --text-color ${config.ezcolors.base16.base08} --inside-color ${config.ezcolors.base16.base00} --ring-color ${config.ezcolors.base16.base01} --datestr "%Y-%m-%e" --timestr "%I:%M %p" # ${pkgs.swaylock-effects}/bin/swaylock -f --clock --indicator --screenshots --effect-scale 0.8 --effect-blur 8x3 --effect-vignette 0.2:0.5 --fade-in 0.5 --text-color ${config.ezcolors.base16.base08} --inside-color ${config.ezcolors.base16.base00} --ring-color ${config.ezcolors.base16.base01} --datestr "%Y-%m-%e" --timestr "%I:%M %p"
# '';
lockCommand = pkgs.writeShellScript "lock.sh" ''
exec ${pkgs.swaylock}/bin/swaylock -f --text-color ${config.ezcolors.base16.base08} --inside-color ${config.ezcolors.base16.base00} --ring-color ${config.ezcolors.base16.base01} -c ${config.ezcolors.base16.base00}
''; '';
in { in {
options.ezpcusr = { options.ezpcusr = {
@ -76,7 +79,7 @@ in {
} }
{ {
event = "lock"; event = "lock";
command = "${lockCommand}"; command = "${pkgs.playerctl}/bin/playerctl -a pause; ${lockCommand}";
} }
{ {
event = "unlock"; event = "unlock";
@ -270,7 +273,7 @@ in {
"${modifier}+0" = "workspace 10"; "${modifier}+0" = "workspace 10";
"${modifier}+Shift+0" = "move container to workspace 10"; "${modifier}+Shift+0" = "move container to workspace 10";
"Ctrl+Alt+l" = "exec ${lockCommand}"; "Ctrl+Alt+l" = "exec ${pkgs.systemd}/bin/loginctl lock-session";
} }
// genKeyAttrs true // genKeyAttrs true
// genKeyAttrs false // genKeyAttrs false

View File

@ -260,5 +260,6 @@ in {
userName = "notgne2"; userName = "notgne2";
userEmail = "gen2@gen2.space"; userEmail = "gen2@gen2.space";
ignores = [".envrc"]; ignores = [".envrc"];
extraConfig.push.autoSetupRemote = true;
}; };
} }

View File

@ -44,7 +44,7 @@ in {
vt = 7; vt = 7;
settings = { settings = {
default_session = { default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --user-menu --user-menu-max-uid 30000 --remember --remember-user-session --cmd sway"; command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --user-menu --user-menu-max-uid 30000 --cmd sway";
}; };
}; };
}; };