Merge branch 'arch' into gentoo

home/.config/shell/environment

@@ -57,5 +57,6 @@ fi
 # Other program settings
 export SUDO_ASKPASS="$HOME/.local/bin/scripts/dmenu/dmenupass"
 export PIPENV_VENV_IN_PROJECT=1 # Force pipenv to create new environments within projects ./.venv
+export XSECURELOCK_SHOW_HOSTNAME=0 # Don't show hostname in xsecurelock
 #export QT_QPA_PLATFORMTHEME="gtk2"	# Have QT use gtk2 theme.
 

home/.config/x11/xprofile

@@ -4,7 +4,14 @@
 # if you use startx/xinit this file should also be soruced.
 
 # Set monitor order
-xrandr --output HDMI-1 --auto --output eDP-1 --right-of HDMI-1 --auto
+xrandr --output HDMI-1 --auto --output eDP-1 --right-of HDMI-1 --auto &
+
+# Set X11 lockscreen delays (DPMS)
+xset s on &
+xset s 600 5 & # 10 minutes, 5s for dimmer
+
+# XSS lock with xsecurelock
+xss-lock -n /usr/lib/xsecurelock/dimmer -l -- xsecurelock &
 
 # Set the background with a custom `setbg` script
 setbg &

home/.config/xmonad/xmonad.hs

@@ -104,6 +104,9 @@ myKeys =
     [ ("M-S-r", spawn "xmonad --recompile; xmonad --restart")   -- Recompiles xmonad
     , ("M-S-q", io exitSuccess)                                 -- Quits xmonad
 
+    -- Lock screen
+    , ("C-M-l", spawn "xset s activate") -- Send DPMS trigger for lockscreen
+
     -- Programs
     , ("M-b",           spawn (myBrowser))
     , ("M-<Return>",    spawn (myTerminal))