@@ -1 +1,10 @@

 *.pyc

+.vimrc.[0-9]*

+*.old

+.*.sw?

+.xmonad/history

+.xmonad/xmonad-x86_64-linux

+.xmonad/xmonad.errors

+.xmonad/xmonad.hi

+.xmonad/xmonad.o

+

@@ -1,15 +1,16 @@

-" This goes here in case a filetype overrides it

+let g:python_host_prog = '/usr/bin/python'

+let g:python3_host_prog = '/usr/bin/python3'

 "NeoBundle Scripts-----------------------------

 if has('vim_starting')

   set nocompatible               " Be iMproved

   " Required:

-  set runtimepath+=$HOME/.vim/bundle/neobundle.vim/

+  set runtimepath+=$HOME/.nvim/bundle/neobundle.vim/

 endif

 " Required:

-call neobundle#begin(expand("$HOME/.vim/bundle"))

+call neobundle#begin(expand("$HOME/.nvim/bundle"))

 " Let NeoBundle manage NeoBundle

 " Required:

@@ -23,10 +24,10 @@ NeoBundle 'bling/vim-airline'

 NeoBundle 'burnettk/vim-angular'

 NeoBundle 'christoomey/vim-tmux-navigator'

 NeoBundle 'curist/vim-angular-template'

-NeoBundle 'eagletmt/ghcmod-vim'

-NeoBundle 'eagletmt/neco-ghc'

-"NeoBundle 'enomsg/vim-haskellConcealPlus'

+NeoBundle 'edsono/vim-matchit'

 NeoBundle 'exu/pgsql.vim'

+NeoBundle 'fiddlerwoaroof/htmljinja'

+NeoBundle 'fiddlerwoaroof/vim-jinja'

 NeoBundle 'godlygeek/tabular'

 NeoBundle 'groenewege/vim-less'

 NeoBundle 'guns/vim-clojure-static'

@@ -34,20 +35,24 @@ NeoBundle 'ivanov/vim-ipython'

 NeoBundle 'jmcantrell/vim-virtualenv'

 NeoBundle 'kien/rainbow_parentheses.vim'

 NeoBundle 'kovisoft/slimv'

-"NeoBundle 'lukerandall/haskellmode-vim'

+"NeoBundle 'm2mdas/phpcomplete-extended'

+NeoBundle 'markcornick/vim-vagrant'

 NeoBundle 'matthewsimo/angular-vim-snippets'

+NeoBundle 'mattn/emmet-vim.git'

 NeoBundle 'msanders/snipmate.vim'

 NeoBundle 'othree/javascript-libraries-syntax.vim'

 NeoBundle 'pangloss/vim-javascript'

-NeoBundle 'raichoo/haskell-vim'

+"NeoBundle 'rking/ag.vim' "Ag search utility

+NeoBundle 'rust-lang/rust.vim'

 NeoBundle 'scrooloose/nerdcommenter'

+NeoBundle 'scrooloose/nerdtree'

 NeoBundle 'scrooloose/syntastic'

 NeoBundle 'Shougo/unite-outline'

 NeoBundle 'Shougo/unite.vim'

 NeoBundle 'Shougo/vimfiler.vim'

 NeoBundle 'Shougo/vimproc'

 NeoBundle 'Shougo/vimshell.vim'

-NeoBundle 'sjl/gundo.vim'

+NeoBundle 'simnalamburt/vim-mundo'

 NeoBundle 'sjl/vitality.vim'

 NeoBundle 'sophacles/vim-bundle-mako'

 NeoBundle 'terryma/vim-multiple-cursors'

@@ -55,15 +60,20 @@ NeoBundle 'tpope/vim-fireplace'

 NeoBundle 'tpope/vim-fugitive'

 NeoBundle 'tpope/vim-repeat'

 NeoBundle 'tpope/vim-surround'

-"NeoBundle 'Twinside/vim-haskellFold'

-NeoBundle 'Twinside/vim-hoogle'

+"NeoBundle 'Valloric/YouCompleteMe'

 NeoBundle 'vim-pandoc/vim-pandoc'

 NeoBundle 'vim-scripts/dbext.vim'

+NeoBundle 'vim-scripts/php.vim--Garvin'

 NeoBundle 'vim-scripts/pydoc.vim'

 NeoBundle 'vim-scripts/VimClojure'

 NeoBundle 'vim-voom/VOoM'

 NeoBundle 'ytsunetsune/unite-outline-euslisp'

-NeoBundle 'mattn/emmet-vim.git'

+

+NeoBundle 'neovimhaskell/haskell-vim'

+NeoBundle 'enomsg/vim-haskellConcealPlus'

+NeoBundle 'eagletmt/ghcmod-vim'

+NeoBundle 'eagletmt/neco-ghc'

+NeoBundle 'Twinside/vim-hoogle'

 " Required:

 call neobundle#end()

@@ -75,31 +85,32 @@ filetype plugin indent on

 " this will conveniently prompt you to install them.

 NeoBundleCheck

 "End NeoBundle Scripts-------------------------

-set mouse=

+

+set mouse= ";; Disable mouse sensitivity !!!

 set nohlsearch

 let counter = 0

-let g:syntastic_auto_loc_list=1

-let g:sql_type_default = 'pgsql'

 let g:airline_theme="murmur"

 let g:haddock_browser_callformat = "%s %s"

 let g:haddock_browser = "open"

 let g:lisp_rainbow=1 

+let g:pandoc#filetypes#handled = ["markdown", "rst", "textile"]

+let g:pandoc_formatting_settings = "h"

+let g:pandoc#modules#disabled =  ["command", "bibliographies"]

+let g:pandoc#modules#enabled =  ["formatting", "folding", "completion", "metadata","menu"]

 let g:pandoc_no_empty_implicits=1

 let g:pandoc_use_hard_wraps = 1

-let g:pandoc#modules#enabled =  ["formatting", "folding", "completion", "metadata","menu"]

-let g:pandoc#modules#disabled =  ["command", "bibliographies"]

-let g:pandoc_formatting_settings = "h"

-let g:pandoc#filetypes#handled = ["markdown", "rst", "textile"]

+let g:phpcomplete_index_composer_command = "composer"

 let g:slimv_disable_clojure=1

 let g:snips_author="Edward Langley"

 let g:solarized_termtrans=1

