From 177ef4d1f351c579df880a7af0b58df4c6b4fb53 Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 16 Feb 2015 17:59:41 +0100
Subject: [PATCH] update now WITH install script

---
 .Xresources                 | 41 +++++++++++++++++++++----------------
 {i3 => .config/i3}/bar      |  0
 {i3 => .config/i3}/config   |  0
 {i3 => .config/i3}/gpass.sh |  0
 install.sh                  | 14 ++++++++++++-
 urxvtd@.service             |  9 --------
 6 files changed, 36 insertions(+), 28 deletions(-)
 rename {i3 => .config/i3}/bar (100%)
 rename {i3 => .config/i3}/config (100%)
 rename {i3 => .config/i3}/gpass.sh (100%)
 delete mode 100644 urxvtd@.service

diff --git a/.Xresources b/.Xresources
index 468a3bd..c1094f2 100644
--- a/.Xresources
+++ b/.Xresources
@@ -1,3 +1,5 @@
+Xcursor.theme: Premium
+
 Xft.antialias: 1
 Xft.hinting: 1
 Xft.hintstyle: hintfull
@@ -5,25 +7,25 @@ Xft.lcdfilter: lcddefault
 Xft.rgba: rgb
 Xft.dpi: 96
 
-URxvt.background: rgb:00/00/00
-URxvt.foreground: rgb:a8/a8/a8
-URxvt.color0:  #2E3436
-URxvt.color1:  #a40000
-URxvt.color2:  #4E9A06
-URxvt.color3:  #C4A000
-URxvt.color4:  #3465A4
-URxvt.color5:  #75507B
-URxvt.color6:  #ce5c00
-URxvt.color7:  #babdb9
-URxvt.color8:  #555753
-URxvt.color9:  #EF2929
-URxvt.color10: #8AE234
-URxvt.color11: #FCE94F
-URxvt.color12: #729FCF
-URxvt.color13: #AD7FA8
-URxvt.color14: #fcaf3e
-URxvt.color15: #EEEEEC
 URxvt.fading: 10
+URxvt.background: rgb:00/00/00
+URxvt.foreground: rgb:cf/cf/cf
+URxvt.color0:     rgb:00/00/00
+URxvt.color1:     rgb:e0/10/10
+URxvt.color2:     rgb:20/ad/20
+URxvt.color3:     rgb:d4/c2/4f
+URxvt.color4:     rgb:23/1b/b8
+URxvt.color5:     rgb:9c/38/85
+URxvt.color6:     rgb:1d/bd/b8
+URxvt.color7:     rgb:fe/fe/fe
+URxvt.color8:     rgb:6a/6a/6a
+URxvt.color9:     rgb:e8/3a/3d
+URxvt.color10:    rgb:35/e9/56
+URxvt.color11:    rgb:ff/ff/2f
+URxvt.color12:    rgb:3a/53/f0
+URxvt.color13:    rgb:e6/28/ba
+URxvt.color14:    rgb:1c/f5/f5
+URxvt.color15:    rgb:ff/ff/ff
 URxvt.font: xft:DejaVu Sans Mono:style=Book:pixelsize=12
 URxvt.boldFont: xft:DejaVu Sans Mono:style=Bold:pixelsize=12
 URxvt.italicFont: xft:DejaVu Sans Mono:style=Oblique:pixelsize=12
@@ -44,6 +46,9 @@ URxvt.keysym.C-Up: perl:font-size:increase
 URxvt.keysym.C-Down: perl:font-size:decrease
 URxvt.keysym.C-Left: perl:font-size:reset
 
+x11-ssh-askpass*font: xft:DejaVu Sans Mono:style=Book:pixelsize=12
+x11-ssh-askpass*borderWidth: 0
+
 gv.watchFile: 1
 gv.saveposFilename: ~/.cache/gv.savepos
 gv.style: gv_spartan.dat
diff --git a/i3/bar b/.config/i3/bar
similarity index 100%
rename from i3/bar
rename to .config/i3/bar
diff --git a/i3/config b/.config/i3/config
similarity index 100%
rename from i3/config
rename to .config/i3/config
diff --git a/i3/gpass.sh b/.config/i3/gpass.sh
similarity index 100%
rename from i3/gpass.sh
rename to .config/i3/gpass.sh
diff --git a/install.sh b/install.sh
index 9a25bfb..6b7c8d6 100644
--- a/install.sh
+++ b/install.sh
@@ -1 +1,13 @@
-cp -v "$PWD/urxvtd\@.service" /etc/systemd/system/
+# Set keymaps
+sudo localectl set-x11-keymap --no-convert dvorak,ru pc104 ,phonetic_dvorak compose:ralt,grp:menu_toggle
+sudo localectl set-keymap --no-convert dvorak
+
+# Link the dotfiles
+hf=(.bashrc .gitconfig .inputrc .notmuch-config .vimrc .xinitrc .Xresources
+.vim .mutt/mailcap .mutt/msmtprc .mutt/muttrc .mutt/offlineimap.py
+.mutt/offlineimaprc .config/i3/bar .config/i3/config .config/i3/gpass.sh)
+for f in ${hf[*]}
+do
+	unlink "$HOME/$f" || true
+	ln -vs "$PWD/$f" "$HOME/$f"
+done
diff --git a/urxvtd@.service b/urxvtd@.service
deleted file mode 100644
index 12dce62..0000000
--- a/urxvtd@.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Urxvtd
-
-[Service]
-User=%i
-ExecStart=/usr/bin/urxvtd -q -o
-
-[Install]
-WantedBy=multi-user.target
-- 
2.20.1