summaryrefslogtreecommitdiffstats
path: root/xorg
diff options
context:
space:
mode:
authorStefan Ritter <xeno@thehappy.de>2011-07-26 17:45:08 +0200
committerStefan Ritter <xeno@thehappy.de>2011-07-26 17:45:08 +0200
commit365604d48124f9daa8877d653c489f5b01b672fc (patch)
treedda1e5923e8b1d5acceb73b20ef0cee1a6c08382 /xorg
parentb47da88aa440edd886eedcf4b154a68d6570d80e (diff)
parentbafb947d05d17d9a7400bfa05b98034850bbac15 (diff)
Merge branch 'master' of fucktheforce.de:xeno
Diffstat (limited to 'xorg')
-rwxr-xr-xxorg/xinitrc5
-rw-r--r--xorg/xresources5
2 files changed, 3 insertions, 7 deletions
diff --git a/xorg/xinitrc b/xorg/xinitrc
index 4fd10ce..56460bb 100755
--- a/xorg/xinitrc
+++ b/xorg/xinitrc
@@ -1,7 +1,6 @@
#!/bin/bash
WM='i3'
-WALLPAPER='media/bilder/wallpaper/wallpaper.png'
setxkbmap de neo
setxkbmap -option terminate:ctrl_alt_bksp
@@ -24,9 +23,7 @@ if [ -e /usr/bin/xrandr ]; then
fi
fi
-if [ -e "$WALLPAPER" ] && [ -e /usr/bin/feh ]; then
- feh --bg-scale $WALLPAPER
-fi
+feh --bg-scale ~/media/bilder/wallpaper/$(ls ~/media/bilder/wallpaper/ | sort --random-sort | head -1)
if [ -e /usr/bin/xscreensaver ]; then
xscreensaver -no-splash &
diff --git a/xorg/xresources b/xorg/xresources
index ddddb34..bfb066f 100644
--- a/xorg/xresources
+++ b/xorg/xresources
@@ -18,9 +18,6 @@
*background: #000000
*foreground: #ffffff
-
-*foreground: #a0a0a0
-*background: #000000
*color0: #1B1D1E
*color8: #505354
*color1: #F92672
@@ -37,3 +34,5 @@
*color14: #899CA1
*color7: #CCCCC6
*color15: #F8F8F2
+
+urxvt.perl-ext-common: digital-clock