+let g:sql_type_default = 'pgsql'

+let g:syntastic_auto_loc_list=1

 let g:syntastic_python_checkers = ['python']

+let g:syntastic_scss_sass_args = "-r sass-css-importer -r susy"

 let g:Tex_CompileRule_pdf = 'xelatex -interaction=nonstopmode $*'

 let g:tex_flavor='xelatex'

 let g:unite_force_overwrite_statusline = 0

 let g:vimclojure#HighlightBuiltins = 1

-let g:vimclojure#HighlightBuiltins = 1

-let g:vimclojure#ParenRainbow = 1

 let g:vimclojure#ParenRainbow = 1

 let g:virtualenv_directory = "$HOME/python_envs"

 let maplocalleader=','

@@ -108,6 +119,7 @@ let python_highlight_all = 1

 let python_no_tab_space_error=1

 let python_space_errors=1

 let vimclojure#WantNailgun = 1

+" This goes here in case a filetype overrides it

 " IMPORTANT: grep will sometimes skip displaying the file name if you

@@ -158,7 +170,7 @@ set wildmode=longest,list

 set autoread

 set background=dark

 set pastetoggle=<F12>

-set undodir=~/.vim/undodir

+set undodir=~/.nvim/undodir

 set undofile

 set undolevels=10000

 set undoreload=100000

@@ -195,29 +207,30 @@ function Checkft()

   endif

 endfunction

-autocmd! BufNewFile * silent! 0r ~/.vim/skel/tmpl.%:e

-autocmd BufRead *.mako set ft=mako

-autocmd BufRead *.md set dictionary+=/usr/share/dict/words

+" when we reload, tell vim to restore the cursor to the saved position

+"autocmd FileType python map K \pW

+autocmd! BufNewFile * silent! 0r ~/.nvim/skel/tmpl.%:e

+autocmd BufRead,BufNewFile *.twig set filetype=htmljinja

+autocmd BufRead,BufNewFile *.mako set ft=mako

+autocmd BufRead,BufNewFile *.md set dictionary+=/usr/share/dict/words

 autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif

-autocmd BufRead *.tac set ft=python

-autocmd BufRead *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class

-autocmd BufWritePre *.py normal m`:%s/\s\+$//e ``

+autocmd BufRead,BufNewFile *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class

+autocmd BufRead,BufNewFile *.tac set ft=python

 autocmd bufwritepost * call Checkft()

+autocmd BufWritePre *.py normal m`:%s/\s\+$//e ``

+

+autocmd FileType haskell set omnifunc=necoghc#omnifunc

+autocmd FileType lisp set omnifunc=SlimvOmniComplete

 autocmd FileType markdown set linebreak tw=110 noexpandtab nosmartindent autoindent

 autocmd FileType pandoc set linebreak tw=110 noexpandtab nosmartindent autoindent

 autocmd FileType pantondoc set linebreak tw=110 noexpandtab nosmartindent autoindent

-"autocmd FileType python map K \pW

-autocmd FileType python set complete+=k~/.vim/syntax/python.vim "isk+=.,(

-autocmd FileType haskell set omnifunc=necoghc#omnifunc

-autocmd FileType lisp set omnifunc=SlimvOmniComplete

-" when we reload, tell vim to restore the cursor to the saved position

-

+autocmd FileType python set complete+=k~/.nvim/syntax/python.vim "isk+=.,(

 "Diable the anti-python smart indent of #

 inoremap  # X#

 "Turn Syntax Highlighting on by default, and assume the xterm background is black

-imap <C-g> :Unite outline -buffer-name=outline -resume -start-insert

-imap <F7> :Unite outline -buffer-name=outline -resume -start-insert

+imap <C-g> :Unite outline -buffer-name=outline -start-insert<CR>

+imap <F7> :Unite outline -buffer-name=outline -start-insert<CR>

 imap <F8> o
:,!pbpaste

 imap <F9> o
:,!pbpaste

 inoremap <expr> <C-L> ListItem()

@@ -231,13 +244,13 @@ inoremap <Return> <Return><C-g>u

 "inoremap <Tab> <Tab><C-g>u

 map <BS> dh

-map <C-g> :Unite outline -buffer-name=outline -resume -start-insert

+map <C-g> :Unite outline -buffer-name=outline -start-insert<CR>

 map CS :sil! :%s/\s\+$//g<CR>``:%s/^\(\t\+\)\( \+\(\t*\)\)\+/\1\3/gc<CR>``

-map <F7> :Unite outline -buffer-name=files -resume -start-insert

-map <F8> o
:,!pbpaste

-map <F9> o
:,!pbpaste

-map <leader>f :Unite file -buffer-name=files -resume<CR>i

-map <leader>q :Unite buffer -buffer-name=buffers -resume<CR>i

+map <F7> :Unite outline -buffer-name=files -start-insert<CR>

+map <F8> o
:,!pbpaste<CR>

+map <F9> o
:,!pbpaste<CR>

+map <leader>f :Unite file -buffer-name=files -start-insert<CR>

+map <leader>q :Unite buffer -buffer-name=buffers -start-insert<CR>

 map W wb"_dwP

 map ZX :wq<cr>

 map ZZ :w<CR>

@@ -249,14 +262,14 @@ nnoremap <C-K> <C-W><C-K>

 nnoremap <C-L> <C-W><C-L>

 nnoremap <F2> :set nonumber!<CR>:set foldcolumn=0<CR>

-"python << EOF

-"import os

-"import sys

-"import vim

-"for p in sys.path:

-"    if os.path.isdir(p):

-"        vim.command(r"set path+=%s" % (p.replace(" ", r"\ ")))

-"EOF

+python << EOF

+import os

+import sys

+import vim

+for p in sys.path:

+    if os.path.isdir(p):

+        vim.command(r"set path+=%s" % (p.replace(" ", r"\ ")))

+EOF

 func ListItem()

@@ -273,8 +286,8 @@ set diffopt=vertical,filler,iwhite,foldcolumn:0

 highlight PmenuSel ctermfg=LightGray  ctermbg=DarkRed

-if filereadable(".vim.custom")

-    so .vim.custom

+if filereadable(".nvim.custom")

+    so .nvim.custom

 endif

 let g:syntastic_javascript_checkers = ['jshint']

