From 44cde0e4d41a170453a41cede51495b5e3bfa9c5 Mon Sep 17 00:00:00 2001
From: Joseph Groocock <frebib@gmail.com>
Date: Mon, 16 May 2016 17:43:27 +0100
Subject: [PATCH] Unify terminal & font configuration

---
 .Xresources            | 17 +++++++----------
 .config/termite/config |  2 +-
 .profile               |  1 +
 .vimrc                 |  5 ++++-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.Xresources b/.Xresources
index 072f453..02d5e98 100644
--- a/.Xresources
+++ b/.Xresources
@@ -7,10 +7,7 @@ urxvt.depth:                32
 
 urxvt.internalBorder:       4
 urxvt.blurRadius:           25
-urxvt.scrollBar:            true
-urxvt.scrollBar_right:      true
-urxvt.scrollBar_floating:   false
-urxvt.scrollstyle:          plain
+urxvt.scrollBar:            false
 urxvt.saveLines:            10000
 urxvt.preeditType:          Root
 urxvt.jumpScroll:           false
@@ -27,11 +24,11 @@ Xft.rgba:                   rgb
 Xft.autohint:               false
 Xft.hinting:                true
 Xft.hintstyle:              hintfull
-urxvt*font:                 xft:Sauce Code Pro:style=Regular:size=10.6
-urxvt*imFont:               xft:Sauce Code Pro:style=Regular:size=10.6
-urxvt*boldFont:             xft:Sauce Code Pro:style=Bold:size=10.6
-urxvt*italicFont:           xft:Sauce Code Pro:style=Italic:size=10.6
-urxvt*boldItalicFont:       xft:Sauce Code Pro:style=Bold,Italic:size=10.6
+urxvt*font:                 xft:Sauce Code Pro:style=Regular:size=10.5
+urxvt*imFont:               xft:Sauce Code Pro:style=Regular:size=10.5
+urxvt*boldFont:             xft:Sauce Code Pro:style=Bold:size=10.5
+urxvt*italicFont:           xft:Sauce Code Pro:style=Italic:size=10.5
+urxvt*boldItalicFont:       xft:Sauce Code Pro:style=Bold,Italic:size=10.5
 
 
 ! clickable Url and copy paste keys
@@ -57,7 +54,7 @@ Xft.lcdfilter:              lcddefault
 !*.cursorColor:              #ECEFF1
 *.cursorColor:              #5294E2
 *.highlightColor:           #5294E2
-urxvt.background:           [80]#002B36
+urxvt.background:           [95]#383C4A
 urxvt.scrollColor:          #767B87
 urxvt*dynamicColors:        on
 urxvt*highlightSelection:   true
diff --git a/.config/termite/config b/.config/termite/config
index 0d0335c..db1c5e2 100644
--- a/.config/termite/config
+++ b/.config/termite/config
@@ -7,7 +7,7 @@ size_hints = true
 [colors]
 cursor     = #5294E2
 foreground = #ECEFF1
-background = rgba(20, 60, 69, 0.96)
+background = rgba(56, 60, 74, 0.95)
 highlight  = #5294E2
 
 # black
diff --git a/.profile b/.profile
index 6af4e64..51e6202 100644
--- a/.profile
+++ b/.profile
@@ -9,6 +9,7 @@ export XDG_CURRENT_DESKTOP="GNOME" # Fixes xdg-open
 export EDITOR="vim"
 export VISUAL="vim"
 export PAGER="less -R"
+export TERMINAL="termite"
 export BROWSER="google-chrome-stable"
 export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
 export QT_STYLE_OVERRIDE=GTK+
diff --git a/.vimrc b/.vimrc
index 68c597e..57c59c3 100644
--- a/.vimrc
+++ b/.vimrc
@@ -12,7 +12,10 @@ set laststatus=2
 set mouse=a
 set encoding=utf-8
 set background=dark
-set guifont=Sauce\ Code\ Pro\ 10.6
+
+" GVim settings
+set guifont=Sauce\ Code\ Pro\ 10.5
+set guioptions=
 
 " Change to dvorak-mapped keys
 let g:use_dvorak = 1