Merge branch 'master' of github.com:coarsesand/dotfiles

tmux/.tmux.conf

@@ -1,5 +1,5 @@
 # Prefix key
-set -g prefix C-t
+set -g prefix C-f
 
 # Vi mode
 set  -g status-keys vi
@@ -11,42 +11,35 @@ set -sg repeat-time 600
 
 # Mouse mode
 set  -g mode-mouse on
-setw -g mouse-select-window on
-setw -g mouse-select-pane   on
-
-# Status bar
-# set  -g status-bg    colour0
-# set  -g status-fg    colour12
-# set  -g status-left  ' '
-# set  -g status-right '#[fg=green]#(date +"%H:%M %a %d-%h-%y") '
-# set  -g status-left  ' #[bold]❐ #S#[default] ⡇'
-# set  -g status-right ' #[bold]#(whoami) ⡇ #H#[default] '
+set  -g mouse-select-window on
+set  -g mouse-select-pane   on
+set  -g mouse-resize-pane   on
 
 # Custom status bar
 # Powerline symbols: ⮂ ⮃ ⮀ ⮁ ⭤
+set  -g status-utf8 on
+
 set  -g status-bg colour234
 set  -g status-fg white
 
 set  -g status-left-length 32
 set  -g status-right-length 150
-set  -g status-interval 5
+set  -g status-interval 20
 
 set  -g status-left '#[fg=colour22,bg=colour148,bold] ❐ #S #[fg=colour15,bg=colour238,bold] #[fg=colour238,bg=colour234,nobold]'
 
 set  -g status-right '#[fg=colour245] #(whoami) #[fg=colour15,bg=colour238] #H #[fg=colour234,bg=colour252,nobold] %R #[fg=colour246]%d %b '
 
-# setw -g window-status-fg           colour12
-# setw -g window-status-attr         bright
-setw -g window-status-format         '#[fg=white,bg=colour234]#I'
-setw -g window-status-current-format '#[fg=colour208,bg=colour234]#I'
+setw -g window-status-format         '#[fg=white,bg=colour234]#I:#W'
+setw -g window-status-current-format '#[fg=colour208,bg=colour234]#I:#W'
 
 setw -g window-status-activity-bg    black
 setw -g window-status-activity-fg    green
 setw -g window-status-activity-attr  bold
 
-set  -g pane-border-fg black
+set  -g pane-border-fg colour239
 set  -g pane-border-bg black
-set  -g pane-active-border-fg black
+set  -g pane-active-border-fg colour214
 set  -g pane-active-border-bg black
 
 # Window options
@@ -67,37 +60,38 @@ set  -g default-terminal "screen-256color"
 # setw -g monitor-activity on
 # set -g visual-activity off
 
-# Autorename sanely.
-setw -g automatic-rename on
+# Key bindings
+# -r means key is repeatable
+# -t specifies key table for binding
 unbind C-b
 unbind C-s
 unbind %
 unbind '"'