@@ -301,19 +314,17 @@ function! s:unite_my_settings()

 endfunction

 if executable('ag')

-  " let g:unite_source_file_async_command =

-  "           \ 'ag --follow --nocolor --nogroup --hidden -g ""'

-  " https://github.com/ggreer/the_silver_searcher

-  " Use ag in unite grep source.

-  " let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden ' .

-  "       \ '--ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'' ' .

-  "       \ '--ignore ''**/*.pyc'' -g ""'

-  let g:unite_source_grep_command = 'ag'

-  let g:unite_source_grep_default_opts =

-        \ '--line-numbers --nocolor --nogroup --hidden --ignore ' .

-        \ '''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'' ' .

-        \ '--ignore ''**/*.pyc'''

-  let g:unite_source_grep_recursive_opt = ''

+  let g:unite_source_file_async_command =

+            \ 'ag --follow --nocolor --nogroup --hidden -g "" --ignore ''.sass-cache'''

+  "https://github.com/ggreer/the_silver_searcher

+  "Use ag in unite grep source.

+  let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '--hidden', '-g', '', '--ignore', '.git', '--ignore', '.sass-cache']

+  "let g:unite_source_grep_command = 'ag'

+  "let g:unite_source_grep_default_opts =

+  "      \ '--line-numbers --nocolor --nogroup --hidden --ignore ' .

+  "      \ '''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'' ' .

+  "      \ '--ignore ''**/*.pyc'''

+  "let g:unite_source_grep_recursive_opt = ''

 elseif executable('ack-grep')

   let g:unite_source_grep_command = 'ack-grep'

   " Match whole word only. This might/might not be a good idea

@@ -336,6 +347,11 @@ nmap  [unite]f  :<C-u>Unite file_rec/async -start-insert<C-m>

 nmap  [unite]F  :<C-u>Unite file -start-insert<C-m>

 nmap  [unite]g  :<C-u>Unite file_rec/git -start-insert<C-m>

 nmap [unite]j :<C-u>Unite buffer -start-insert<C-m>

+nmap [unite]k :<C-u>Unite tab:no-current<C-m>

+nmap [unite]h :<C-u>set hlsearch!<C-m>

+nmap [unite]t :<C-u>NERDTreeToggle<CR>

+nmap [unite]u :<C-u>GundoToggle<CR>

+nmap [unite]r :<C-u>!vagrant rsync<CR>

 " Reload

 map <silent> tu :call GHC_BrowseAll()<CR>

@@ -9,6 +9,12 @@ bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iq v

 bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-l) || tmux select-pane -R"

 bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys 'C-\\') || tmux select-pane -l"

+# Open new windows/panes in same directory

+bind '"' split-window -c "#{pane_current_path}"

+bind % split-window -h -c "#{pane_current_path}"

+bind c new-window -c "#{pane_current_path}"

+

+

 set -g status-left-length 52

 set -g status-right-length 451

@@ -24,3 +30,4 @@ set -g status-left '#[fg=colour235,bg=colour252,bold]  #S #[fg=colour252,bg=colo

 set -g window-status-format "#[fg=white,bg=colour234] #I #W"

 set -g window-status-current-format "#[fg=colour234,bg=colour39] #[fg=colour25,bg=colour39,noreverse,bold] #I  #W #[fg=colour39,bg=colour234,nobold]"

+set -sg escape-time 0

@@ -1,4 +1,38 @@

-http://clean.cs.ru.nl" This goes here in case a filetype overrides it

+let counter = 0

+let g:syntastic_auto_loc_list=1

+let g:sql_type_default = 'pgsql'

+let g:airline_theme="murmur"

+let g:haddock_browser_callformat = "%s %s"

+let g:haddock_browser = "open"

+let g:lisp_rainbow=1 

+let g:pandoc_no_empty_implicits=1

+let g:pandoc_use_hard_wraps = 1

+let g:pandoc#modules#enabled =  ["formatting", "folding", "completion", "metadata","menu"]

+let g:pandoc#modules#disabled =  ["command", "bibliographies"]

+let g:pandoc_formatting_settings = "h"

+let g:pandoc#filetypes#handled = ["markdown", "rst", "textile"]

+let g:slimv_disable_clojure=1

+let g:snips_author="Edward Langley"

+let g:solarized_termtrans=1

+let g:syntastic_python_checkers = ['python']

+let g:Tex_CompileRule_pdf = 'xelatex -interaction=nonstopmode $*'

+let g:tex_flavor='xelatex'

+let g:unite_force_overwrite_statusline = 0

+let g:vimclojure#HighlightBuiltins = 1

+let g:vimclojure#HighlightBuiltins = 1

+let g:vimclojure#ParenRainbow = 1

+let g:vimclojure#ParenRainbow = 1

+let g:virtualenv_directory = "$HOME/python_envs"

+let g:phpcomplete_index_composer_command = "composer"

+let maplocalleader=','

+let $PAGER=''

+let python_highlight_all = 1

+let python_no_tab_space_error=1

+let python_space_errors=1

+let vimclojure#WantNailgun = 1

+let g:syntastic_scss_sass_args = "-r sass-css-importer -r susy"

+

+" This goes here in case a filetype overrides it

 "NeoBundle Scripts-----------------------------

 if has('vim_starting')

@@ -16,6 +50,9 @@ call neobundle#begin(expand("$HOME/.vim/bundle"))

 NeoBundleFetch 'Shougo/neobundle.vim'

 " My Bundles here:

+

+

+

 NeoBundle 'altercation/vim-colors-solarized'

 NeoBundle 'bitc/vim-hdevtools'

 NeoBundle 'Blackrush/vim-gocode'

@@ -25,8 +62,11 @@ NeoBundle 'christoomey/vim-tmux-navigator'

 NeoBundle 'curist/vim-angular-template'

 NeoBundle 'eagletmt/ghcmod-vim'

 NeoBundle 'eagletmt/neco-ghc'

+NeoBundle 'edsono/vim-matchit'

 "NeoBundle 'enomsg/vim-haskellConcealPlus'

 NeoBundle 'exu/pgsql.vim'

+NeoBundle 'fiddlerwoaroof/htmljinja'

