From 61eae6bd30933f1273739079174133e9046b1bf1 Mon Sep 17 00:00:00 2001
From: Jesse Morgan <jesse@jesterpm.net>
Date: Fri, 10 Oct 2014 17:09:16 -0700
Subject: Adding pathogen, syntatic, and other changes.

---
 .gitmodules               |  3 +++
 base/Xresources           | 13 +++++++------
 base/conkyrc-json         |  2 +-
 base/vim/bundle/syntastic |  1 +
 base/vimrc                | 18 ++++++++++++++----
 5 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 base/vim/bundle/syntastic

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..34fa261
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "base/vim/bundle/syntastic"]
+	path = base/vim/bundle/syntastic
+	url = https://github.com/scrooloose/syntastic.git
diff --git a/base/Xresources b/base/Xresources
index 95aceef..cb61578 100644
--- a/base/Xresources
+++ b/base/Xresources
@@ -10,19 +10,20 @@ Xft.lcdfilter: lcddefault
 *color12: #5895cf
 
 Rxvt.background: #1a1a1a
-Rxvt.foreground: white
+Rxvt.foreground: grey
 Rxvt.scrollBar: false
-Rxvt.font: xft:Inconsolata:size=11:autohint=true
-!Rxvt.letterSpace: 0
-Rxvt.fade: 25
+Rxvt.font: xft:Inconsolata:size=12:autohint=true
+Rxvt.fade: 5
+Rxvt.termName: xterm
 
 URxvt*urgentOnBell: true
 URxvt*transparent: true
-URxvt*shading: 15
+URxvt*shading: 20
 
 XTerm*background: rgb:1a/1a/1a
-XTerm*foreground: white
+XTerm*foreground: grey
 XTerm*scrollBar: false
 XTerm*faceName: xft:Inconsolata:size=12:autohint=true
 XTerm*bellIsUrgent: true
 XTerm*eightBitInput: false
+
diff --git a/base/conkyrc-json b/base/conkyrc-json
index e164a10..5ef86e5 100644
--- a/base/conkyrc-json
+++ b/base/conkyrc-json
@@ -34,7 +34,7 @@ ${endif}
 
 { "full_text":"♪ ${exec pactl list sinks | awk '/Volume: 0:/ {print substr($3, 1, index($3, "%") - 1)}'|head -n 1}" },
 
-{ "full_text":"${time %a %d %b %Y} ${time %H:%M:%S}",
+{ "full_text":"${time %a %d %b %Y} ${time %H:%M:%S} ${utime %H:%M}",
   "short_text":"${time %H:%M:%S}" }
 
 ],
diff --git a/base/vim/bundle/syntastic b/base/vim/bundle/syntastic
new file mode 160000
index 0000000..008ac98
--- /dev/null
+++ b/base/vim/bundle/syntastic
@@ -0,0 +1 @@
+Subproject commit 008ac98299bb4fcd3fc4dedcd5f99dc04ff15095
diff --git a/base/vimrc b/base/vimrc
index 7e68671..a79bf14 100644
--- a/base/vimrc
+++ b/base/vimrc
@@ -1,5 +1,5 @@
 " Setting editor defaults
-set nu
+set rnu
 syntax on
 set bg=dark
 set diffopt=filler,iwhite " keep files synced and ignore whitespace
@@ -39,12 +39,22 @@ set statusline+=%<%f\ %h%m%r
 set statusline+=%=
 set statusline+=%-14.(%l,%c%V%)\ %P
 
+" Emacs-like bindings in the command line
+cnoremap <C-a> <Home>
+cnoremap <C-e> <End>
+cnoremap <C-p> <Up>
+cnoremap <C-n> <Down>
+cnoremap <C-b> <Left>
+cnoremap <C-f> <Right>
+cnoremap <M-b> <S-Left>
+cnoremap <M-f> <S-Right>
+
 " filetypes
 filetype plugin on
 filetype indent on
 filetype on
 
-"Set colorscheme. 
+"Set colorscheme.
 colorscheme slate
 
 " Turn off highlighting after search
@@ -131,11 +141,11 @@ EOT
 " Scratch Plugin
 let g:scratchBackupFile="/tmp/scratch.txt"
 
-iab --> →
-
 " Quicker compile & check
 map <C-x> :silent make<Enter>:copen<Enter><C-w><C-w>:redraw<Enter>
 
+execute pathogen#infect()
+
 " Load host-specific settings
 set runtimepath^=~/.host-specific/vim,
 set runtimepath+=~/.host-specific/vim/after
-- 
cgit v1.2.3