wtf

.dotfiles

@@ -0,0 +1 @@
+.dotfiles

.gitignore

@@ -1 +1,2 @@
 vim/bundle/*
+vim/vim/*

setup.sh

@@ -11,5 +11,5 @@ ln -s ~/.dotfiles/ruby/irbrc ~/.irbrc
 ln -s ~/.dotfiles/ruby/aprc ~/.aprc
 
 # THE VIM
-ln -s ~/.dotfiles/vim ~/.vim
+ln -s ~/.dotfiles/vim/vim ~/.vim
 ln -s ~/.dotfiles/vim/vimrc ~/.vimrc

vim/.netrwhist

@@ -1,4 +0,0 @@
-let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =2
-let g:netrw_dirhist_1='/Users/chez/Code/commentatr/config/locales/activerecord/admin_user'
-let g:netrw_dirhist_2='/Users/chez/Code/commentatr/config/locales/activerecord/blog'

vim/autoload/pathogen.vim

@@ -1,328 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.2
-
-" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
-"
-" For management of individually installed plugins in ~/.vim/bundle (or
-" ~\vimfiles\bundle), adding `call pathogen#infect()` to the top of your
-" .vimrc is the only other setup necessary.
-"
-" The API is documented inline below.  For maximum ease of reading,
-" :set foldmethod=marker
-
-if exists("g:loaded_pathogen") || &cp
-  finish
-endif
-let g:loaded_pathogen = 1
-
-function! s:warn(msg)
-  if &verbose
-    echohl WarningMsg
-    echomsg a:msg
-    echohl NONE
-  endif
-endfunction
-
-" Point of entry for basic default usage.  Give a relative path to invoke
-" pathogen#incubate() (defaults to "bundle/{}"), or an absolute path to invoke
-" pathogen#surround().  For backwards compatibility purposes, a full path that
-" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories()
-" instead.
-function! pathogen#infect(...) abort " {{{1
-  for path in a:0 ? reverse(copy(a:000)) : ['bundle/{}']
-    if path =~# '^[^\\/]\+$'
-      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
-      call pathogen#incubate(path . '/{}')
-    elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$'
-      call pathogen#incubate(path)
-    elseif path =~# '[\\/]\%({}\|\*\)$'
-      call pathogen#surround(path)
-    else
-      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
-      call pathogen#surround(path . '/{}')
-    endif
-  endfor
-  call pathogen#cycle_filetype()
-  return ''
-endfunction " }}}1
-
-" Split a path into a list.
-function! pathogen#split(path) abort " {{{1
-  if type(a:path) == type([]) | return a:path | endif
-  let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
-  return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
-endfunction " }}}1
-
-" Convert a list to a path.
-function! pathogen#join(...) abort " {{{1
-  if type(a:1) == type(1) && a:1
-    let i = 1
-    let space = ' '
-  else
-    let i = 0
-    let space = ''
-  endif
-  let path = ""
-  while i < a:0
-    if type(a:000[i]) == type([])
-      let list = a:000[i]
-      let j = 0
-      while j < len(list)
-        let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
-        let path .= ',' . escaped
-        let j += 1
-      endwhile
-    else
-      let path .= "," . a:000[i]
-    endif
-    let i += 1
-  endwhile
-  return substitute(path,'^,','','')
-endfunction " }}}1
-
-" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
-function! pathogen#legacyjoin(...) abort " {{{1
-  return call('pathogen#join',[1] + a:000)
-endfunction " }}}1
-
-" Remove duplicates from a list.
-function! pathogen#uniq(list) abort " {{{1
-  let i = 0
-  let seen = {}
-  while i < len(a:list)
-    if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
-      call remove(a:list,i)
-    elseif a:list[i] ==# ''
-      let i += 1
-      let empty = 1
-    else
-      let seen[a:list[i]] = 1
-      let i += 1
-    endif
-  endwhile
-  return a:list
-endfunction " }}}1
-
-" \ on Windows unless shellslash is set, / everywhere else.
-function! pathogen#separator() abort " {{{1
-  return !exists("+shellslash") || &shellslash ? '/' : '\'
-endfunction " }}}1
-
-" Convenience wrapper around glob() which returns a list.
-function! pathogen#glob(pattern) abort " {{{1
-  let files = split(glob(a:pattern),"\n")
-  return map(files,'substitute(v:val,"[".pathogen#separator()."/]$","","")')
-endfunction "}}}1
-
-" Like pathogen#glob(), only limit the results to directories.
-function! pathogen#glob_directories(pattern) abort " {{{1
-  return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
-endfunction "}}}1
-
-" Turn filetype detection off and back on again if it was already enabled.
-function! pathogen#cycle_filetype() " {{{1
-  if exists('g:did_load_filetypes')
-    filetype off
-    filetype on
-  endif
-endfunction " }}}1
-
-" Check if a bundle is disabled.  A bundle is considered disabled if it ends
-" in a tilde or its basename or full name is included in the list
-" g:pathogen_disabled.
-function! pathogen#is_disabled(path) " {{{1
-  if a:path =~# '\~$'
-    return 1
-  elseif !exists("g:pathogen_disabled")
-    return 0
-  endif
-  let sep = pathogen#separator()
-  let blacklist = g:pathogen_disabled
-  return index(blacklist, strpart(a:path, strridx(a:path, sep)+1)) != -1 && index(blacklist, a:path) != 1
-endfunction "}}}1
-
-" Prepend the given directory to the runtime path and append its corresponding
-" after directory.  If the directory is already included, move it to the
-" outermost position.  Wildcards are added as is.  Ending a path in /{} causes
-" all subdirectories to be added (except those in g:pathogen_disabled).
-function! pathogen#surround(path) abort " {{{1
-  let sep = pathogen#separator()
-  let rtp = pathogen#split(&rtp)
-  if a:path =~# '[\\/]{}$'
-    let path = fnamemodify(a:path[0:-4], ':p:s?[\\/]\=$??')
-    let before = filter(pathogen#glob_directories(path.sep.'*'), '!pathogen#is_disabled(v:val)')
-    let after  = filter(reverse(pathogen#glob_directories(path.sep."*".sep."after")), '!pathogen#is_disabled(v:val[0:-7])')
-    call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
-  else
-    let path = fnamemodify(a:path, ':p:s?[\\/]\=$??')
-    let before = [path]
-    let after = [path . sep . 'after']
-    call filter(rtp, 'index(before + after, v:val) == -1')
-  endif
-  let &rtp = pathogen#join(before, rtp, after)
-  return &rtp
-endfunction " }}}1
-
-" Prepend all subdirectories of path to the rtp, and append all 'after'
-" directories in those subdirectories.  Deprecated.
-function! pathogen#runtime_prepend_subdirectories(path) " {{{1
-  call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#surround('.string(a:path.'/{}').')')
-  return pathogen#surround(a:path . pathogen#separator() . '{}')
-endfunction " }}}1
-
-" For each directory in the runtime path, add a second entry with the given
-" argument appended.  If the argument ends in '/{}', add a separate entry for
-" each subdirectory.  The default argument is 'bundle/{}', which means that
-" .vim/bundle/*, $VIM/vimfiles/bundle/*, $VIMRUNTIME/bundle/*,
-" $VIM/vim/files/bundle/*/after, and .vim/bundle/*/after will be added (on
-" UNIX).
-function! pathogen#incubate(...) abort " {{{1
-  let sep = pathogen#separator()
-  let name = a:0 ? a:1 : 'bundle/{}'
-  if "\n".s:done_bundles =~# "\\M\n".name."\n"
-    return ""
-  endif
-  let s:done_bundles .= name . "\n"
-  let list = []
-  for dir in pathogen#split(&rtp)
-    if dir =~# '\<after$'
-      if name =~# '{}$'
-        let list +=  filter(pathogen#glob_directories(substitute(dir,'after$',name[0:-3],'').'*[^~]'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
-      else
-        let list += [dir, substitute(dir, 'after$', '', '') . name . sep . 'after']
-      endif
-    else
-      if name =~# '{}$'
-        let list +=  [dir] + filter(pathogen#glob_directories(dir.sep.name[0:-3].'*[^~]'), '!pathogen#is_disabled(v:val)')
-      else
-        let list += [dir . sep . name, dir]
-      endif
-    endif
-  endfor
-  let &rtp = pathogen#join(pathogen#uniq(list))
-  return 1
-endfunction " }}}1
-
-" Deprecated alias for pathogen#incubate().
-function! pathogen#runtime_append_all_bundles(...) abort " {{{1
-  if a:0
-    call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#incubate('.string(a:1.'/{}').')')
-  else
-    call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#incubate()')
-  endif
-  return call('pathogen#incubate', map(copy(a:000),'v:val . "/{}"'))
-endfunction
-
-let s:done_bundles = ''
-" }}}1
-
-" Invoke :helptags on all non-$VIM doc directories in runtimepath.
-function! pathogen#helptags() abort " {{{1
-  let sep = pathogen#separator()
-  for glob in pathogen#split(&rtp)
-    for dir in split(glob(glob), "\n")
-      if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.sep.'doc') == 2 && !empty(filter(split(glob(dir.sep.'doc'.sep.'*'),"\n>"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags'))
-        helptags `=dir.'/doc'`
-      endif
-    endfor
-  endfor
-endfunction " }}}1
-
-command! -bar Helptags :call pathogen#helptags()
-
-" Execute the given command.  This is basically a backdoor for --remote-expr.
-function! pathogen#execute(...) abort " {{{1
-  for command in a:000
-    execute command
-  endfor
-  return ''
-endfunction " }}}1
-
-" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) abort "{{{1
-  let rtp = pathogen#join(1,pathogen#split(&rtp))
-  let file = findfile(a:file,rtp,a:count)
-  if file ==# ''
-    return ''
-  else
-    return fnamemodify(file,':p')
-  endif
-endfunction " }}}1
-
-" Backport of fnameescape().
-function! pathogen#fnameescape(string) abort " {{{1
-  if exists('*fnameescape')
-    return fnameescape(a:string)
-  elseif a:string ==# '-'
-    return '\-'
-  else
-    return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
-  endif
-endfunction " }}}1
-
-if exists(':Vedit')
-  finish
-endif
-
-let s:vopen_warning = 0
-
-function! s:find(count,cmd,file,lcd) " {{{1
-  let rtp = pathogen#join(1,pathogen#split(&runtimepath))
-  let file = pathogen#runtime_findfile(a:file,a:count)
-  if file ==# ''
-    return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
-  endif
-  if !s:vopen_warning
-    let s:vopen_warning = 1
-    let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
-  else
-    let warning = ''
-  endif
-  if a:lcd
-    let path = file[0:-strlen(a:file)-2]
-    execute 'lcd `=path`'
-    return a:cmd.' '.pathogen#fnameescape(a:file) . warning
-  else
-    return a:cmd.' '.pathogen#fnameescape(file) . warning
-  endif
-endfunction " }}}1
-
-function! s:Findcomplete(A,L,P) " {{{1
-  let sep = pathogen#separator()
-  let cheats = {
-        \'a': 'autoload',
-        \'d': 'doc',
-        \'f': 'ftplugin',
-        \'i': 'indent',
-        \'p': 'plugin',
-        \'s': 'syntax'}
-  if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
-    let request = cheats[a:A[0]].a:A[1:-1]
-  else
-    let request = a:A
-  endif
-  let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*'
-  let found = {}
-  for path in pathogen#split(&runtimepath)
-    let path = expand(path, ':p')
-    let matches = split(glob(path.sep.pattern),"\n")
-    call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
-    call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]')
-    for match in matches
-      let found[match] = 1
-    endfor
-  endfor
-  return sort(keys(found))
-endfunction " }}}1
-
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve       :execute s:find(<count>,'edit<bang>',<q-args>,0)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit    :execute s:find(<count>,'edit<bang>',<q-args>,0)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen    :execute s:find(<count>,'edit<bang>',<q-args>,1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit   :execute s:find(<count>,'split',<q-args>,<bang>1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit  :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit',<q-args>,<bang>1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read',<q-args>,<bang>1)
-
-" vim:set et sw=2:

vim/packages.yml

@@ -1,60 +0,0 @@
-- name: Ruby Debugger
-  dir: ruby_debugger
-  github: astashov/vim-ruby-debugger
-- name: Super Tab
-  dir: supertab
-  github: ervandew/supertab
-- name: Tabular
-  dir: tabular
-  github: godlygeek/tabular
-- name: Rdoc
-  dir: rdoc
-  github: depuracao/vim-rdoc
-- name: Snip Mate
-  dir: snipmate
-  github: msanders/snipmate.vim
-- name: JavaScript
-  dir: javascript
-  github: pangloss/vim-javascript
-- name: Nerd Tree
-  dir: nerdtree
-  github: scrooloose/nerdtree
-- name: Textile
-  dir: textile
-  github: timcharper/textile.vim
-- name: Cucumber
-  dir: cucumber
-  github: tpope/vim-cucumber
-- name: Haml
-  dir: haml
-  github: tpope/vim-haml
-- name: Markdown
-  dir: markdown
-  github: tpope/vim-markdown
-- name: Rails
-  dir: rails
-  github: tpope/vim-rails
-- name: Repeat
-  dir: repeat
-  github: tpope/vim-repeat
-- name: Surround
-  dir: surround
-  github: tpope/vim-surround
-- name: Vivid Chalk
-  dir: vivid_chalk
-  github: tpope/vim-vividchalk
-- name: Matchit
-  dir: matchit
-  github: tsaleh/vim-matchit
-- name: tmux
-  dir: tmux
-  github: tsaleh/vim-tmux
-- name: Ruby
-  dir: ruby
-  github: vim-ruby/vim-ruby
-- name: Gist
-  dir: gist
-  github: vim-scripts/Gist.vim
-- name: Solarized
-  dir: solarized
-  github: altercation/vim-colors-solarized

vim/vim

@@ -1 +0,0 @@
-/Users/chez/.dotfiles/vim

vim/vimrc

@@ -1,8 +1,96 @@
-execute pathogen#infect()
-execute pathogen#helptags()
-syntax on
-filetype plugin indent on
+" When vimrc is edited, reload it
+autocmd! BufWritePost vimrc source ~/.vimrc
 
-set background=dark
-let g:solarized_termcolors=256
-colorscheme solarized
+set nocompatible " vi improved
+filetype off     " do not load Filetype file
+
+set encoding=utf-8
+set history=1000
+set completeopt=menuone,preview
+set number
+
+" #######################
+" ### Fuck you, hjkl! ###
+" #######################
+
+noremap ; l
+noremap l k
+noremap k j
+noremap j h
+
+for prefix in ['i', 'n', 'v']
+  for key in ['<Up>', '<Down>', '<Left>', '<Right>']
+    exe prefix . "noremap " . key . " <Nop>"
+  endfor
+endfor
+
+" ####################
+" ### Vundle setup ###
+" ####################
+
+set rtp+=~/.vim/bundle/vundle/
+call vundle#rc()
+Bundle 'gmarik/vundle'
+
+" ##############
+" ### Colors ###
+" ##############
+
+Bundle 'chriskempson/tomorrow-theme', {'rtp': 'vim/'}
+syntax on
+colorscheme Tomorrow-Night-Eighties
+
+" #################
+" ### Powerline ###
+" #################
+
+Bundle 'Lokaltog/vim-powerline'
+set laststatus=2
+
+" ################
+" ### Nerdtree ###
+" ################
+
+Bundle 'scrooloose/nerdtree'
+nmap <C-n> :NERDTreeToggle<CR>
+
+" ############
+" ### Misc ###
+" ############
+
+Bundle 'kien/ctrlp.vim'
+
+" Ruby support?
+Bundle 'vim-ruby/vim-ruby'
+" Magic R-commands
+Bundle 'tpope/vim-rails'
+
+autocmd FileType ruby,eruby,yaml set tw=80 ai sw=2 sts=2 et
+autocmd FileType ruby,eruby,yaml setlocal foldmethod=manual
+autocmd User Rails set tabstop=2 shiftwidth=2 softtabstop=2 expandtab
+
+" ##########################
+" ### Follow Your Leader ###
+" ##########################
+
+let mapleader = ","
+
+nmap <Leader>q :q!<cr>
+nmap <Leader>rc :source ~/.vimrc<cr>
+nmap <Leader>bi :source ~/.vimrc<cr>:BundleInstall<cr>
+
+nmap <Leader>gu :!git up<cr>
+nmap <Leader>mkb :!mkbundle<cr>
+
+nmap <Leader>m :Rmodel<cr>
+nmap <Leader>c :Rcontroller<cr>
+nmap <Leader>s :Rspec<cr>
+
+" #####################
+" ### More Mappings ###
+" #####################
+
+map <C-s> <esc>:w<CR>
+imap <C-s> <esc>:w<CR>
+imap <c-e> <c-o>$
+imap <c-a> <c-o>^

zsh/config.zsh

@@ -10,6 +10,7 @@ export CLICOLOR=true
 fpath=($ZSH/zsh/functions $fpath)
 
 autoload -U $ZSH/zsh/functions/*(:t)
+autoload -U $ZSH/zsh/completion/*(:t)
 
 HISTFILE=~/.zsh_history
 HISTSIZE=10000

zsh/paths.zsh

@@ -1,4 +1,5 @@
 export PATH=~/.dotfiles/bin:$PATH
 export PATH=/usr/local/share/npm/bin:$PATH
+export PATH=/usr/local/share/python:$PATH
 export PATH=~/.misc/git-achievements:$PATH
 export PATH=/Applications/Sublime\ Text\ 3.app/Contents/SharedSupport/bin:$PATH

zsh/prompt.zsh

@@ -15,9 +15,9 @@ git_dirty() {
   else
     if [[ "$st" =~ ^nothing ]]
     then
-      echo " %F{002}($(git_prompt_info))%f"
+      echo "%F{002}($(git_prompt_info))%f"
     else
-      echo " %F{001}($(git_prompt_info))%f"
+      echo "%F{001}($(git_prompt_info))%f"
     fi
   fi
 }
@@ -42,7 +42,7 @@ need_push () {
   then
     echo ""
   else
-    echo " %F{005}↑↑%f"
+    echo "%F{006}✖%f "
   fi
 }
 
@@ -60,15 +60,16 @@ current_time(){
 }
 
 directory_name(){
-  echo "%F{003%}%1/%\%f"
+  echo "%F{012%}%1/%\%f"
 }
 
-export PROMPT=$'\n$(directory_name)$(git_dirty)$(need_push)$(git_need_commit) › '
+export PROMPT=$'\n$(directory_name)$(git_need_commit) › '
 set_prompt () {
-  export RPROMPT="$(rb_prompt)"
+  export RPROMPT="$(need_push)$(git_dirty)"
 }
 
 precmd() {
-  title "zsh" "%m" "%55<...<%~"
+  # No longer setting title. Because tmux
+  # title "zsh" "%m" "%55<...<%~"
   set_prompt
 }

zsh/support/tmuxinator.zsh

@@ -0,0 +1 @@
+[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator

zsh/zshrc

@@ -1,3 +1,5 @@
+export EDITOR="subl -n -w"
+
 # shortcut to this dotfiles path is $ZSH
 export ZSH=$HOME/.dotfiles