+NeoBundle 'fiddlerwoaroof/vim-jinja'

 NeoBundle 'godlygeek/tabular'

 NeoBundle 'groenewege/vim-less'

 NeoBundle 'guns/vim-clojure-static'

@@ -34,13 +74,19 @@ NeoBundle 'ivanov/vim-ipython'

 NeoBundle 'jmcantrell/vim-virtualenv'

 NeoBundle 'kien/rainbow_parentheses.vim'

 NeoBundle 'kovisoft/slimv'

-"NeoBundle 'lukerandall/haskellmode-vim'

+NeoBundle 'lukerandall/haskellmode-vim'

+"NeoBundle 'm2mdas/phpcomplete-extended'

+NeoBundle 'markcornick/vim-vagrant'

 NeoBundle 'matthewsimo/angular-vim-snippets'

+NeoBundle 'mattn/emmet-vim.git'

 NeoBundle 'msanders/snipmate.vim'

 NeoBundle 'othree/javascript-libraries-syntax.vim'

 NeoBundle 'pangloss/vim-javascript'

 NeoBundle 'raichoo/haskell-vim'

+"NeoBundle 'rking/ag.vim' "Ag search utility

+NeoBundle 'rust-lang/rust.vim'

 NeoBundle 'scrooloose/nerdcommenter'

+NeoBundle 'scrooloose/nerdtree'

 NeoBundle 'scrooloose/syntastic'

 NeoBundle 'Shougo/unite-outline'

 NeoBundle 'Shougo/unite.vim'

@@ -55,15 +101,16 @@ NeoBundle 'tpope/vim-fireplace'

 NeoBundle 'tpope/vim-fugitive'

 NeoBundle 'tpope/vim-repeat'

 NeoBundle 'tpope/vim-surround'

-"NeoBundle 'Twinside/vim-haskellFold'

+NeoBundle 'Twinside/vim-haskellFold'

 NeoBundle 'Twinside/vim-hoogle'

+"NeoBundle 'Valloric/YouCompleteMe'

 NeoBundle 'vim-pandoc/vim-pandoc'

 NeoBundle 'vim-scripts/dbext.vim'

+NeoBundle 'vim-scripts/php.vim--Garvin'

 NeoBundle 'vim-scripts/pydoc.vim'

 NeoBundle 'vim-scripts/VimClojure'

 NeoBundle 'vim-voom/VOoM'

 NeoBundle 'ytsunetsune/unite-outline-euslisp'

-NeoBundle 'mattn/emmet-vim.git'

 " Required:

 call neobundle#end()

@@ -194,29 +241,31 @@ function Checkft()

   endif

 endfunction

+

+" when we reload, tell vim to restore the cursor to the saved position

+"autocmd FileType python map K \pW

 autocmd! BufNewFile * silent! 0r ~/.vim/skel/tmpl.%:e

-autocmd BufRead *.mako set ft=mako

-autocmd BufRead *.md set dictionary+=/usr/share/dict/words

+autocmd BufRead,BufNewFile *.twig set filetype=htmljinja

+autocmd BufRead,BufNewFile *.mako set ft=mako

+autocmd BufRead,BufNewFile *.md set dictionary+=/usr/share/dict/words

 autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif

-autocmd BufRead *.tac set ft=python

-autocmd BufRead *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class

-autocmd BufWritePre *.py normal m`:%s/\s\+$//e ``

+autocmd BufRead,BufNewFile *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class

+autocmd BufRead,BufNewFile *.tac set ft=python

 autocmd bufwritepost * call Checkft()

+autocmd BufWritePre *.py normal m`:%s/\s\+$//e ``

+

+autocmd FileType haskell set omnifunc=necoghc#omnifunc

+autocmd FileType lisp set omnifunc=SlimvOmniComplete

 autocmd FileType markdown set linebreak tw=110 noexpandtab nosmartindent autoindent

 autocmd FileType pandoc set linebreak tw=110 noexpandtab nosmartindent autoindent

 autocmd FileType pantondoc set linebreak tw=110 noexpandtab nosmartindent autoindent

-"autocmd FileType python map K \pW

 autocmd FileType python set complete+=k~/.vim/syntax/python.vim "isk+=.,(

-autocmd FileType haskell set omnifunc=necoghc#omnifunc

-autocmd FileType lisp set omnifunc=SlimvOmniComplete

-" when we reload, tell vim to restore the cursor to the saved position

-

 "Diable the anti-python smart indent of #

 inoremap  # X#

 "Turn Syntax Highlighting on by default, and assume the xterm background is black

-imap <C-g> :Unite outline -buffer-name=outline -resume -start-insert

-imap <F7> :Unite outline -buffer-name=outline -resume -start-insert

+imap <C-g> :Unite outline -buffer-name=outline -start-insert<CR>

+imap <F7> :Unite outline -buffer-name=outline -start-insert<CR>

 imap <F8> o
:,!pbpaste

 imap <F9> o
:,!pbpaste

 inoremap <expr> <C-L> ListItem()

@@ -230,13 +279,13 @@ inoremap <Return> <Return><C-g>u

 "inoremap <Tab> <Tab><C-g>u

 map <BS> dh

-map <C-g> :Unite outline -buffer-name=outline -resume -start-insert

+map <C-g> :Unite outline -buffer-name=outline -start-insert<CR>

 map CS :sil! :%s/\s\+$//g<CR>``:%s/^\(\t\+\)\( \+\(\t*\)\)\+/\1\3/gc<CR>``

-map <F7> :Unite outline -buffer-name=files -resume -start-insert

-map <F8> o
:,!pbpaste

-map <F9> o
:,!pbpaste

-map <leader>f :Unite file -buffer-name=files -resume<CR>i

-map <leader>q :Unite buffer -buffer-name=buffers -resume<CR>i

+map <F7> :Unite outline -buffer-name=files -start-insert<CR>

+map <F8> o
:,!pbpaste<CR>

+map <F9> o
:,!pbpaste<CR>

+map <leader>f :Unite file -buffer-name=files -start-insert<CR>

+map <leader>q :Unite buffer -buffer-name=buffers -start-insert<CR>

 map W wb"_dwP

 map ZX :wq<cr>

 map ZZ :w<CR>

@@ -300,19 +349,17 @@ function! s:unite_my_settings()

 endfunction

 if executable('ag')

