From 2732e21f0154573876ef940e0f78a63f4155b2ba Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Mon, 6 Jan 2020 15:29:14 +0000 Subject: [PATCH] i3lock -> xsecurelock --- desktop.nix | 2 +- etc/xmonad.hs | 2 +- packages.nix | 2 +- security.nix | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/desktop.nix b/desktop.nix index 931ec60..9f62ea0 100644 --- a/desktop.nix +++ b/desktop.nix @@ -14,7 +14,7 @@ in { enable = true; time = 5; # minutes - locker = "${pkgs.i3lock}/bin/i3lock -n -c 000000"; + locker = "${pkgs.xsecurelock}/bin/xsecurelock"; notify = 10; # seconds notifier = "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""; diff --git a/etc/xmonad.hs b/etc/xmonad.hs index 8424e55..b0a95cd 100644 --- a/etc/xmonad.hs +++ b/etc/xmonad.hs @@ -52,7 +52,7 @@ notifySend expireTime shellCommand = spawn ++ " \"$(" ++ shellCommand ++ ")\"" -- M - modMask, M1 - Alt, C - Control, S - Shift. Use xev. -keysP = [ ("M-l", spawn "i3lock -n -c 000000") +keysP = [ ("M-l", spawn "xsecurelock") , ("", spawn "escrotum -Cs") , ("", spawn "sudo light -A 3") , ("", spawn "sudo light -U 3") diff --git a/packages.nix b/packages.nix index c3b79dc..b6ec7f0 100644 --- a/packages.nix +++ b/packages.nix @@ -118,7 +118,7 @@ in { ubuntu_font_family noto-fonts-emoji # base x - rofi xlibs.xmodmap i3lock unstable.kitty + rofi xlibs.xmodmap xsecurelock unstable.kitty libnotify gtk_engines x2x evtest pulsemixer arc-theme xclip gnome3.dconf gnome3.dconf-editor gsettings-desktop-schemas gsettings-qt diff --git a/security.nix b/security.nix index 790e48c..e78292d 100644 --- a/security.nix +++ b/security.nix @@ -30,11 +30,11 @@ in { services = { "force-lock-after-suspend" = { serviceConfig.User = "user"; - description = "Force i3lock after suspend"; + description = "Force xsecurelock after suspend"; before = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" ]; wantedBy = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" ]; script = '' - DISPLAY=:0 ${pkgs.i3lock}/bin/i3lock -n -c 000000 + DISPLAY=:0 ${pkgs.xsecurelock}/bin/xsecurelock ''; }; };