From bb9ecc103ac09667c9ca2b772fc0f852a5740c8f Mon Sep 17 00:00:00 2001
From: Ryan Kavanagh <rak@debian.org>
Date: Tue, 1 Sep 2015 15:38:51 -0400
Subject: ~/.Xdefaults is deprecated, we should use ~/.Xresources

---
 .Xdefaults  | 38 --------------------------------------
 .Xresources | 38 ++++++++++++++++++++++++++++++++++++++
 .xinitrc    |  1 +
 Makefile    |  2 +-
 4 files changed, 40 insertions(+), 39 deletions(-)
 delete mode 100644 .Xdefaults
 create mode 100644 .Xresources

diff --git a/.Xdefaults b/.Xdefaults
deleted file mode 100644
index d34749b..0000000
--- a/.Xdefaults
+++ /dev/null
@@ -1,38 +0,0 @@
-XTerm*metaSendsEscape: true
-XTerm*eightBitInput: false
-URxvt.background: #000000
-URxvt.foreground: #ffffff
-URxvt.colorBD: #ffffff
-URxvt.cursorColo: #e0e080
-URxvt.hilightColor: #f0f0f0
-URxvt.scrollBar: false
-URxvt.scrollstyle: xterm
-URxvt.transparent: true
-URxvt.tint: black
-URxvt.shading: 15
-URxvt*color4: #0055FF
-URxvt*color12: #0088FF
-URxvt.underlineColor: yellow
-URxvt.saveLines: 8192
-URxvt.mapAlert: true
-URxvt.font: xft:Inconsolata:size=7,xft:DejaVu Sans Mono:size=7,xft:Liberation Mono:size=7
-URxvt.perl-lib: /home/ryan/.urxvt
-URxvt.perl-ext-common: default,matcher,mark-and-yank
-//URxvt*bellCommand: zenity --info --text="Bell in URxvt"
-URxvt*urlLauncher: firefox
-URxvt.matcher.button: 1
-URxvt.visualBell: false
-URxvt.urgentOnBell: true
-URxvt.keysym.M-C-1: command:\033]50;xft:Inconsolata:size=7,xft:DejaVu Sans Mono:size=7,xft:Liberation Mono:size=7\007
-URxvt.keysym.M-C-2: command:\033]50;xft:Inconsolata:size=9,xft:DejaVu Sans Mono:size=9,xft:Liberation Mono:size=9\007
-URxvt.keysym.M-C-3: command:\033]50;xft:Inconsolata:size=11,xft:DejaVu Sans Mono:size=11,xft:Liberation Mono:size=11\007
-URxvt.keysym.M-Y: perl:mark-and-yank:activate_mark_mode
-URxvt.keysym.M-U: perl:mark-and-yank:activate_mark_url_mode
-XLock*logoutButton:     -1
-Xft.antialias:  1
-Xft.dpi:        97
-Xft.hinting:    1
-Xft.hintstyle:  hintfull
-Xft.rgba:       bgr
-Xpdf*fileFilterStyle:   filter_hidden_files
-xlock.bg: #000000
diff --git a/.Xresources b/.Xresources
new file mode 100644
index 0000000..d34749b
--- /dev/null
+++ b/.Xresources
@@ -0,0 +1,38 @@
+XTerm*metaSendsEscape: true
+XTerm*eightBitInput: false
+URxvt.background: #000000
+URxvt.foreground: #ffffff
+URxvt.colorBD: #ffffff
+URxvt.cursorColo: #e0e080
+URxvt.hilightColor: #f0f0f0
+URxvt.scrollBar: false
+URxvt.scrollstyle: xterm
+URxvt.transparent: true
+URxvt.tint: black
+URxvt.shading: 15
+URxvt*color4: #0055FF
+URxvt*color12: #0088FF
+URxvt.underlineColor: yellow
+URxvt.saveLines: 8192
+URxvt.mapAlert: true
+URxvt.font: xft:Inconsolata:size=7,xft:DejaVu Sans Mono:size=7,xft:Liberation Mono:size=7
+URxvt.perl-lib: /home/ryan/.urxvt
+URxvt.perl-ext-common: default,matcher,mark-and-yank
+//URxvt*bellCommand: zenity --info --text="Bell in URxvt"
+URxvt*urlLauncher: firefox
+URxvt.matcher.button: 1
+URxvt.visualBell: false
+URxvt.urgentOnBell: true
+URxvt.keysym.M-C-1: command:\033]50;xft:Inconsolata:size=7,xft:DejaVu Sans Mono:size=7,xft:Liberation Mono:size=7\007
+URxvt.keysym.M-C-2: command:\033]50;xft:Inconsolata:size=9,xft:DejaVu Sans Mono:size=9,xft:Liberation Mono:size=9\007
+URxvt.keysym.M-C-3: command:\033]50;xft:Inconsolata:size=11,xft:DejaVu Sans Mono:size=11,xft:Liberation Mono:size=11\007
+URxvt.keysym.M-Y: perl:mark-and-yank:activate_mark_mode
+URxvt.keysym.M-U: perl:mark-and-yank:activate_mark_url_mode
+XLock*logoutButton:     -1
+Xft.antialias:  1
+Xft.dpi:        97
+Xft.hinting:    1
+Xft.hintstyle:  hintfull
+Xft.rgba:       bgr
+Xpdf*fileFilterStyle:   filter_hidden_files
+xlock.bg: #000000
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/ \
-- 
cgit v1.2.3