-  " let g:unite_source_file_async_command =

-  "           \ 'ag --follow --nocolor --nogroup --hidden -g ""'

-  " https://github.com/ggreer/the_silver_searcher

-  " Use ag in unite grep source.

-  " let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden ' .

-  "       \ '--ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'' ' .

-  "       \ '--ignore ''**/*.pyc'' -g ""'

-  let g:unite_source_grep_command = 'ag'

-  let g:unite_source_grep_default_opts =

-        \ '--line-numbers --nocolor --nogroup --hidden --ignore ' .

-        \ '''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'' ' .

-        \ '--ignore ''**/*.pyc'''

-  let g:unite_source_grep_recursive_opt = ''

+  let g:unite_source_file_async_command =

+            \ 'ag --follow --nocolor --nogroup --hidden -g "" --ignore ''.sass-cache'''

+  "https://github.com/ggreer/the_silver_searcher

+  "Use ag in unite grep source.

+  let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '--hidden', '-g', '', '--ignore', '.git', '--ignore', '.sass-cache']

+  "let g:unite_source_grep_command = 'ag'

+  "let g:unite_source_grep_default_opts =

+  "      \ '--line-numbers --nocolor --nogroup --hidden --ignore ' .

+  "      \ '''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'' ' .

+  "      \ '--ignore ''**/*.pyc'''

+  "let g:unite_source_grep_recursive_opt = ''

 elseif executable('ack-grep')

   let g:unite_source_grep_command = 'ack-grep'

   " Match whole word only. This might/might not be a good idea

@@ -335,9 +382,15 @@ nmap  [unite]f  :<C-u>Unite file_rec/async -start-insert<C-m>

 nmap  [unite]F  :<C-u>Unite file -start-insert<C-m>

 nmap  [unite]g  :<C-u>Unite file_rec/git -start-insert<C-m>

 nmap [unite]j :<C-u>Unite buffer -start-insert<C-m>

+nmap [unite]k :<C-u>Unite tab:no-current<C-m>

+nmap [unite]t :NERDTreeToggle<CR>

+nmap [unite]u :GundoToggle<CR>

+nmap [unite]r :!vagrant rsync<CR>

 " Reload

 map <silent> tu :call GHC_BrowseAll()<CR>

 " Type Lookup

 map <silent> tw :call GHC_ShowType(1)<CR>

 autocmd BufRead,BufNewFile *.css,*.scss,*.less setlocal foldmethod=marker foldmarker={,}

+

+

Binary files a/.xmonad/cheatsheet.png and b/.xmonad/cheatsheet.png differ

@@ -22,7 +22,6 @@ import XMonad.Hooks.EwmhDesktops

 import XMonad.Hooks.ICCCMFocus

 import XMonad.Hooks.ManageDocks

 import XMonad.Layout.Accordion

-{-import XMonad.Layout.BoringWindows hiding (Replace)-}

 import XMonad.Layout.Circle

 import XMonad.Layout.Combo()

 import XMonad.Layout.Decoration

@@ -52,6 +51,8 @@ import XMonad.Util.Dzen

 import XMonad.Util.EZConfig(additionalKeys)

 import XMonad.Util.Loggers

 import XMonad.Util.Run(spawnPipe)

+import XMonad.Util.Scratchpad

+import XMonad.Util.NamedScratchpad

 nmaster :: Int

 nmaster = 1

@@ -172,9 +173,9 @@ nchooseLayout conf = do

 myPP :: PP

-myPP = sjanssenPP {

+myPP = namedScratchpadFilterOutWorkspacePP $ sjanssenPP {

    ppCurrent = xmobarColor "grey" "white",

-   ppHidden = xmobarColor "red" "black",

+   ppHidden = xmobarColor "red" "black", -- . noScratchPad,

    ppHiddenNoWindows = id,

    ppTitle = xmobarColor "green" "" . shorten 126

 }

@@ -190,9 +191,30 @@ myManageHook = composeAll

    , className =? "feh" --> viewShift "images"

    , className =? "Display.im6" --> viewShift "images"

    , manageDocks

-   ]

+   ] <+> manageScratchPad

  where role = stringProperty "WM_WINDOW_ROLE"

+manageScratchPad :: ManageHook

+manageScratchPad = namedScratchpadManageHook scratchpads

+

+scratchpads :: [NamedScratchpad]

+scratchpads = [

+  -- run htop in xterm, find it by title, use default floating window placement

+  NS "htop" "xterm -e htop" (title =? "htop") floatStyle ,

+  NS "mutt" "xterm -e mutt" (title =? "mutt") floatStyle ,

+  NS "mcabber" "xterm -e mcabber" (title =? "mcabber") floatStyle ,

+  NS "irc" "xterm -e irssi" (title =? "irssi") floatStyle ,

+  NS "mpc" "stterm -c mpc -e ncmpcpp" (className =? "ncmpcpp") floatStyle ,

+

+  -- run gvim, find by role

+  NS "notes" "bash -c 'cd $HOME/mywiki; source /usr/local/share/chruby/chruby.sh; chruby 2.2.2; SOYWIKI_VIM=\"gvim --role notes\" /home/edwlan/.gem/ruby/2.2.2/bin/soywiki'" (role =? "notes") floatStyle

+  ] where cls = stringProperty "WM_WINDOW_CLASS"

+          role = stringProperty "WM_WINDOW_ROLE"

+          floatStyle = customFloating $ W.RationalRect l t w h

+          w = 1     -- terminal height, 10%

+          h = 0.3333       -- terminal width, 100%

+          t = 0.015  -- distance from top edge, 90%

+          l = 0  -- distance from left edge, 0%

 doCopy :: WorkspaceId -> ManageHook

 doCopy i = doF . copyWin i =<< ask

