diff options
| -rw-r--r-- | home/desktop/sway.nix | 20 | ||||
| -rw-r--r-- | sys/seat/default.nix | 11 |
2 files changed, 14 insertions, 17 deletions
diff --git a/home/desktop/sway.nix b/home/desktop/sway.nix index bd70451..2c527ed 100644 --- a/home/desktop/sway.nix +++ b/home/desktop/sway.nix @@ -9,16 +9,6 @@ in ]; programs = { - swaylock = { - enable = true; - - settings = { - color = "222222"; - font-size = 24; - show-failed-attempts = true; - }; - }; - waybar.enable = true; wofi.enable = true; @@ -29,7 +19,7 @@ in enable = true; timeouts = [ - { timeout = 600; command = "${getExe config.programs.swaylock.package} -fF"; } + { timeout = 600; command = "${getExe pkgs.gtklock} -d"; } ]; }; }; @@ -71,7 +61,7 @@ in "${mod}+c" = "focus child"; "${mod}+d" = "exec --no-startup-id ${getExe wofi} -S run"; "${mod}+i" = "exec busctl --user call rs.wl-gammarelay / rs.wl.gammarelay ToggleInverted"; - "${mod}+o" = "exec ${getExe config.programs.swaylock.package} -fF"; + "${mod}+o" = "${getExe pkgs.gtklock} -d"; "${mod}+Return" = "exec ${getExe pkgs.local.st} -e ${getExe pkgs.local.tmux-lift} ${getExe pkgs.local.tmux-open}"; "${mod}+Shift+e" = "input * xkb_layout latam"; "${mod}+Shift+u" = "input * xkb_layout us"; @@ -81,9 +71,9 @@ in }; startup = [ - { - command = "${getExe pkgs.xautolock} -time 10 -locker '${pkgs.i3lock-color}/bin/i3lock-color -fe -c222222'"; - } + #{ + # command = "${getExe pkgs.xautolock} -time 10 -locker '${pkgs.i3lock-color}/bin/i3lock-color -fe -c222222'"; + #} ]; window.commands = [ diff --git a/sys/seat/default.nix b/sys/seat/default.nix index b1d428d..3dd2b15 100644 --- a/sys/seat/default.nix +++ b/sys/seat/default.nix @@ -78,9 +78,16 @@ in hardware.graphics.enable = true; - programs.dconf.enable = true; + programs = { + dconf.enable = true; - security.pam.services.swaylock = { }; + gtklock = { + enable = true; + + config = { }; + modules = [ ]; + }; + }; services = { libinput.enable = true; |