Swap swaylock back for swaylock-effects

Use swaylockfx wrapper to invoke as this keeps compatibility with
stylix customisations
This commit is contained in:
Evie Litherland-Smith 2024-09-20 10:32:23 +01:00
parent 406e0972e1
commit ebf727ed43

View file

@ -6,6 +6,7 @@
}: }:
{ {
imports = [ ./waybar/default.nix ]; imports = [ ./waybar/default.nix ];
stylix.targets.swaylock.useImage = false; # Using swaylock-effects instead
home.packages = with pkgs; [ home.packages = with pkgs; [
ffmpeg ffmpeg
grim grim
@ -13,6 +14,9 @@
wl-clipboard wl-clipboard
swayimg swayimg
swaybg swaybg
(writeShellScriptBin "swaylockfx" ''
${swaylock-effects}/bin/swaylock --screenshots --clock --effect-blur 7x5 --effect-vignette 0.5:0.5
'')
(writeShellScriptBin "protonmail-setup-bridge" '' (writeShellScriptBin "protonmail-setup-bridge" ''
pkill -9 -f protonmail-bridge pkill -9 -f protonmail-bridge
${protonmail-bridge}/bin/protonmail-bridge -c ${protonmail-bridge}/bin/protonmail-bridge -c
@ -21,7 +25,6 @@
]; ];
programs = { programs = {
waybar.systemd.target = "sway-session.target"; waybar.systemd.target = "sway-session.target";
swaylock.enable = true;
fuzzel = { fuzzel = {
enable = true; enable = true;
settings = { settings = {
@ -43,6 +46,10 @@
}; };
}; };
}; };
swaylock = {
enable = true;
package = pkgs.swaylock-effects;
};
wlogout = { wlogout = {
enable = true; enable = true;
layout = [ layout = [
@ -97,7 +104,7 @@
timeouts = [ timeouts = [
{ {
timeout = 60 * 15; # 15 minutes timeout = 60 * 15; # 15 minutes
command = "swaylock"; command = "swaylockfx";
} }
]; ];
}; };
@ -221,7 +228,7 @@
"XF86MonBrightnessDown" = "exec ${config.services.avizo.package}/bin/lightctl - 5"; "XF86MonBrightnessDown" = "exec ${config.services.avizo.package}/bin/lightctl - 5";
# System utilities # System utilities
"Mod4+Mod1+l" = "exec swaylock"; "Mod4+Mod1+l" = "exec swaylockfx";
"${modifier}+z" = "exec ${config.services.mako.package}/bin/makoctl restore"; "${modifier}+z" = "exec ${config.services.mako.package}/bin/makoctl restore";
"${modifier}+Shift+z" = "exec ${config.services.mako.package}/bin/makoctl dismiss -a"; "${modifier}+Shift+z" = "exec ${config.services.mako.package}/bin/makoctl dismiss -a";
"${modifier}+Shift+p" = "exec ${config.programs.wlogout.package}/bin/wlogout"; "${modifier}+Shift+p" = "exec ${config.programs.wlogout.package}/bin/wlogout";