@@ -252,19 +274,33 @@ main = do

          XMonad.workspaces = ["web", "terminal", "1", "2", "3", "4", "5", "6", "images", "IM"]

       } `additionalKeys` (

       [

-         (((mod4Mask .|. controlMask, xK_q     ),

-               spawn "if type xmonad; then xmonad --recompile && xmonad --restart; else xmessage xmonad not in \\$PATH: \"$PATH\"; fi")),

-

-         ((mod4Mask .|. shiftMask, xK_backslash), maximizeSwitch),

-         ((mod4Mask .|. controlMask, xK_backslash), maximizeFlop),

-         ((mod4Mask, xK_backslash), withFocused (sendMessage . maximizeRestore)),

+         ((mod4Mask .|. controlMask, numPadKeys !! 1), shiftNSwitch windows "web" ),

+         ((mod4Mask .|. controlMask, numPadKeys !! 2), shiftNSwitch windows "terminal" ),

+         ((mod4Mask .|. controlMask, numPadKeys !! 3), shiftNSwitch windows "1" ),

+         ((mod4Mask .|. controlMask, numPadKeys !! 4), shiftNSwitch windows "2" ),

+         ((mod4Mask .|. controlMask, numPadKeys !! 5), shiftNSwitch windows "3" ),

+         ((mod4Mask .|. controlMask, numPadKeys !! 6), shiftNSwitch windows "4" ),

+         ((mod4Mask .|. controlMask, numPadKeys !! 7), shiftNSwitch windows "5" ),

+         ((mod4Mask .|. controlMask, numPadKeys !! 8), shiftNSwitch windows "6" ),

+         ((mod4Mask .|. controlMask, numPadKeys !! 9), shiftNSwitch windows "images" ),

          ((mod4Mask .|. controlMask .|. shiftMask, xK_h ), sendMessage $ Move L),

          ((mod4Mask .|. controlMask .|. shiftMask, xK_j ), sendMessage $ Move D),

          ((mod4Mask .|. controlMask .|. shiftMask, xK_k   ), sendMessage $ Move U),

          ((mod4Mask .|. controlMask .|. shiftMask, xK_l), sendMessage $ Move R),

-         ((mod4Mask .|. controlMask, xK_k), killAllOtherCopies),

+         ((mod4Mask .|. controlMask, xK_1), shiftNSwitch windows "web" ),

+         ((mod4Mask .|. controlMask, xK_2), shiftNSwitch windows "terminal" ),

+         ((mod4Mask .|. controlMask, xK_3), shiftNSwitch windows "1" ),

+         ((mod4Mask .|. controlMask, xK_4), shiftNSwitch windows "2" ),

+         ((mod4Mask .|. controlMask, xK_5), shiftNSwitch windows "3" ),

+         ((mod4Mask .|. controlMask, xK_6), shiftNSwitch windows "4" ),

+         ((mod4Mask .|. controlMask, xK_7), shiftNSwitch windows "5" ),

+         ((mod4Mask .|. controlMask, xK_8), shiftNSwitch windows "6" ),

+         ((mod4Mask .|. controlMask, xK_9), shiftNSwitch windows "images" ),

+         ((mod4Mask .|. controlMask, xK_backslash), maximizeFlop),

+         ((mod4Mask .|. controlMask, xK_grave), shiftNSwitch windows "IM" ),

          ((mod4Mask .|. controlMask, xK_m), withWorkspace defaultXPConfig (windows . shift)),

-

+         (((mod4Mask .|. controlMask, xK_q     ), spawn "if type xmonad; then xmonad --recompile && xmonad --restart; else xmessage xmonad not in \\$PATH: \"$PATH\"; fi")),

+         ((mod4Mask .|. controlMask, xK_t), killAllOtherCopies),

          ((mod4Mask, numPadKeys !! 1), switchWorkspace "web" ),

          ((mod4Mask, numPadKeys !! 2), switchWorkspace "terminal" ),

          ((mod4Mask, numPadKeys !! 3), switchWorkspace "1" ),

@@ -274,7 +310,6 @@ main = do

          ((mod4Mask, numPadKeys !! 7), switchWorkspace "5" ),

          ((mod4Mask, numPadKeys !! 8), switchWorkspace "6" ),

          ((mod4Mask, numPadKeys !! 9), switchWorkspace "images" ),

-

          ((mod4Mask .|. shiftMask, numPadKeys !! 1), copyNSwitch windows "web" ),

          ((mod4Mask .|. shiftMask, numPadKeys !! 2), copyNSwitch windows "terminal" ),

          ((mod4Mask .|. shiftMask, numPadKeys !! 3), copyNSwitch windows "1" ),

@@ -284,28 +319,6 @@ main = do

          ((mod4Mask .|. shiftMask, numPadKeys !! 7), copyNSwitch windows "5" ),

          ((mod4Mask .|. shiftMask, numPadKeys !! 8), copyNSwitch windows "6" ),

          ((mod4Mask .|. shiftMask, numPadKeys !! 9), copyNSwitch windows "images" ),

-

-         ((mod4Mask .|. controlMask, numPadKeys !! 1), shiftNSwitch windows "web" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 2), shiftNSwitch windows "terminal" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 3), shiftNSwitch windows "1" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 4), shiftNSwitch windows "2" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 5), shiftNSwitch windows "3" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 6), shiftNSwitch windows "4" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 7), shiftNSwitch windows "5" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 8), shiftNSwitch windows "6" ),

-         ((mod4Mask .|. controlMask, numPadKeys !! 9), shiftNSwitch windows "images" ),

-

-         ((mod4Mask, xK_1), switchWorkspace "web" ),

-         ((mod4Mask, xK_2), switchWorkspace "terminal" ),

-         ((mod4Mask, xK_3), switchWorkspace "1" ),

-         ((mod4Mask, xK_4), switchWorkspace "2" ),

-         ((mod4Mask, xK_5), switchWorkspace "3" ),

-         ((mod4Mask, xK_6), switchWorkspace "4" ),

-         ((mod4Mask, xK_7), switchWorkspace "5" ),

-         ((mod4Mask, xK_8), switchWorkspace "6" ),

-         ((mod4Mask, xK_9), switchWorkspace "images" ),

-         ((mod4Mask, xK_grave), switchWorkspace "IM" ),

-

          ((mod4Mask .|. shiftMask, xK_1), copyNSwitch windows "web" ),

          ((mod4Mask .|. shiftMask, xK_2), copyNSwitch windows "terminal" ),

          ((mod4Mask .|. shiftMask, xK_3), copyNSwitch windows "1" ),

@@ -315,41 +328,56 @@ main = do

          ((mod4Mask .|. shiftMask, xK_7), copyNSwitch windows "5" ),

          ((mod4Mask .|. shiftMask, xK_8), copyNSwitch windows "6" ),

          ((mod4Mask .|. shiftMask, xK_9), copyNSwitch windows "images" ),

