Clean up

12 files changed, 6 insertions, 587 deletions

diff --git a/.gitmodules b/.gitmodules
index 564aadf5..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule ".zsh/zsh-syntax-highlighting"]
-	path = .zsh/zsh-syntax-highlighting
-	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
-[submodule ".zsh/z"]
-	path = .zsh/z
-	url = https://github.com/rupa/z.git
diff --git a/.irbrc b/.irbrc
deleted file mode 100644
index d4c39f88..00000000
--- a/.irbrc
+++ /dev/null
@@ -1,4 +0,0 @@
-$:.unshift 'lib'
-$: << '.'
-
-require 'pp'
diff --git a/.vimrc.full b/.vimrc.full
deleted file mode 100644
index a6ce2641..00000000
--- a/.vimrc.full
+++ /dev/null
@@ -1,304 +0,0 @@
-" Do not try to behave like vi.
-set nocompatible
-
-" Allow backspace in insert mode to delete past the beginning of the line.
-set backspace=indent,eol,start
-
-" Keep buffers loaded even when they aren't shown. Allows switching buffers
-" without saving first.
-set hidden
-
-" Keep 50 lines of : command history and search patterns.
-set history=50
-
-" Show the cursor position in the bottom right.
-set ruler
-
-" Show partial command in the bottom right (i.e. if a command is started but
-" needs a motion, it will be shown).
-set showcmd
-
-" Jump to search results while typing. Pressing enter actually jumps to the
-" result, pressing escape goes back to the cursor.
-set incsearch
-
-" Perform case-insensitive searching when the search pattern contains only
-" lowercase letters.
-set ignorecase
-set smartcase
-
-" Copy the indent from the previous line when starting a new line.
-" Automatically indent between curly braces and indent keywords.
-set autoindent
-set smartindent
-
-" Show line numbers.
-set number
-
-" Perform spell-checking on strings and comments.
-set spell
-
-" Highlight the 80th, 100th and 120th columns.
-set colorcolumn=80,100,120
-
-" Set the window title with the current file name, status and directory.
-set title
-
-" Make file messages shorter:
-"  - a: Shorten all file description messages
-"  - t: Truncate file messages if they are too long
-"  - I: Do not show the intro message when Vim starts
-set shortmess=atI
-
-" Disable beeping and visual bell (flashing the terminal window).
-set visualbell t_vb=
-
-" Highlight the current line.
-set cursorline
-
-" Insert `shiftwidth` spaces at the beginning of a line when tab is pressed,
-" delete `shiftwidth` spaces when backspace is pressed.
-set smarttab
-
-" Highlight all search matches.
-set hlsearch
-
-" Show hard tabs and trailing whitespace.
-set list
-set listchars=tab:»·,trail:·
-
-
-" Fold by syntax, start with all folds open.
-set foldmethod=syntax
-set foldlevelstart=99
-
-" Always show the status line.
-set laststatus=2
-
-" Always show one line above or below the cursor.
-set scrolloff=1
-
-" Ctrl-A and Ctrl-X work on hex and single letters
-set nrformats=alpha,hex
-
-" Enable syntax highlighting.
-syntax on
-
-" Enable mouse in terminals
-if has('mouse')
-  set mouse=a
-endif
-
-" Disable spell-checking in terminal Vim.
-if !has('gui_running')
-  set nospell
-endif
-
-" GUI options:
-"  * -m: Disable menu bar
-"  * -r: Disable right scroll bar
-"  * -L: Disable left scroll bar
-"  * -T: Disable toolbar
-"  * +c: Use console dialogs
-set guioptions-=m
-set guioptions-=r
-set guioptions-=L
-set guioptions-=T
-set guioptions+=c
-
-" Use a font.
-set guifont=ProFont:h11
-
-" Jump to the last cursor position when opening a file.
-au BufReadPost * if &filetype !~ '^git\c' && line("'\"") > 0 && line("'\"") <= line("$")
-    \| exe "normal! g`\"" | endif
-
-" Use two-space indents.
-set expandtab
-set shiftwidth=2
-
-" Round to the nearest multiple of `shiftwidth` when indenting.
-set shiftround
-
-" Show hard tabs as 4 characters wide.
-set tabstop=4
-
-
-" Load filetype plugins and indentation rules.
-filetype plugin indent on
-
-" Use 4-space indents in C, C++ and Lua.
-autocmd FileType c,cpp,lua setlocal sw=4
-
-" Hard-wrap text at 72 characters in Markdown.
-autocmd FileType markdown setlocal tw=72
-
-" C/C++ indentation options:
-"  * :0 Align `case` with `switch`
-"  * l1 Indent case bodies with braces to case
-"  * g0 Align `public:` and friends to class
-set cinoptions=:0,l1,g0
-
-" Show tab-complete suggestions when typing in the command-line. List all
-" matches and complete to the longest common string. Ignore output files and
-" backups.
-set wildmenu
-set wildmode=list:longest
-set wildignore=*.o,*.d,*~
-
-" Smarter % matching on HTML tags, if/endif etc.
-runtime macros/matchit.vim
-
-" Do not show whitespace in insert mode.
-autocmd InsertEnter * setlocal nolist
-autocmd InsertLeave * setlocal list
-
-" Set leader to , and remap , to \.
-noremap \ ,
-let mapleader = ","
-
-" Swap ' and ` (' is now character-wise and ` is line-wise).
-nnoremap ' `
-nnoremap ` '
-
-" Swap 0 and ^ (0 now moves to the first non-whitespace character).
-nnoremap 0 ^
-nnoremap ^ 0
-
-" Clear search result highlighting.
-nmap <leader>n :nohlsearch<CR>
-
-" Toggle visible whitespace.
-nmap <leader>s :set list!<CR>
-
-" Toggle spell checking.
-nmap <leader>z :set spell!<CR>
-
-" Cut/copy/paste to system clipboard.
-nmap <leader>p "+p
-nmap <leader>P "+P
-nmap <leader>y "+y
-nmap <leader>Y "+Y
-nmap <leader>d "+d
-nmap <leader>D "+D
-
-" Yank to end of line.
-nmap Y y$
-
-" Insert hard tab.
-imap <S-tab> <C-v><tab>
-
-" Toggle relative/absolute line numbers.
-nmap <C-n> :set relativenumber!<CR>
-
-" Common typos.
-command! W :w
-command! Q :q
-
-" Plugins
-
-call plug#begin('~/.vim/plugged')
-
-" Fancy statusline.
-Plug 'bling/vim-airline'
-" Don't show mode in last line.
-set noshowmode
-" Disable silly > separators.
-let g:airline_left_sep = ''
-let g:airline_right_sep = ''
-" Only show diff stats if there are some.
-let g:airline#extensions#hunks#non_zero_only = 1
-" Don't complain about whitespace constantly.
-let g:airline#extensions#whitespace#enabled = 0
-
-" Syntax checking.
-Plug 'scrooloose/syntastic'
-let g:syntastic_check_on_open=1
-let g:syntastic_enable_signs=0
-
-" Git diff signs in margins.
-Plug 'mhinz/vim-signify'
-let g:signify_vcs_list = ['git']
-let g:signify_sign_overwrite = 1
-let g:signify_sign_change = '~'
-
-" Fuzzy matching files/buffers.
-Plug 'kien/ctrlp.vim'
-nmap <leader>b :CtrlPBuffer<CR>
-nmap <leader>e :CtrlP<CR>
-nmap <leader>t :CtrlPBufTag<CR>
-nmap <leader>l :CtrlPLine<CR>
-
-" Git commands.
-Plug 'tpope/vim-fugitive'
-nmap <leader>gs :Gstatus<CR>
-nmap <leader>gc :Gcommit<CR>
-nmap <leader>gp :Git push<CR>
-
-" Alignment of = : , etc.
-Plug 'junegunn/vim-easy-align'
-vnoremap <silent> <Enter> :EasyAlign<Enter>
-
-" Auto-close braces, parens, quotes, etc.
-Plug 'Raimondi/delimitMate'
-let delimitMate_expand_cr = 1
-let delimitMate_expand_space = 1
-let delimitMate_jump_expansion = 1
-
-" Indent guides by alternating background colour. (<leader>ig)
-Plug 'nathanaelkane/vim-indent-guides'
-let g:indent_guides_start_level = 2
-
-" Distraction-free editing
-Plug 'junegunn/goyo.vim'
-Plug 'junegunn/limelight.vim'
-nmap <leader>G :Goyo<CR>
-autocmd User GoyoEnter Limelight
-autocmd User GoyoLeave Limelight!
-
-" Colorschemes.
-Plug 'programble/jellybeans.vim'
-Plug 'programble/vim-hybrid'
-Plug 'morhetz/gruvbox'
-" Show nearest tag in statusline.
-Plug 'majutsushi/tagbar'
-" Scratch buffers.
-Plug 'programble/itchy.vim'
-" Better paste indentation.
-Plug 'sickill/vim-pasta'
-" Commenting.
-Plug 'tpope/vim-commentary'
-" Surround text objects.
-Plug 'tpope/vim-surround'
-" Increment, decrement dates and roman numerals with C-a, C-x.
-Plug 'tpope/vim-speeddating'
-" File-related commands.
-Plug 'tpope/vim-eunuch'
-" Highlight color values with their color in CSS.
-Plug 'ap/vim-css-color'
-" Swap two selections.
-Plug 'tommcdo/vim-exchange'
-
-" Language support.
-Plug 'digitaltoad/vim-jade'
-Plug 'groenewege/vim-less'
-Plug 'kchmck/vim-coffee-script'
-Plug 'pangloss/vim-javascript'
-Plug 'tpope/vim-markdown'
-Plug 'tpope/vim-ragtag'
-
-Plug 'Z1MM32M4N/vim-superman'
-
-Plug 'kshenoy/vim-signature'
-
-call plug#end()
-
-set background=dark
-let g:gruvbox_termcolors = 16
-let g:gruvbox_italic = 0
-let g:gruvbox_invert_selection = 0
-let g:gruvbox_sign_column = 'dark0'
-let g:gruvbox_vert_split = 'dark0'
-set fillchars+=vert:│
-colorscheme gruvbox
-let g:airline_theme = 'tomorrow'
diff --git a/.zsh/aliases.zsh b/.zsh/aliases.zsh
deleted file mode 100644
index c1490bf5..00000000
--- a/.zsh/aliases.zsh
+++ /dev/null
@@ -1,75 +0,0 @@
-function reload {
-  source ~/.zshrc
-  rehash
-}
-
-function mkcd {
-  mkdir $@
-  if [ "$1" = "-p" ]; then
-    cd $2
-  else
-    cd $1
-  fi
-}
-
-function tunnel {
-  ssh -R 8022:localhost:$1 do.asdf.pw
-}
-
-function vman {
-  vim -c "SuperMan $*" || echo "No manual entry for $*"
-}
-
-alias randpasswd='openssl rand -base64 21 | tr +/ -_'
-
-alias killlall='killall'
-which ripl &> /dev/null && alias irb='ripl'
-alias l='ls'
-alias ll='ls'
-
-osx || alias ls='ls --color=auto'
-osx || alias grep='grep --color=auto'
-osx || alias rm='rm -vI'
-osx && alias rm='rm -v'
-
-osx || alias gvim='gvim 2> /dev/null'
-osx && alias gvim='mvim'
-
-alias b='bundle exec'
-alias .env='export $(cat .env)'
-
-alias sprunge='curl -F "sprunge=<-" http://sprunge.us'
-
-if which hub &> /dev/null; then
-  compdef hub=git
-  alias git=hub
-fi
-
-alias g=git
-alias ga='git add'
-alias gb='git branch'
-alias gc='git commit'
-alias gcl='git clone'
-alias gco='git checkout'
-alias gd='git diff'
-alias gi='git init'
-alias gl='git log'
-alias glg="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --color"
-alias gm='git merge'
-alias gmv='git mv'
-alias gp='git push'
-alias gr='git rebase'
-alias grc='git rebase --continue'
-alias grs='git rebase --skip'
-alias gra='git rebase --abort'
-alias grm='git rm'
-alias gs='git status -sb'
-alias gsh='git show'
-alias gst='git stash'
-alias gt='git tag'
-alias gu='git pull'
-alias gf='git fetch'
-alias gbl='git blame'
-
-alias hu='heroku'
-alias gphu='git push heroku master'
diff --git a/.zsh/gitprompt.zsh b/.zsh/gitprompt.zsh
deleted file mode 100644
index 9e733181..00000000
--- a/.zsh/gitprompt.zsh
+++ /dev/null
@@ -1,80 +0,0 @@
-# Ported from http://sebastiancelis.com/2009/11/16/zsh-prompt-git-users/
-
-function _gitprompt_update {
-  unset _git_branch
-  unset _git_status
-  unset _git_dirty
-
-  local st="$(git status 2> /dev/null)"
-  if [[ -n "$st" ]]; then
-    local -a arr
-    arr=(${(f)st})
-
-    if [[ $arr[1] =~ 'Not currently on any branch.' ]]; then
-      _git_branch='none'
-    else
-      _git_branch="${arr[1][(w)-1]}"
-    fi
-
-    if [[ $arr[2] =~ 'Your branch is' ]]; then
-      if [[ $arr[2] =~ 'ahead' ]]; then
-        _git_status='ahead'
-      elif [[ $arr[2] =~ 'diverged' ]]; then
-        _git_status='diverged'
-      elif [[ $arr[2] =~ 'behind' ]]; then
-        _git_status='behind'
-      fi
-    fi
-
-    if [[ ! $st =~ 'nothing' ]]; then
-      _git_dirty=1
-    fi
-  fi
-}
-
-function gitprompt {
-  if [[ -n "$_git_branch" ]]; then
-    local s
-    [[ -z "$1" ]] && s="%{${fg[yellow]}%}"
-
-    if [[ -n "$_git_dirty" ]]; then
-      s+="⚡"
-    else
-      s+=":"
-    fi
-
-    s+="$_git_branch"
-    case "$_git_status" in
-      ahead)
-        s+="↑"
-        ;;
-      diverged)
-        s+="↕"
-        ;;
-      behind)
-        s+="↓"
-        ;;
-    esac
-
-    echo "$s"
-  fi
-}
-
-function _gitprompt_preexec {
-  [[ "$1" =~ "^g" ]] && _git_command=1
-}
-
-function _gitprompt_precmd {
-  if [[ -n "$_git_command" ]]; then
-    _gitprompt_update
-    unset _git_command
-  fi
-}
-
-typeset -ga preexec_functions
-typeset -ga precmd_functions
-typeset -ga chpwd_functions
-
-preexec_functions+='_gitprompt_preexec'
-precmd_functions+='_gitprompt_precmd'
-chpwd_functions+='_gitprompt_update'
diff --git a/.zsh/title.zsh b/.zsh/title.zsh
deleted file mode 100644
index d1ad4c25..00000000
--- a/.zsh/title.zsh
+++ /dev/null
@@ -1,30 +0,0 @@
-function _title {
-  [[ "$TERM" =~ "xterm" ]] && print -Pn "\033]0;$@\a"
-}
-
-function title {
-  if [[ -n "$1" ]]; then
-    _title_custom=1
-    _title $@
-  else
-    unset _title_custom
-    _title_precmd
-  fi
-}
-
-function _title_preexec {
-  [[ -z "$_title_custom" ]] && _title "$_title_host%1~: $1"
-}
-
-unset _title_host
-[[ -n "$SSH_CLIENT" ]] && _title_host='%m:'
-
-function _title_precmd {
-  [[ -z "$_title_custom" ]] && _title '$_title_host%1~'
-}
-
-typeset -ga preexec_functions
-typeset -ga precmd_functions
-
-preexec_functions+='_title_preexec'
-precmd_functions+='_title_precmd'
diff --git a/.zsh/z b/.zsh/z
deleted file mode 160000
-Subproject dfd4308ae84da481f774b3f5e732ee277d9d876
diff --git a/.zsh/zsh-syntax-highlighting b/.zsh/zsh-syntax-highlighting
deleted file mode 160000
-Subproject e5d8a50d362a153a28506be6fae9cf179dbb5fd
diff --git a/.zshrc.full b/.zshrc.full
deleted file mode 100644
index 44b5da87..00000000
--- a/.zshrc.full
+++ /dev/null
@@ -1,79 +0,0 @@
-# Detect platform
-if [[ "$(uname)" == "Darwin" ]]; then
-  function osx { true }
-else
-  function osx { false }
-fi
-
-# Basic zsh config
-HISTFILE=~/.histfile
-HISTSIZE=5000
-SAVEHIST=5000
-setopt appendhistory autocd extendedglob nomatch notify autopushd
-setopt interactive_comments prompt_subst hist_ignore_dups
-unsetopt beep
-bindkey -v
-
-# Completion
-zstyle ':completion:*' completer _expand _complete _ignored _correct _approximate _prefix
-zstyle ':completion:*' max-errors 2
-zstyle :compinstall filename '/home/home/.zshrc'
-
-autoload -Uz compinit
-compinit
-
-# Colors
-autoload colors zsh/terminfo
-colors
-
-[[ -n "$COLORTERM" ]] && export TERM='xterm-256color'
-
-# Libs
-
-[[ -f /etc/zsh_command_not_found ]] && source /etc/zsh_command_not_found
-
-source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
-ZSH_HIGHLIGHT_STYLES[builtin]='none'
-ZSH_HIGHLIGHT_STYLES[command]='bold'
-ZSH_HIGHLIGHT_STYLES[precommand]='fg=yellow,bold'
-ZSH_HIGHLIGHT_STYLES[alias]='fg=magenta,bold'
-ZSH_HIGHLIGHT_STYLES[function]='fg=magenta,bold'
-ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='bold'
-ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='bold'
-ZSH_HIGHLIGHT_STYLES[globbing]='fg=blue,bold'
-ZSH_HIGHLIGHT_STYLES[path]='none'
-ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=blue,bold'
-ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=cyan,bold'
-ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=cyan,bold'
-ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=cyan,bold'
-
-source ~/.zsh/z/z.sh
-
-if [[ -d /usr/local/share/chruby ]]; then
-  source /usr/local/share/chruby/chruby.sh
-  source /usr/local/share/chruby/auto.sh
-  chruby ruby
-fi
-
-[[ -s ~/.nvm/nvm.sh ]] && source ~/.nvm/nvm.sh
-
-[[ -f /usr/local/heroku ]] && export PATH="/usr/local/heroku/bin:$PATH"
-
-source ~/.zsh/gitprompt.zsh
-source ~/.zsh/title.zsh
-
-source ~/.zsh/aliases.zsh
-
-# Environment
-
-export EDITOR=vim
-osx && PATH=$PATH:~/.bin
-osx && export CLICOLOR=1
-
-# Prompt
-
-unset _prompt_host
-[[ -n "$SSH_CLIENT" ]] && _prompt_host="%{$fg[magenta]%}%m"
-PROMPT=$'%{$terminfo[bold]%}$_prompt_host%{$fg[green]%}»%{$terminfo[sgr0]$reset_color%} '
-RPROMPT=$'%{$terminfo[bold]%}%(?..%{$fg[red]%}%? )%{$fg[blue]%}%30<…<%~$(gitprompt)%{$terminfo[sgr0]%}'
diff --git a/README.md b/README.md
index 18e02b31..f08715f0 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@ My configuration files.
 
 ## Configurations
 
-* VIM
-* zsh
-* Git
-* irb
-* psql
-* iTerm 2
+- vim
+- zsh
+- git
+- psql
+- iTerm 2
+- Karabiner
diff --git a/effuse.yml b/effuse.yml
index 3be1cb38..e2ed404f 100644
--- a/effuse.yml
+++ b/effuse.yml
@@ -1,5 +1,4 @@
 exclude:
   - .DS_Store
   - README.md
-  - vim-plug.sh
   - com.googlecode.iterm2.plist
diff --git a/vim-plug.sh b/vim-plug.sh
deleted file mode 100755
index 0fc9a28c..00000000
--- a/vim-plug.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p ~/.vim/autoload
-curl -fLo ~/.vim/autoload/plug.vim https://raw.github.com/junegunn/vim-plug/master/plug.vim