From 6c41613f55a0d7101adedfe0c4aae46db737f3c3 Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Sat, 17 Aug 2013 19:54:48 -0500
Subject: [PATCH] Upgrade to vim 7.4, remove vim alias

+ used macvim's --override-system-vim flag to upgrade system vim to 7.4
+ Changed from zencoding-vim to emmet-vim
+ turned syntastic on
+ add stylus vim plugin
---
 ack/ackrc.symlink           | 3 ++-
 vim/aliases.zsh             | 6 ------
 vim/vim.symlink/plugins.vim | 5 +++--
 vim/vimrc.symlink           | 5 ++++-
 4 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 vim/aliases.zsh

diff --git a/ack/ackrc.symlink b/ack/ackrc.symlink
index 596a46c..f03361c 100644
--- a/ack/ackrc.symlink
+++ b/ack/ackrc.symlink
@@ -10,7 +10,8 @@
 --ignore-dir=node_modules
 
 # added file types
---type-set=css=.css,.less,.scss
+--type-set=css=.css,.less,.scss,.styl
+--type-set=styl=.styl
 --type-set=less=.less
 --type-set=html=.html,.mustache,.handlebars,.tmpl
 --type-set=json=.json
diff --git a/vim/aliases.zsh b/vim/aliases.zsh
deleted file mode 100644
index 8166931..0000000
--- a/vim/aliases.zsh
+++ /dev/null
@@ -1,6 +0,0 @@
-# load the macvim version of terminal vim
-if which mvim &> /dev/null; then
-    alias vim='mvim -v'
-fi
-
-alias v='vim'
diff --git a/vim/vim.symlink/plugins.vim b/vim/vim.symlink/plugins.vim
index e7d70a1..9ee4013 100644
--- a/vim/vim.symlink/plugins.vim
+++ b/vim/vim.symlink/plugins.vim
@@ -17,6 +17,7 @@ Bundle 'othree/html5.vim'
 Bundle 'pangloss/vim-javascript'
 Bundle 'itspriddle/vim-jquery'
 Bundle 'tpope/vim-markdown'
+Bundle 'wavded/vim-stylus'
 Bundle 'mmalecki/vim-node.js'
 " Bundle 'Lokaltog/vim-powerline'
 Bundle 'tpope/vim-ragtag'
@@ -28,7 +29,7 @@ Bundle 'kchmck/vim-coffee-script'
 Bundle 'groenewege/vim-less'
 Bundle 'tsaleh/vim-matchit'
 Bundle 'benmills/vimux'
-Bundle 'mattn/zencoding-vim'
+Bundle 'mattn/emmet-vim'
 Bundle 'ap/vim-css-color'
 " Bundle 'nicknisi/ir-whack'
 Bundle 'flazz/vim-colorschemes'
@@ -36,7 +37,7 @@ Bundle 'editorconfig/editorconfig-vim'
 Bundle 'juvenn/mustache.vim'
 Bundle 'tclem/vim-arduino'
 Bundle 'bling/vim-airline'
-" Bundle 'scrooloose/syntastic'
+Bundle 'scrooloose/syntastic'
 Bundle "MarcWeber/vim-addon-mw-utils"
 Bundle "tomtom/tlib_vim"
 Bundle 'garbas/vim-snipmate'
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index eb72500..3274a9a 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -172,6 +172,9 @@ set laststatus=2 " show the satus line all the time
 " clear search results on escape
 nnoremap <silent> <esc> :nohlsearch<cr><esc>
 
+" Close the current buffer
+noremap <C-x> :q<cr>
+
 " remap esc
 inoremap jk <esc>
 
@@ -289,7 +292,7 @@ let g:ctrlp_working_path_mode = 2
 " airline options
 " let g:airline_left_sep=''
 " let g:airline_right_sep=''
-let g:airline_theme='light'
 let g:airline_powerline_fonts=1
+let g:airline_theme='solarized'
 
 let vimrc_already_sourced = 1