-         ((mod4Mask .|. shiftMask, xK_grave), shiftNSwitch windows "IM" ),

-

-         ((mod4Mask .|. controlMask, xK_1), shiftNSwitch windows "web" ),

-         ((mod4Mask .|. controlMask, xK_2), shiftNSwitch windows "terminal" ),

-         ((mod4Mask .|. controlMask, xK_3), shiftNSwitch windows "1" ),

-         ((mod4Mask .|. controlMask, xK_4), shiftNSwitch windows "2" ),

-         ((mod4Mask .|. controlMask, xK_5), shiftNSwitch windows "3" ),

-         ((mod4Mask .|. controlMask, xK_6), shiftNSwitch windows "4" ),

-         ((mod4Mask .|. controlMask, xK_7), shiftNSwitch windows "5" ),

-         ((mod4Mask .|. controlMask, xK_8), shiftNSwitch windows "6" ),

-         ((mod4Mask .|. controlMask, xK_9), shiftNSwitch windows "images" ),

-         ((mod4Mask .|. controlMask, xK_grave), shiftNSwitch windows "IM" ),

-

+         ((mod4Mask .|. shiftMask, xK_backslash), maximizeSwitch),

          ((mod4Mask .|. shiftMask, xK_BackSpace), removeWorkspace),

-         ((mod4Mask .|. shiftMask, xK_k), kill1),

+         ((mod4Mask .|. shiftMask, xK_grave), shiftNSwitch windows "IM" ),

          ((mod4Mask .|. shiftMask, xK_m), withWorkspace defaultXPConfig (windows . copy)),

          ((mod4Mask .|. shiftMask, xK_n), addWorkspacePrompt defaultXPConfig),

          ((mod4Mask .|. shiftMask, xK_Return), spawnHere "/usr/bin/x-terminal-emulator"),

          ((mod4Mask .|. shiftMask, xK_r), renameWorkspace defaultXPConfig),

+         ((mod4Mask .|. shiftMask, xK_t), kill1),

          ((mod4Mask .|. shiftMask, xK_w), gridselectWorkspace defaultGSConfig (\ws -> greedyView ws . shift ws)),

+         ((mod4Mask, xK_1), switchWorkspace "web" ),

+         ((mod4Mask, xK_2), switchWorkspace "terminal" ),

+         ((mod4Mask, xK_3), switchWorkspace "1" ),

+         ((mod4Mask, xK_4), switchWorkspace "2" ),

+         ((mod4Mask, xK_5), switchWorkspace "3" ),

+         ((mod4Mask, xK_6), switchWorkspace "4" ),

+         ((mod4Mask, xK_7), switchWorkspace "5" ),

+         ((mod4Mask, xK_8), switchWorkspace "6" ),

+         ((mod4Mask, xK_9), switchWorkspace "images" ),

+         --((mod4Mask, xK_apostrophe), scratchpadSpawnActionTerminal "gvim"),

+         ((mod4Mask, xK_backslash), withFocused (sendMessage . maximizeRestore)),

          ((mod4Mask, xK_b), sendMessage ToggleStruts),

          ((mod4Mask, xK_g), goToSelected defaultGSConfig),

-         ((mod4Mask, xK_KP_Subtract), spawn "/usr/bin/zsh /home/edwlan/bin/dmenu_queueplay_mpd"),

-         ((mod4Mask, xK_KP_Multiply), spawn "/usr/bin/zsh /home/edwlan/bin/dmenu_queue_mpd"),

-         ((mod4Mask, xK_KP_Divide), spawn "/usr/bin/zsh /home/edwlan/bin/dmenu_play_mpd"),

+         --((mod4Mask, xK_grave), scratchpadSpawnActionTerminal "urxvt"),

+         {-((mod4Mask, xK_grave), switchWorkspace "IM" ),-}

          ((mod4Mask, xK_KP_Add), spawn "/usr/bin/zsh /home/edwlan/bin/dzen_mpc_status"),

+         ((mod4Mask, xK_KP_Divide), spawn "/usr/bin/zsh /home/edwlan/bin/dmenu_play_mpd"),

+         ((mod4Mask, xK_KP_Multiply), spawn "/usr/bin/zsh /home/edwlan/bin/dmenu_queue_mpd"),

+         ((mod4Mask, xK_KP_Subtract), spawn "/usr/bin/zsh /home/edwlan/bin/dmenu_queueplay_mpd"),

          ((mod4Mask, xK_p), spawnHere "/usr/bin/dmenu_run -f"),

-

          ((mod4Mask, xK_q), ((withSelectedWindow $ windows . W.focusWindow) defaultGSConfig) >> (windows $ W.shiftMaster)),

          ((mod4Mask, xK_semicolon), nchooseLayout defaultGSConfig),

          ((mod4Mask, xK_w), gridselectWorkspace defaultGSConfig (\ws -> greedyView ws))

-      ] ++ zip (zip (repeat (mod4Mask)) ([xK_0])) (map (withNthWorkspace greedyView) [0..]) ++

-         zip (zip (repeat (mod4Mask .|. shiftMask)) ([xK_0])) (map (withNthWorkspace copy) [0..]) 

-         ++ zip (zip (repeat (mod4Mask)) (map (numPadKeys !!) ([0]))) (map (withNthWorkspace greedyView) [0..])

-      )

+      ]

+      ++ zip (zip (repeat (mod4Mask)) ([xK_0])) (map (withNthWorkspace greedyView) [0..])

+      ++ zip (zip (repeat (mod4Mask .|. shiftMask)) ([xK_0])) (map (withNthWorkspace copy) [0..]) 

+      ++ zip (zip (repeat (mod4Mask)) (map (numPadKeys !!) ([0]))) (map (withNthWorkspace greedyView) [0..])

