diff options
| -rw-r--r-- | lib/xmonad.hs | 3 | ||||
| -rw-r--r-- | machines/helium.nix | 31 |
2 files changed, 31 insertions, 3 deletions
diff --git a/lib/xmonad.hs b/lib/xmonad.hs index 945cdac..a4c6e65 100644 --- a/lib/xmonad.hs +++ b/lib/xmonad.hs @@ -88,6 +88,9 @@ insKeys conf@(XConfig {modMask = modMask}) = ] ), + -- lock it up + ( (modMask .|. shiftMask, xK_l), spawn "xautolock -locknow"), + -- sticky windows ((modMask, xK_a), windows copyToAll), -- @@ Make focused window always visible ((modMask .|. shiftMask, xK_a), killAllOtherCopies), -- @@ Toggle window state back diff --git a/machines/helium.nix b/machines/helium.nix index 564dd28..b0bcf64 100644 --- a/machines/helium.nix +++ b/machines/helium.nix @@ -47,6 +47,7 @@ in { yubioath-desktop yubico-pam yubikey-manager + yubikey-personalization ]; nixpkgs = { @@ -107,10 +108,12 @@ in { xserver.desktopManager.xterm.enable = true; xserver.xautolock.enable = true; + xserver.xautolock.locker = "${pkgs.xlockmore}/bin/xlock"; + xserver.xautolock.nowlocker = "${pkgs.xlockmore}/bin/xlock"; # xautolock -locknow + xserver.xautolock.time = 5; # minutes xserver.xautolock.enableNotifier = true; - xserver.xautolock.notifier = "${pkgs.libnotify}/bin/notify-send 'locking in 10 seconds'"; - xserver.xautolock.nowlocker = "${pkgs.i3lock}/bin/i3lock --color=000000 --show-failed-attempts --ignore-empty-password"; - xserver.xautolock.locker = "${pkgs.i3lock}/bin/i3lock --color=000000 --show-failed-attempts --ignore-empty-password"; + xserver.xautolock.notify = 30; # seconds + xserver.xautolock.notifier = ''${pkgs.libnotify}/bin/notify-send "Locking in 30 seconds"''; vnstat.enable = true; @@ -118,6 +121,28 @@ in { fail2ban.enable = true; clamav.daemon.enable = true; clamav.updater.enable = true; + + udev.extraRules = '' + # allows xlock to read the yubikey for challenge-response when unlocking. + # you need to do 'udevadm control --reload && udevadm trigger' after + # changing this. 'ykinfo -v' without sudo should work. + ACTION!="add|change", GOTO="yubico_end", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0010|0110|0111|0114|0116|0401|0403|0405|0407|0410", OWNER="ben", MODE="0600" + LABEL="yubico_end" + + # when yubi is removed, activate yubilock + ACTION=="remove", ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="1050", ENV{ID_MODEL_ID}=="0407", ENV{ID_SERIAL}="Yubico_Yubikey_4_OTP+U2F+CCID", RUN+="${pkgs.systemd}/bin/systemctl start yubilock" + ''; + }; + systemd.services = { + "yubilock" = { + script = "xlock"; + path = [ pkgs.xlockmore ]; + wantedBy = ["dummy.device"]; # i have to provide a WantedBy + environment = { DISPLAY = ":0"; }; + # i think i can get rid of user if I use this script: + # https://0day.work/locking-the-screen-when-removing-a-yubikey/ + serviceConfig.User = "ben"; + }; }; # Use the systemd-boot EFI boot loader. |