move XScreenSaver settings to Xresources

One less file in ~/.

diff --git a/Xresources.in b/Xresources.in
index 1987fa72ebc0cc35bd2ace44ef3df98437665654..5e1c50830ff0f1eb07def3177de024b97103e652 100644 (file)
--- a/Xresources.in
+++ b/Xresources.in
@@ -85,4 +85,38 @@ Term*color13: #ff40ff
 Term*color14: #40ffff
 Term*color15: #cccccc
 
+
+! XScreenSaver settings.
+
+! Just blank the screen, no fancy screen savers.
+xscreensaver.mode: blank
+
+! Blank after x time (h:mm:ss).
+xscreensaver.timeout: 0:10:00
+! Lock screen after x time.
+xscreensaver.lockTimeout: 2:00:00
+! Immediately lock when timeout is reached.
+xscreensaver.lock: True
+
+! No fade effects, enable/disable monitor immediately.
+xscreensaver.fade:   False
+xscreensaver.unfade: False
+
+! Enable monitor power management.
+xscreensaver.dpmsEnabled: True
+! Disable monitor immediately when locking the screen.
+xscreensaver.dpmsQuickOff: True
+! Put monitor into standby (gets black), suspend (power-saving mode) and off
+! after x time.
+xscreensaver.dpmsStandby: 0:10:00
+xscreensaver.dpmsSuspend: 0:30:00
+xscreensaver.dpmsOff:     1:00:00
+
+! Display splash screen on startup for x time.
+xscreensaver.splash:         True
+xscreensaver.splashDuration: 0:00:01
+
+! Disable "New Login" button.
+xscreensaver.newLoginCommand: /bin/false
+
 ! vim: ft=xdefaults

diff --git a/setup.sh b/setup.sh
index 45fda4d984c7d42585f0eaaf2226229a089d2dab..a16faf5a8520654a019d32f0ad1102a68b67b190 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -74,10 +74,6 @@ 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/xscreensaver b/xscreensaver
deleted file mode 100644 (file)
index 61da017..0000000
--- a/xscreensaver
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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