aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Kavanagh <rak@debian.org>2015-09-01 15:38:51 -0400
committerRyan Kavanagh <rak@debian.org>2015-09-01 15:38:51 -0400
commitbb9ecc103ac09667c9ca2b772fc0f852a5740c8f (patch)
tree3c535b90f62d5efdcdbfcafd481a41121040879c
parentAdded CMU email to nail (diff)
~/.Xdefaults is deprecated, we should use ~/.Xresources
Diffstat (limited to '')
-rw-r--r--.Xresources (renamed from .Xdefaults)0
-rwxr-xr-x.xinitrc1
-rwxr-xr-xMakefile2
3 files changed, 2 insertions, 1 deletions
diff --git a/.Xdefaults b/.Xresources
index d34749b..d34749b 100644
--- a/.Xdefaults
+++ b/.Xresources
diff --git a/.xinitrc b/.xinitrc
index 54eb999..61c8db8 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,4 +1,5 @@
#!/bin/sh
+[[ -f ~/.Xresources ]] && xrdb -merge -I$HOME ~/.Xresources
redshift -m REDSHIFT_MODE -l 44.22:-76.48 -t 6500:2500 &
${HOME}/bin/icd
# xcompmgr &
diff --git a/Makefile b/Makefile
index d0ec71f..eefcd0c 100755
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ GPG_FILES = \
# Files that are system independent.
# IMPORTANT: directories must have trailing slash
GLOBAL_FILES = \
- .Xdefaults \
+ .Xresources \
.Xsession \
.asoundrc \
.calendar/ \