aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Kavanagh <rak@debian.org>2015-09-01 15:52:45 -0400
committerRyan Kavanagh <rak@debian.org>2015-09-01 15:52:45 -0400
commitef5e31668a3985a9be1e41bc4b295fc73899afdd (patch)
treec829d74ac4dc80e97f27ee00bc8232091a06303f
parentxlock disappeared, use xscreensaver now (diff)
Switched to xscreensaver from xautolock
-rw-r--r--.Xresources13
-rwxr-xr-x.xinitrc2
-rw-r--r--.xmonad/xmonad.hs3
3 files changed, 13 insertions, 5 deletions
diff --git a/.Xresources b/.Xresources
index a998138..2601e8b 100644
--- a/.Xresources
+++ b/.Xresources
@@ -35,6 +35,15 @@ Xft.hinting: 1
Xft.hintstyle: hintfull
Xft.rgba: bgr
Xpdf*fileFilterStyle: filter_hidden_files
-xlock.bg: #000000
xautolock.locker: xscreensaver-command -lock
-xscreensaver.lock: true
+xscreensaver.cycle: 0:10:00
+xscreensaver.dpmsEnabled: False
+xscreensaver.fade: False
+xscreensaver.lock: True
+xscreensaver.lockTimeout: 0:00:00
+xscreensaver.mode: blank
+xscreensaver.passwdTimeout: 0:00:30
+xscreensaver.selected: -1
+xscreensaver.timeout: 0:02:00
+xscreensaver.timestamp: True
+xscreensaver.unfade: False
diff --git a/.xinitrc b/.xinitrc
index 61c8db8..dd0ed9e 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -5,7 +5,7 @@ ${HOME}/bin/icd
# xcompmgr &
trayer --tint black --edge top --SetDockType true --SetPartialStrut true \
--expand true --width 10 --transparent true --height 12 --align right &
-xautolock -time 2 &
+xscreensaver -no-splash &
${HOME}/.dzen/battery.sh &
urxvtd -q -f -o &
urxvtc &
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 53cf84c..e737cef 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -451,8 +451,7 @@ main = do
, ((myMod, xK_F6), spawn "sleep 0.5 && /home/ryan/bin/icd")
, ((myMod, xK_Up), spawn "sleep 0.5 && b u")
, ((myMod, xK_Down), spawn "sleep 0.5 && b d")
- , ((myMod, xK_l), spawn "xautolock -enable && sleep 1 && xautolock -locknow")
- , ((myMod .|. shiftMask, xK_l), spawn "xautolock -toggle")
+ , ((myMod, xK_l), spawn "xscreensaver-command -lock")
, ((myMod .|. myCtrl .|. shiftMask, xK_Right), sendMessage $ Move R)
, ((myMod .|. myCtrl .|. shiftMask, xK_Left), sendMessage $ Move L)
, ((myMod .|. myCtrl .|. shiftMask, xK_Up), sendMessage $ Move U)