summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-03-19 14:47:56 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2022-03-19 14:47:56 +0100
commit6cfa76a2e4af1a3b7d57b8b0005c190a693e200b (patch)
tree3cdc14136f0689d48cef61dee2ee232bffb05826
parent2bfabc230d955990f3002ff04b7df5d401cc6330 (diff)
downloadnixos-6cfa76a2e4af1a3b7d57b8b0005c190a693e200b.tar
nixos-6cfa76a2e4af1a3b7d57b8b0005c190a693e200b.tar.gz
nixos-6cfa76a2e4af1a3b7d57b8b0005c190a693e200b.tar.bz2
nixos-6cfa76a2e4af1a3b7d57b8b0005c190a693e200b.tar.xz
nixos-6cfa76a2e4af1a3b7d57b8b0005c190a693e200b.zip
gkleen@sif: ...
-rw-r--r--accounts/gkleen@sif/default.nix25
-rw-r--r--accounts/gkleen@sif/systemd.nix5
2 files changed, 18 insertions, 12 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 153b5884..708ed5de 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -231,6 +231,15 @@ in {
231 enable = true; 231 enable = true;
232 preset = "LoudnessEqualizer"; 232 preset = "LoudnessEqualizer";
233 }; 233 };
234
235 screen-locker = {
236 enable = true;
237 lockCommand = pkgs.writeShellScript "lock" ''
238 ${pkgs.playerctl}/bin/playerctl -a pause
239 exec ${pkgs.xsecurelock}/bin/xsecurelock
240 '';
241 xss-lock.extraOptions = ["--tranfer-sleep-lock"];
242 };
234 }; 243 };
235 244
236 gtk = { 245 gtk = {
@@ -256,18 +265,10 @@ in {
256 265
257 windowManager.command = "${pkgs.coreutils}/bin/env -u SHLVL -- ${xmonad}/bin/xmonad"; 266 windowManager.command = "${pkgs.coreutils}/bin/env -u SHLVL -- ${xmonad}/bin/xmonad";
258 267
259 initExtra = let 268 initExtra = ''
260 lockScript = pkgs.writeScript "lock" '' 269 ${pkgs.xorg.xinput}/bin/xinput disable 'Synaptics TM3512-010'
261 #!${pkgs.stdenv.shell} 270 ${pkgs.xorg.xmodmap}/bin/xmodmap -e 'keysym Caps_Lock = Multi_key'
262 ${pkgs.playerctl}/bin/playerctl -a pause 271 '';
263 exec ${pkgs.xsecurelock}/bin/xsecurelock
264 '';
265 in ''
266 ${pkgs.coreutils}/bin/env XSECURELOCK_WANT_FIRST_KEYPRESS=1 XSECURELOCK_DIM_ALPHA=1 ${pkgs.xss-lock}/bin/xss-lock -l -n ${pkgs.xsecurelock}/libexec/xsecurelock/dimmer -- ${lockScript} &
267 ${pkgs.xorg.xinput}/bin/xinput disable 'Synaptics TM3512-010'
268 ${pkgs.xorg.xset}/bin/xset s 590 10
269 ${pkgs.xorg.xmodmap}/bin/xmodmap -e 'keysym Caps_Lock = Multi_key'
270 '';
271 272
272 pointerCursor = { 273 pointerCursor = {
273 package = pkgs.vanilla-dmz; 274 package = pkgs.vanilla-dmz;
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index ec02b1c3..1804ab0d 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -143,6 +143,11 @@ in {
143 Restart = "always"; 143 Restart = "always";
144 }; 144 };
145 }; 145 };
146 xss-lock = {
147 Service = {
148 Environment = [ "XSECURELOCK_WANT_FIRST_KEYPRESS=1" ];
149 };
150 };
146 "autossh-socks@proxy.mathw0h:8119" = { 151 "autossh-socks@proxy.mathw0h:8119" = {
147 Service = { 152 Service = {
148 Type = "notify"; 153 Type = "notify";