+      ++ [

+         ((mod4Mask .|. mod1Mask, xK_1), namedScratchpadAction scratchpads "notes"),

+         ((mod4Mask .|. mod1Mask, numPadKeys !! 1), namedScratchpadAction scratchpads "notes"),

+         ((mod4Mask .|. mod1Mask, xK_2), namedScratchpadAction scratchpads "mutt"),

+         ((mod4Mask .|. mod1Mask, numPadKeys !! 2), namedScratchpadAction scratchpads "mutt"),

+         ((mod4Mask .|. mod1Mask, xK_3), namedScratchpadAction scratchpads "irc"),

+         ((mod4Mask .|. mod1Mask, numPadKeys !! 3), namedScratchpadAction scratchpads "irc"),

+         ((mod4Mask .|. mod1Mask, xK_4), namedScratchpadAction scratchpads "htop"),

+         ((mod4Mask .|. mod1Mask, numPadKeys !! 4), namedScratchpadAction scratchpads "htop"),

+         ((mod4Mask .|. mod1Mask, xK_5), namedScratchpadAction scratchpads "mpc"),

+         ((mod4Mask .|. mod1Mask, numPadKeys !! 5), namedScratchpadAction scratchpads "mpc"),

+         ((mod4Mask .|. mod1Mask, xK_6), namedScratchpadAction scratchpads "mcabber"),

+         ((mod4Mask .|. mod1Mask, numPadKeys !! 6), namedScratchpadAction scratchpads "mcabber")

+      ]) 

 numPadKeys :: [KeySym]

 numPadKeys = [xK_KP_Insert -- 0

@@ -27,12 +27,13 @@ export MPD_HOST=srv2.elangley.org

 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)

 # Example format: plugins=(rails git textmate ruby lighthouse)

 fpath=(~/.zsh.d/completion ~/.zsh.d/functions $fpath)

-plugins=(git ruby rails osx brew zsh-syntax-highlighting python git-extra git-flow battery)

+plugins=(git rails osx brew zsh-syntax-highlighting python git-extra git-flow battery)

 source $ZSH/oh-my-zsh.sh

 unsetopt correct_all

 echo "done oh-my-zsh"

+unalias sp

 # Customize to your needs...

 export PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/git/bin:/usr/texbin:/usr/X11/bin:/opt/local/bin:/sbin/usr/sbin:$PATH

@@ -51,7 +52,9 @@ elif [ -x /usr/games/fortune ]; then export FORTUNE=/usr/games/fortune

 else export FORTUNE=/usr/bin/fortune

 fi

-$FORTUNE

+if [ -x "$FORTUNE" ]; then

+  $FORTUNE

+fi

 function battery_charge() {

   python "$HOME/bin/batcharge.py" 2>/dev/null

@@ -104,7 +107,7 @@ if [[ $TERM != "linux" ]]; then

 fi

 PATH=/home/edwlan/bin:/usr/local/bin:$PATH

-export PATH="/opt/local/bin:/usr/sbin:/sbin/usr/sbin:/sbin:$HOME/.cabal/bin:$HOME/bin:/Developer/usr/bin:$PATH"

+export PATH="/opt/local/bin:/usr/sbin:/sbin/usr/sbin:/sbin:$HOME/.cabal/bin:$HOME/.local/bin:$HOME/bin:/Developer/usr/bin:$PATH"

 export VIMCLOJURE_SERVER_JAR="$HOME/bin/jars/server-2.3.6.jar"

 export INFOPATH=/usr/local/share/info:/usr/local/texlive/2009/texmf/doc/info

 export SAVEHIST=10000000

@@ -169,7 +172,7 @@ zstyle ':completion:*' group-name ''

 zstyle ':completion:*' insert-unambiguous true

 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}

 zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s

-zstyle ':completion:*' matcher-list 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[._]=** r:|=**' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[._]=** r:|=**' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[._]=** r:|=**' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[._]=** r:|=**'

+zstyle ':completion:*' matcher-list 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[-._]=** r:|=**' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[-._]=** r:|=**' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[-._]=** r:|=**' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[-._]=** r:|=**'

 zstyle ':completion:*' menu select=0

 zstyle ':completion:*' original false

 zstyle ':completion:*' prompt '%e errors:'

@@ -381,34 +384,39 @@ psc() {

 }

 activate_env() {

-   if [[ -e bin/activate ]]; then

-     echo "sourcing local env: `pwd`/bin/activate"

-     source bin/activate

-   else

-     env=$1

-     pushd $HOME/python_envs/ > /dev/null

-

-     if [[ $env == "" ]]; then

-        counter=1

-        typeset -A choices

-        unset choice

-        for x in `ls`; do

-           echo $counter\) $x

-           choices[$counter]=$x

-           (( counter++ ))

-        done

-        echo -n "your choice? "

-        choice=-1

-        read choice

-        if [[ $choice == "" ]]; then

-           return

-        fi

-        env=$choices[$choice]

-        echo "you chose $env"

-     fi

-     source $env/bin/activate

-     popd > /dev/null

-   fi

+  venv=.

+  if [[ -e bin/activate ]]; then

+    echo "sourcing local env: `pwd`/bin/activate"

+  elif [[ -e venv/bin/activate ]]; then

+    echo "sourcing local env: `pwd`/venv/bin/activate"

+    venv=venv

+  else

+    env=$1

+    pushd $HOME/python_envs/ > /dev/null

+    venv="$PWD/$env"

+    popd

+

+    if [[ $env == "" ]]; then

+      counter=1

+      typeset -A choices

+      unset choice

+      for x in `ls "$venv"`; do

+        echo $counter\) `basename $x`

+        choices[$counter]=$x

+        (( counter++ ))

+      done

+      echo -n "your choice? "

+      choice=-1

+      read choice

+      if [[ $choice == "" ]]; then

+        return

+      fi

+      venv="$venv/$choices[$choice]"

+      echo "you chose $venv"

+    fi

+  fi

+  source $venv/bin/activate

+  unset venv env;

 }

 alias ae=activate_env

@@ -588,6 +596,10 @@ mkcd() {

   cd "$1"

 }

+groot() {

+  cd `git rev-parse --show-toplevel`

+}

+

 ### load my plugins

 for x in `ls $HOME/.zsh.d/*.zsh`; do

@@ -595,6 +607,7 @@ for x in `ls $HOME/.zsh.d/*.zsh`; do

 done

 alias cn=current_news

+#chruby ruby-2.2.2

 # vim: set filetype=sh:

 #THIS MUST BE AT THE END OF THE FILE FOR GVM TO WORK!!!

@@ -172,11 +172,11 @@ def e(name=None):

 		f.close()