3 files changed, 16 insertions, 15 deletions
diff --git a/.vimrc b/.vimrc
index e27f369..132624a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -18,6 +18,7 @@ Plugin 'Tabular'
 Plugin 'tComment'
 Plugin 'Gundo'
 Plugin 'altercation/vim-colors-solarized'
+Plugin 'honza/vim-snippets'
 
 filetype plugin indent on
 
@@ -50,7 +51,8 @@ let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
 
 let g:ctrlp_map = '<c-p>'
 let g:ctrlp_by_filename = 1
-let g:ctrlp_working_path_mode = 'w'
+let g:ctrlp_working_path_mode = ''
+let g:ctrlp_show_hidden = 1
 
 ""  Options  
 
@@ -89,9 +91,14 @@ set fillchars=fold:\ ,vert:\ ,
 set showbreak=...
 set colorcolumn=0
 set scrolloff=3
-set t_Co=256
+if has('gui_running')
+    set t_Co=256
+else
+    set t_Co=16
+endif
 set guitablabel=%N\ %t\ %M
 set background=dark
+set showcmd
 
 "  Layout text
 set wrap
@@ -176,7 +183,7 @@ autocmd Filetype tex call SetTexOptions()
 hi Cursor guifg=white guibg=blue
 hi iCursor guifg=black guibg=green
 hi! link conceal normal
-" hi! link folded error
+hi! link folded normal
 
 ""  Functions  
 function! Tex_ForwardSearchLaTeX()
diff --git a/.zshrc b/.zshrc
index 81034bd..773ed55 100644
--- a/.zshrc
+++ b/.zshrc
@@ -7,6 +7,8 @@ export ZSH=$HOME/.oh-my-zsh
 # time that oh-my-zsh is loaded.
 ZSH_THEME="eastwood"
 
+xmodmap ~/.xmodmap
+
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
 
@@ -57,15 +59,7 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/g
 # You may need to manually set your language environment
 # export LANG=en_US.UTF-8
 
-# Preferred editor for local and remote sessions
-# if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
-# else
-#   export EDITOR='mvim'
-# fi
-
-# Compilation flags
-# export ARCHFLAGS="-arch x86_64"
+export EDITOR=/usr/bin/vim
 
 # ssh
 # export SSH_KEY_PATH="~/.ssh/dsa_id"
diff --git a/install.sh b/install.sh
index 20afd9e..95567e3 100755
--- a/install.sh
+++ b/install.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-dir=~/dotfiles                    # dotfiles directory
-olddir=~/dotfiles_old             # old dotfiles backup directory
-files="bashrc vimrc vim zshrc xmodmap"    # list of files/folders to symlink in homedir
+dir=~/dotfiles
+olddir=~/dotfiles_old
+files="bashrc vimrc zshrc muttrc vim xmodmap"
 
 mkdir -p $olddir
 cd $dir