xscreensaver: add and use

diff --git a/setup.sh b/setup.sh
index eb7e8c2c6fe82be31e51f5afed3a3d338be166ee..be55e5252c2bb3895717d395884cea72711d8d24 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -76,6 +76,10 @@ if installed X; then
     link XCompose ~/.XCompose
 fi
 
+if installed xscreensaver; then
+    link xscreensaver ~/.xscreensaver
+fi
+
 if installed xpdf; then
     link xpdfrc ~/.xpdfrc
 fi

diff --git a/xinitrc b/xinitrc
index b433a3f15691f542adc06bd8c6378976495aa6ca..0f3aa1e2eae0633f2c565f31166cf840db113760 100755 (executable)
--- a/xinitrc
+++ b/xinitrc
@@ -129,9 +129,11 @@ if installed redshift; then
     redshift -l 49.9:10.9 -t 5500:4500 >/dev/null &
 fi
 
-# Automatically lock the screen after x minutes of inactivity if `xautolock`
-# is available. Warn if locker wasn't found.
-if installed xautolock; then
+# Automatically lock the screen after x minutes of inactivity if
+# `xscreensaver` or `xautolock` is available. Warn if no locker was found.
+if installed xscreensaver; then
+    xscreensaver &
+elif installed xautolock; then
     if installed "$screen_locker"; then
         xautolock -secure -time "$screen_lock_time" -locker "$screen_locker" &
     else

diff --git a/xscreensaver b/xscreensaver
new file mode 100644 (file)
index 0000000..61da017
--- /dev/null
+++ b/xscreensaver
@@ -0,0 +1,48 @@
+# XScreenSaver preferences file.
+
+# Copyright (C) 2014  Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# Just blank the screen, no fancy screen savers.
+mode: blank
+
+# Blank after x time (h:mm:ss).
+timeout: 0:10:00
+# Lock screen after x time.
+lockTimeout: 2:00:00
+# Immediately lock when timeout is reached.
+lock: True
+
+# No fade effects, enable/disable monitor immediately.
+fade:   False
+unfade: False
+
+# Enable monitor power management.
+dpmsEnabled: True
+# Disable monitor immediately when locking the screen.
+dpmsQuickOff: True
+# Put monitor into standby (gets black), suspend (power-saving mode) and off
+# after x time.
+dpmsStandby: 0:10:00
+dpmsSuspend: 0:30:00
+dpmsOff:     1:00:00
+
+# Display splash screen on startup for x time.
+splash:         True
+splashDuration: 0:00:01
+
+# Disable "New Login" button.
+newLoginCommand: /bin/false