+unbind [
 unbind p
 
-bind    C-s last-window
-bind    v   split-window -h
-bind    s   split-window -v
-bind    S   choose-session
-bind    r   source-file ~/.tmux.conf \; display " ✱ ~/.tmux.conf is reloaded"
-bind    h   select-pane -L
-bind    j   select-pane -D
-bind    k   select-pane -U
-bind    l   select-pane -R
-bind -r H   resize-pane -L 5
-bind -r J   resize-pane -D 5
-bind -r K   resize-pane -U 5
-bind -r L   resize-pane -R 5
-bind    C   new-window \; command-prompt "Rename window '%%'"
-bind    c   new-window
-bind    ,   command-prompt "Rename window '%%'"
-
-# Copy mode
-bind [ copy-mode
-bind p paste-buffer
-bind -t vi-copy v begin-selection
-bind -t vi-copy y copy-selection
+bind              C-f      last-window
+bind              v        split-window -h
+bind              s        split-window -v
+bind              S        choose-session
+bind              r        source-file ~/.tmux.conf \; display " ✱ ~/.tmux.conf is reloaded"
+bind              h        select-pane -L
+bind              j        select-pane -D
+bind              k        select-pane -U
+bind              l        select-pane -R
+bind -r           H        resize-pane -L 5
+bind -r           J        resize-pane -D 5
+bind -r           K        resize-pane -U 5
+bind -r           L        resize-pane -R 5
+bind              C        new-window \; command-prompt -p 'Rename window:' 'rename-window %1'
+bind              c        new-window
+bind              ,        command-prompt -p 'Rename window:' 'rename-window %1'
+bind             \;        command-prompt
+bind              v        copy-mode
+bind              p        paste-buffer
+bind -t vi-copy   y        copy-selection
+bind -t vi-copy   Escape   cancel
 
 # Fix tmux detaching from clipboard
-set  -g default-command "hash reattach-to-user-namespace && reattach-to-user-namespace -l zsh"
+# set  -g default-command "hash reattach-to-user-namespace && reattach-to-user-namespace -l zsh"
 

vim/.vim/plugins

@@ -14,6 +14,7 @@ Bundle 'davidhalter/jedi-vim'
 Bundle 'epmatsw/ag.vim'
 Bundle 'ervandew/supertab'
 Bundle 'gmarik/vundle'
+Bundle 'guns/xterm-color-table.vim'
 Bundle 'juanpabloaj/help.vim'
 Bundle 'kien/ctrlp.vim'
 Bundle 'loremipsum'
@@ -32,7 +33,6 @@ Bundle 'Better-CSS-Syntax-for-Vim'
 Bundle 'Haskell-Highlight-Enhanced'
 Bundle 'JSON.vim'
 Bundle 'Puppet-Syntax-Highlighting'
-Bundle 'bbommarito/vim-slim'
 Bundle 'bryanjswift/vim-rust'
 Bundle 'cakebaker/scss-syntax.vim'
 Bundle 'depuracao/vim-rdoc'

zsh/.zsh/oh-my.zsh

@@ -9,7 +9,6 @@ DISABLE_AUTO_UPDATE="true"
 plugins=(bundler django git github mercurial node pip powder rake rbenv vundle)
 if [[ `uname` == 'Darwin' ]]
   then plugins=(brew $plugins)
-  else plugins=(debian $plugins)
 fi
 
 source $ZSH/oh-my-zsh.sh

zsh/.zshenv

@@ -1,32 +1,46 @@
-# Personal bin dir
-PATH=$PATH:$HOME/bin
+EDITOR=vim
+CLICOLOR=1
 
-# Homebrew
+# Mac settings
 if [[ `uname` = 'Darwin' ]]
 then
-	PATH=/usr/local/sbin:$PATH
+	LSCOLORS=exBxcxCxbxgxGxdxdxGeEx
+	PATH=/usr/local/sbin:$PATH # Homebrew
 fi
 
 # Pythons
 if [[ -d /usr/local/share/python ]]
-  then PATH=/usr/local/share/python:$PATH
+then
+	PATH=/usr/local/share/python:$PATH
 fi
 
 if [[ -d /usr/local/share/python3 ]]
-  then PATH=/usr/local/share/python3:$PATH
+then
+	PATH=/usr/local/share/python3:$PATH
 fi
 
 # rbenv
+# Get it on the path first is ~/.rbenv exists
+if [[ -d ~/.rbenv ]]
+then
+	PATH=$HOME/.rbenv/bin:$PATH
+fi
+
 if which rbenv &>/dev/null
-  then eval "$(rbenv init -)"
+then
+	eval "$(rbenv init -)"
 fi
 
 # virtualenvwrapper
 WORKON_HOME=$HOME/.virtualenvs/
 PIP_VIRTUALENV_BASE=$WORKON_HOME
 PIP_RESPECT_VIRTUALENV=true
-VIRTUALENVWRAPPER_PYTHON=/usr/local/bin/python
+VIRTUAL_ENV_DISABLE_PROMPT=true
 
 if which virtualenvwrapper_lazy.sh &>/dev/null
-  then source virtualenvwrapper_lazy.sh
+then
+	source virtualenvwrapper_lazy.sh
 fi
+
+# Personal bin dir
+PATH=$HOME/bin:$PATH

zsh/.zshrc

@@ -3,20 +3,8 @@
 # ==========
 
 if [[ -s ~/.oh-my-zsh/oh-my-zsh.sh ]]
-  then source ~/.zsh/oh-my.zsh
-  else source ~/.zsh/regular.zsh
-fi
-
-# Environment
-EDITOR="subl -w"
-CLICOLOR=1
-VIRTUAL_ENV_DISABLE_PROMPT=true
-
-# Mac specific
-if [[ "`uname`" = Darwin ]]
-then
-  LSCOLORS=exBxcxCxbxgxGxdxdxGeEx
-  alias vim="/Applications/MacVim.app/Contents/MacOS/Vim"
+then source ~/.zsh/oh-my.zsh
+else source ~/.zsh/regular.zsh
 fi
 
 # =========
@@ -32,9 +20,16 @@ autoload term_colors
 # Aliases
 # ======
 
+# Macvim
+if [[ "`uname`" = Darwin ]]
+then
+	alias vim="/Applications/MacVim.app/Contents/MacOS/Vim"
+fi
+
 # Commands where correction just gets irritating
 for cmd in "cp mv mkdir tmux rbenv ncmpcpp subl powder bundle vundle pip which"
-  do alias $cmd="nocorrect $cmd"
+do
+	alias $cmd="nocorrect $cmd"
 done
 
 alias addrepo="sudo add-apt-repository" # add-apt-repository is just too verbose