summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/rxvt-unicode/rxvt-unicode.xdefaults (renamed from .Xdefaults)65
-rw-r--r--.config/xresources/cursor.xdefaults3
-rw-r--r--.config/xresources/font.xdefaults3
-rw-r--r--.config/xresources/xclock.xdefaults5
-rw-r--r--.config/xresources/xpdf.xdefaults6
-rw-r--r--.config/xresources/xscreensaver.xdefaults28
-rw-r--r--.config/xresources/xterm.xdefaults2
-rwxr-xr-x.scripts/set_xressources.sh4
-rw-r--r--.xinitrc2
9 files changed, 53 insertions, 65 deletions
diff --git a/.Xdefaults b/.config/rxvt-unicode/rxvt-unicode.xdefaults
index af813a1..264827d 100644
--- a/.Xdefaults
+++ b/.config/rxvt-unicode/rxvt-unicode.xdefaults
@@ -1,16 +1,3 @@
-! file: ~/.Xdefaults
-! vim:enc=utf-8:nu:ai:si:et:ts=4:sw=4:ft=xdefaults:
-
-
-! Cursour Settings !
-Xcursor*theme: Vanilla-DMZ
-Xcursor.size: 22
-
-! Xft Settings !
-Xft.dpi: 96.0
-Xft.antialias: true
-
-
! Terminal Colors !
! Black
@@ -123,55 +110,3 @@ urxvt.secondaryScroll: true
! colours for tab
!urxvt*color8: [95]#050505
!urxvt*color15: #DDDDDD
-
-xterm*foreground: white
-xterm*background: black
-
-! xclock --------------------------------------------------------------
-xclock*analog: false
-xclock*update: 1
-! update every 1 sec
-xclock*Foreground: white
-xclock*background: black
-
-! xpdf -----------------------------------------------------------------
-
-xpdf*enableFreetype: yes
-xpdf*antialias: yes
-xpdf*foreground: white
-xpdf*background: black
-xpdf*urlCommand: /usr/bin/firefox %s
-xpdf*viKeys: on
-
-
-! xscreensaver ---------------------------------------------------------
-
-!font settings
-xscreensaver.Dialog.headingFont: -*-fixed-bold-r-*-*-*-100-*-*-*-*-iso8859-1
-xscreensaver.Dialog.bodyFont: -*-fixed-medium-r-*-*-*-120-*-*-*-*-iso8859-1
-xscreensaver.Dialog.labelFont: -*-fixed-medium-r-*-*-*-120-*-*-*-*-iso8859-1
-xscreensaver.Dialog.unameFont: -*-fixed-medium-r-*-*-*-120-*-*-*-*-iso8859-1
-xscreensaver.Dialog.buttonFont: -*-fixed-bold-r-*-*-*-120-*-*-*-*-iso8859-1
-xscreensaver.Dialog.dateFont: -*-fixed-medium-r-*-*-*-100-*-*-*-*-iso8859-1
-xscreensaver.passwd.passwdFont: -*-fixed-bold-r-*-*-*-100-*-*-*-*-iso8859-1
-!general dialog box (affects main hostname, username, password text)
-xscreensaver.Dialog.foreground: #ffffff
-xscreensaver.Dialog.background: #111111
-xscreensaver.Dialog.topShadowColor: #111111
-xscreensaver.Dialog.bottomShadowColor: #111111
-xscreensaver.Dialog.Button.foreground: #666666
-xscreensaver.Dialog.Button.background: #ffffff
-!username/password input box and date text colour
-xscreensaver.Dialog.text.foreground: #666666
-xscreensaver.Dialog.text.background: #ffffff
-xscreensaver.Dialog.internalBorderWidth:24
-xscreensaver.Dialog.borderWidth: 20
-xscreensaver.Dialog.shadowThickness: 2
-! shado thickness - must be > zero
-!timeout bar (background is actually determined by Dialog.text.background)
-xscreensaver.passwd.thermometer.foreground: #ff0000
-xscreensaver.passwd.thermometer.background: #000000
-xscreensaver.passwd.thermometer.width: 8
-!datestamp format--see the strftime(3) manual page for details
-xscreensaver.dateFormat: %I:%M%P %a %b %d, %Y
-
diff --git a/.config/xresources/cursor.xdefaults b/.config/xresources/cursor.xdefaults
new file mode 100644
index 0000000..5b87712
--- /dev/null
+++ b/.config/xresources/cursor.xdefaults
@@ -0,0 +1,3 @@
+! Cursour Settings !
+Xcursor*theme: Vanilla-DMZ
+Xcursor.size: 22
diff --git a/.config/xresources/font.xdefaults b/.config/xresources/font.xdefaults
new file mode 100644
index 0000000..617520f
--- /dev/null
+++ b/.config/xresources/font.xdefaults
@@ -0,0 +1,3 @@
+! Xft Settings !
+Xft.dpi: 96.0
+Xft.antialias: true
diff --git a/.config/xresources/xclock.xdefaults b/.config/xresources/xclock.xdefaults
new file mode 100644
index 0000000..8fdcab0
--- /dev/null
+++ b/.config/xresources/xclock.xdefaults
@@ -0,0 +1,5 @@
+xclock*analog: false
+xclock*update: 1
+! update every 1 sec
+xclock*Foreground: white
+xclock*background: black
diff --git a/.config/xresources/xpdf.xdefaults b/.config/xresources/xpdf.xdefaults
new file mode 100644
index 0000000..a8daea7
--- /dev/null
+++ b/.config/xresources/xpdf.xdefaults
@@ -0,0 +1,6 @@
+xpdf*enableFreetype: yes
+xpdf*antialias: yes
+xpdf*foreground: white
+xpdf*background: black
+xpdf*urlCommand: /usr/bin/firefox %s
+xpdf*viKeys: on
diff --git a/.config/xresources/xscreensaver.xdefaults b/.config/xresources/xscreensaver.xdefaults
new file mode 100644
index 0000000..70f50ab
--- /dev/null
+++ b/.config/xresources/xscreensaver.xdefaults
@@ -0,0 +1,28 @@
+!font settings
+xscreensaver.Dialog.headingFont: -*-fixed-bold-r-*-*-*-100-*-*-*-*-iso8859-1
+xscreensaver.Dialog.bodyFont: -*-fixed-medium-r-*-*-*-120-*-*-*-*-iso8859-1
+xscreensaver.Dialog.labelFont: -*-fixed-medium-r-*-*-*-120-*-*-*-*-iso8859-1
+xscreensaver.Dialog.unameFont: -*-fixed-medium-r-*-*-*-120-*-*-*-*-iso8859-1
+xscreensaver.Dialog.buttonFont: -*-fixed-bold-r-*-*-*-120-*-*-*-*-iso8859-1
+xscreensaver.Dialog.dateFont: -*-fixed-medium-r-*-*-*-100-*-*-*-*-iso8859-1
+xscreensaver.passwd.passwdFont: -*-fixed-bold-r-*-*-*-100-*-*-*-*-iso8859-1
+!general dialog box (affects main hostname, username, password text)
+xscreensaver.Dialog.foreground: #ffffff
+xscreensaver.Dialog.background: #111111
+xscreensaver.Dialog.topShadowColor: #111111
+xscreensaver.Dialog.bottomShadowColor: #111111
+xscreensaver.Dialog.Button.foreground: #666666
+xscreensaver.Dialog.Button.background: #ffffff
+!username/password input box and date text colour
+xscreensaver.Dialog.text.foreground: #666666
+xscreensaver.Dialog.text.background: #ffffff
+xscreensaver.Dialog.internalBorderWidth:24
+xscreensaver.Dialog.borderWidth: 20
+xscreensaver.Dialog.shadowThickness: 2
+! shado thickness - must be > zero
+!timeout bar (background is actually determined by Dialog.text.background)
+xscreensaver.passwd.thermometer.foreground: #ff0000
+xscreensaver.passwd.thermometer.background: #000000
+xscreensaver.passwd.thermometer.width: 8
+!datestamp format--see the strftime(3) manual page for details
+xscreensaver.dateFormat: %I:%M%P %a %b %d, %Y
diff --git a/.config/xresources/xterm.xdefaults b/.config/xresources/xterm.xdefaults
new file mode 100644
index 0000000..3d92b6d
--- /dev/null
+++ b/.config/xresources/xterm.xdefaults
@@ -0,0 +1,2 @@
+xterm*foreground: white
+xterm*background: black
diff --git a/.scripts/set_xressources.sh b/.scripts/set_xressources.sh
new file mode 100755
index 0000000..ef56179
--- /dev/null
+++ b/.scripts/set_xressources.sh
@@ -0,0 +1,4 @@
+find ~/.config/ \
+ -mindepth 2 -maxdepth 2 \
+ -type f -iname "*.xdefaults" \
+ -exec xrdb -merge {} \;
diff --git a/.xinitrc b/.xinitrc
index 70bbb01..7e2174a 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,3 +1,5 @@
+[[ -x ~/.scripts/set_xressources.sh ]] && ~/.scripts/set_xressources.sh
+
#chooser="/etc/X11/chooser.sh"
#session=$(XSESSION="${1}" ${chooser})
#exec ${session:-$(${chooser})}