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

Conflicts:
	tmux.conf

.gitignore

@@ -1 +1,2 @@
-/janus/go
+/janus/*
+byobu/.ssh-agent

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "janus/aspen"]
-	path = janus/aspen
-	url = git://github.com/patcoll/aspen.vim.git

.travis.yml

@@ -0,0 +1,4 @@
+---
+language: generic
+sudo: false
+script: make

Makefile

@@ -1,21 +1,13 @@
-SOURCES := $(shell ls | egrep -v 'README|Makefile')
+SOURCES := $(shell ls | grep -E -v 'README|Makefile')
 TARGETS := $(patsubst %,$(HOME)/.%,$(SOURCES))
 
-
 $(HOME)/.%: %
-	ln -sv $(PWD)/'$^' '$@'
+	$(RM) '$@' && ln -svf '$(PWD)/$^' '$@'
-
-
-all: $(TARGETS) $(HOME)/.janus/go
 
+.PHONY: all
+all: $(TARGETS)
 
+.PHONY: echo
 echo:
 	@echo SOURCES=$(SOURCES)
 	@echo TARGETS=$(TARGETS)
-
-
-$(HOME)/.janus/go:
-	test -n "$$GOROOT" && ln -sv $$GOROOT/misc/vim ~/.janus/go ; true
-
-
-.PHONY: all echo

ackrc

@@ -1 +0,0 @@
---all-types

bash_aliases

@@ -17,6 +17,7 @@ alias s="cat $HOME/.ssh/config | grep '^Host ' | sed \"s/Host //\" | sort | uniq
 alias sS='TERM=xterm screen -Rd -S '
 alias scr='TERM=xterm screen -Rd'
 alias sl="screen -ls"
+alias tmux='TERM=xterm-256color tmux -2'
 
 case "$(uname | tr '[:upper:]' '[:lower:]')" in
     darwin)

bash_profile

@@ -70,9 +70,9 @@ _bash_profile_main() {
     get_ssh_agent
     which gpg-agent && test -d ~/.gnupg && get_gpg_agent
 
-    _source_if_exists "$HOME/.gvm/scripts/gvm"
+    #_source_if_exists "$HOME/.gvm/scripts/gvm"
-    _source_if_exists "$HOME/.gvmrc"
+    #_source_if_exists "$HOME/.gvmrc"
-    _source_if_exists "$HOME/src/gocode/src/.env"
+    #_source_if_exists "$HOME/src/gocode/src/.env"
 
     unset _get_hostname
     unset _source_host_specific_rcfile
@@ -83,4 +83,7 @@ _bash_profile_main() {
 
 _bash_profile_main
 
+# added by travis gem
+[[ -f ~/.travis/travis.sh ]] && source ~/.travis/travis.sh
+
 # vim:filetype=sh

bashrc

@@ -12,3 +12,9 @@ then
 fi
 
 # vim:filetype=sh
+
+### Added by the Heroku Toolbelt
+export PATH="/usr/local/heroku/bin:$PATH"
+
+# added by travis gem
+[ -f /Users/me/.travis/travis.sh ] && source /Users/me/.travis/travis.sh

byobu/color.tmux

@@ -0,0 +1,5 @@
+BYOBU_DARK=black
+BYOBU_LIGHT=white
+BYOBU_ACCENT=magenta
+BYOBU_HIGHLIGHT=red
+MONOCHROME=0

byobu/prompt

@@ -0,0 +1 @@
+[ -r /usr/share/byobu/profiles/bashrc ] && . /usr/share/byobu/profiles/bashrc  #byobu-prompt#

gemrc

@@ -1 +1 @@
-gem: --no-rdoc --ri
+gem: --no-rdoc --no-ri

git-global-ignores

@@ -5,3 +5,7 @@ tags
 TAGS
 *.rbc
 *.class
+.vagrant
+*.swp
+.DS_Store
+.~lock*

gitconfig

@@ -2,9 +2,23 @@
 	name = Dan Buch
 	email = daniel.buch@gmail.com
 
+[github]
+	user = meatballhat
+
 [core]
 	excludesfile = ~/.git-global-ignores
+	editor = vim
+	filemode = true
 	autocrlf = false
+	pager = less -FRXx2
+
+[clean]
+	requireForce = false
+
+[branch]
+	autosetuprebase = remote
+	autosetupmerge = true
+	mergeoptions = --no-commit --no-ff
 
 [daemon]
 	uploadpack = true
@@ -12,7 +26,7 @@
 	receivepack = true
 
 [push]
-	default = matching
+	default = current
 
 [color]
 	ui = auto
@@ -64,6 +78,8 @@
 	spush = svn dcommit
 	srb = rebase git-svn
 
+	rpo = remote prune origin
+
 	cm = checkout master
 	lm = log master..
 
@@ -72,9 +88,9 @@
 	ct = checkout svn/trunk
 
 	logv = log --name-status
+	hug = blame
+	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
 
-
+# vim: set filetype=cfg noexpandtab:
-[clean]
+[commit]
-    requireForce = false
+	template = /Users/me/.gittemplate
-
-# vim:filetype=cfg

gittemplate

@@ -0,0 +1,11 @@
+
+
+# 50-character subject line
+#
+# 72-character wrapped longer description. This should answer:
+#
+# - Why was this change necessary?
+# - How does it address the problem?
+# - Are there any side effects?
+#
+# Include a link to the ticket, if any.

janus/aspen

@@ -1 +0,0 @@
-Subproject commit 7225b212474c2add040259114061ec1d9a7721d7

janus/protobuf/ftdetect/proto.vim

@@ -1,91 +0,0 @@
-" Protocol Buffers - Google's data interchange format
-" Copyright 2008 Google Inc.
-"
-" Licensed under the Apache License, Version 2.0 (the "License");
-" you may not use this file except in compliance with the License.
-" You may obtain a copy of the License at
-"
-"      http:"www.apache.org/licenses/LICENSE-2.0
-"
-" Unless required by applicable law or agreed to in writing, software
-" distributed under the License is distributed on an "AS IS" BASIS,
-" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-" See the License for the specific language governing permissions and
-" limitations under the License.
-
-" This is the Vim syntax file for Google Protocol Buffers.
-"
-" Usage:
-"
-" 1. cp proto.vim ~/.vim/syntax/
-" 2. Add the following to ~/.vimrc:
-"
-" augroup filetype
-"   au! BufRead,BufNewFile *.proto setfiletype proto
-" augroup end
-"
-" Or just create a new file called ~/.vim/ftdetect/proto.vim with the
-" previous lines on it.
-
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-syn case match
-
-syn keyword pbTodo       contained TODO FIXME XXX
-syn cluster pbCommentGrp contains=pbTodo
-
-syn keyword pbSyntax     syntax import option
-syn keyword pbStructure  package message group
-syn keyword pbRepeat     optional required repeated
-syn keyword pbDefault    default
-syn keyword pbExtend     extend extensions to max
-syn keyword pbRPC        service rpc returns
-
-syn keyword pbType      int32 int64 uint32 uint64 sint32 sint64
-syn keyword pbType      fixed32 fixed64 sfixed32 sfixed64
-syn keyword pbType      float double bool string bytes
-syn keyword pbTypedef   enum
-syn keyword pbBool      true false
-
-syn match   pbInt     /-\?\<\d\+\>/
-syn match   pbInt     /\<0[xX]\x+\>/
-syn match   pbFloat   /\<-\?\d*\(\.\d*\)\?/
-" TODO: .proto also supports C-style block comments;
-" see /usr/share/vim/vim70/syntax/c.vim for how it's done.
-syn region  pbComment start="//" skip="\\$" end="$" keepend contains=@pbCommentGrp
-syn region  pbString  start=/"/ skip=/\\"/ end=/"/
-syn region  pbString  start=/'/ skip=/\\'/ end=/'/
-
-if version >= 508 || !exists("did_proto_syn_inits")
-  if version < 508
-    let did_proto_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink pbTodo         Todo
-
-  HiLink pbSyntax       Include
-  HiLink pbStructure    Structure
-  HiLink pbRepeat       Repeat
-  HiLink pbDefault      Keyword
-  HiLink pbExtend       Keyword
-  HiLink pbRPC          Keyword
-  HiLink pbType         Type
-  HiLink pbTypedef      Typedef
-  HiLink pbBool         Boolean
-
-  HiLink pbInt          Number
-  HiLink pbFloat        Float
-  HiLink pbComment      Comment
-  HiLink pbString       String
-
-  delcommand HiLink
-endif
-
-let b:current_syntax = "proto"

janus/syntastic-syntax-checkers-scala.vim.patch

@@ -1,42 +0,0 @@
-From 7a9d955c0141d4adb148ba0b128d302b82f2f307 Mon Sep 17 00:00:00 2001
-From: Spencer Deinum <spencerdeinum@gmail.com>
-Date: Thu, 30 Aug 2012 00:43:12 -0400
-Subject: [PATCH] Edited scala checker to use scalac, with the
- -Ystop-after:refchecks option.
-
-This means syntax checking is done via the compiler instead of the
-interpreter, so it won't choke on things like package definitions.
-
-The -Ystop-after:refchecks option will stop before code is actually
-generated, so we don't emit any class files.
-
-Signed-off-by: Spencer Deinum <spencerdeinum@gmail.com>
----
- syntax_checkers/scala.vim |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/syntax_checkers/scala.vim b/syntax_checkers/scala.vim
-index f6f05af..d603246 100644
---- a/syntax_checkers/scala.vim
-+++ b/syntax_checkers/scala.vim
-@@ -15,7 +15,7 @@ endif
- let loaded_scala_syntax_checker = 1
- 
- "bail if the user doesnt have the scala binary installed
--if !executable("scala")
-+if !executable("scalac")
-     finish
- endif
- 
-@@ -24,7 +24,7 @@ if !exists("g:syntastic_scala_options")
- endif
- 
- function! SyntaxCheckers_scala_GetLocList()
--    let makeprg = 'scala '. g:syntastic_scala_options .' '.  shellescape(expand('%')) . ' /dev/null'
-+    let makeprg = 'scalac -Ystop-after:refchecks '. g:syntastic_scala_options .' '.  shellescape(expand('%'))
- 
-     let errorformat = '%f\:%l: %trror: %m'
- 
--- 
-1.7.10
-

meatballhat.zsh-theme

@@ -0,0 +1,7 @@
+local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)"
+PROMPT='$(date -u +%Y-%m-%dT%H:%M:%S) ${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}🙀 %{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"

tmux.conf

@@ -1,8 +1,9 @@
 # need me some vi mode
 setw -g mode-keys vi
 
-set -g default-command /usr/bin/zsh
+# note to self: learn ye a zsh
-set -g default-shell /usr/bin/zsh
+set -g default-command /bin/zsh
+set -g default-shell /bin/zsh
 
 # copy-pasta in a vi-like way
 unbind [
@@ -23,3 +24,6 @@ set -s escape-time 0
 
 # i forget easily
 set -g history-limit 100000
+
+# colors!
+set -g default-terminal 'screen-256color'

todo.cfg

@@ -1,8 +1,7 @@
 # === EDIT FILE LOCATIONS BELOW ===
 
 # Your todo.txt directory
-#export TODO_DIR="/Users/gina/Documents/todo"
+export TODO_DIR="$HOME/Dropbox/dan/todo"
-export TODO_DIR="$HOME/Dropbox/buchfam/todo"
 
 # Your todo/done/report.txt locations
 export TODO_FILE="$TODO_DIR/todo.txt"

vimrc

@@ -0,0 +1,27 @@
+syntax on
+
+filetype on
+filetype indent on
+filetype plugin on
+
+set backspace=indent,eol,start
+set directory^=~/.vim/_temp//
+set hlsearch
+set ignorecase
+set incsearch
+set laststatus=2
+set nowrap
+set number
+set smartcase
+set tabstop=4
+set textwidth=67
+
+map ,t :w<CR>
+map ,- :nohl<CR>
+map ,w :%s/  *$//<CR>
+
+let g:go_fmt_command = "goimports"
+
+call pathogen#infect()
+
+colo summerfruit256

vimrc.after

@@ -4,7 +4,7 @@ set tabstop=4
 set shiftwidth=4
 set softtabstop=4
 
-map ,t :w<CR>
+autocmd FileType * map ,t :w<CR>
 map ,m :w\|:make<CR><CR>
 map ,- :nohl<CR>
 
@@ -13,12 +13,30 @@ autocmd BufNew,BufRead *.feature,*.rb,*.ru,*.xml,*.html,*.htm,Gemfile,Rakefile,P
     \| set tabstop=2
     \| set softtabstop=2
 
+autocmd FileType ruby set shiftwidth=2
+    \| set tabstop=2
+    \| set softtabstop=2
+    \| map ,t :RuboCop<CR>:w<CR>
+
+autocmd FileType ruby map ,r :RuboCop<CR>
+
+autocmd BufNew,BufRead *.ino,*.pde setf arduino
+
+autocmd FileType arduino set tabstop=4
+    \| set softtabstop=4
+    \| let g:syntastic_cpp_check_header=0
+    \| map ,t :w<CR>:execute '!astyle' shellescape(expand('%'), 1)<CR>:e<CR>:make<CR><CR><CR>
+
 " Set up some sane java compilation bits
 autocmd BufNew,BufRead *.java set efm=%A\ %#[javac]\ %f:%l:\ %m,%-Z\ %#[javac]\ %p^,%-C%.%#
     \| set makeprg=ant\ -find\ build.xml
 
-" remap ',t' in Go buffers to do :Fmt first
+" never expand tabs (multiline-strings) and remap ',t' to do :Fmt first in Go
-autocmd BufNew,BufRead *.go map ,t :Fmt<CR>:w<CR>
+autocmd FileType go set noexpandtab
+	\| map ,t :Fmt<CR>:w<CR>
+
+" add color column for a few file types
+autocmd FileType go,python,ruby set colorcolumn=80
 
 " highlighting sbt as scala, too
 autocmd BufNew,BufRead *.sbt set syn=scala
@@ -39,7 +57,7 @@ endfunction
 
 " MyNext() and MyPrev(): Movement between tabs OR buffers
 function! MyNext()
-    if exists( '*tabpagenr' ) && tabpagenr('$') != 1
+    if exists('*tabpagenr') && tabpagenr('$') != 1
         " Tab support && tabs open
         normal gt
     else
@@ -48,7 +66,7 @@ function! MyNext()
     endif
 endfunction
 function! MyPrev()
-    if exists( '*tabpagenr' ) && tabpagenr('$') != '1'
+    if exists('*tabpagenr') && tabpagenr('$') != '1'
         " Tab support && tabs open
         normal gT
     else
@@ -61,6 +79,9 @@ endfunction
 nnoremap L :call MyNext()<CR>
 nnoremap H :call MyPrev()<CR>
 
+" astyle the whole thing
+map ,a :execute '!astyle' shellescape(expand('%'), 1)<CR>:e<CR>
+
 " easy indentation in visual mode
 " This keeps the visual selection active after indenting.
 " Usually the visual selection is lost after you indent it.
@@ -92,6 +113,7 @@ endfun
 " call it right away for certain files
 autocmd FileType python call LambastOver80Wide()
 autocmd FileType moin call LambastOver80Wide()
+" autocmd FileType go call LambastOver80Wide()
 " autocmd FileType javascript call LambastOver80Wide()
 " autocmd FileType actionscript call LambastOver80Wide()
 autocmd FileType mail call LambastOver80Wide()
@@ -120,7 +142,7 @@ if !has('gui_running')
   set t_Co=256
   "colorscheme gardener
   "colorscheme inkpot
-  colorscheme delek
+  colorscheme molokai
 endif
 
 let g:valgrind_arguments='--leak-check=yes --num-callers=50'

xinitrc

@@ -1,36 +0,0 @@
-test -f /etc/rc.conf && source /etc/rc.conf
-setxkbmap ${KEYMAP-dvorak}
-
-
-DEFAULT="ratpoison"
-
-
-case "$1" in
-    awe*)
-        exec awesome
-        ;;
-    evil*)
-        exec evilwm
-        ;;
-    open*)
-        exec openbox-session
-        ;;
-    win*)
-        exec wmaker
-        ;;
-    flux*)
-        exec startfluxbox
-        ;;
-    gno*)
-        exec gnome-session
-        ;;
-    rat*)
-        exec ratpoison
-        ;;
-    *)
-        exec $DEFAULT
-        ;;
-esac
-
-
-# vim:filetype=sh

zshrc

@@ -1,13 +1,125 @@
-HISTFILE=~/.zsh-histfile
+ZSH=$HOME/.oh-my-zsh
-HISTSIZE=10000
+ZSH_THEME=meatballhat
-SAVEHIST=100000
-setopt appendhistory extendedglob nomatch
-unsetopt autocd beep notify
-bindkey -v
-autoload -Uz compinit
-compinit
 
-export PS1="\$ "
+CASE_SENSITIVE="true"
-function precmd() {
+
-    echo "$USER@$HOST:$(truncpwd)"
+# Comment this out to disable bi-weekly auto-update checks
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment to change how often before auto-updates occur? (in days)
+export UPDATE_ZSH_DAYS=3
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+DISABLE_AUTO_TITLE="true"
+
+# Uncomment following line if you want to disable command autocorrection
+DISABLE_CORRECTION="true"
+
+# Uncomment following line if you want red dots to be displayed while waiting
+# for completion
+COMPLETION_WAITING_DOTS="true"
+
+# Uncomment following line if you want to disable marking untracked files under
+# VCS as dirty. This makes repository status check for large repositories much,
+# much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+plugins=(
+    autoenv
+    aws
+    bundler
+    cabal
+    command-not-found
+    cp
+    docker
+    gem
+    git
+    git-hubflow
+    golang
+    heroku
+    hk
+    knife
+    osx
+    pip
+    postgres
+    python
+    rails
+    rake-fast
+    rbenv
+    redis-cli
+    rsync
+    ruby
+    tmux
+    vagrant
+    vi-mode
+)
+
+fpath=(/usr/local/share/zsh/site-functions $fpath)
+
+source $ZSH/oh-my-zsh.sh
+
+unalias gb
+
+# The completion for aws is not compatible with $fpath :scream_cat:
+if [[ -f /usr/local/share/zsh/site-functions/_aws ]] ; then
+  source /usr/local/share/zsh/site-functions/_aws
+fi
+
+unsetopt correct_all
+bindkey '^R' history-incremental-search-backward
+
+path=(
+    $HOME/bin
+    $HOME/gopath/bin
+    $HOME/.rbenv/bin
+    $HOME/.rbenv/shims
+    $HOME/.phpenv/bin
+    /usr/local/sbin
+    /usr/local/bin
+    /usr/sbin
+    /usr/bin
+    /sbin
+    /bin
+    /usr/games
+    /usr/local/games
+)
+
+if which pyenv > /dev/null ; then
+  eval "$(pyenv init -)"
+fi
+export PYENV_ROOT='/usr/local/var/pyenv'
+
+eval "$(phpenv init -)"
+
+eval "$(gimme 1.4.2)" 2>/dev/null
+export GOPATH="$HOME/gopath"
+
+CDPATH="$HOME/workspace:$HOME/src:$HOME/Development/src:$HOME/repos"
+for prefix in github.com github.com/travis-ci github.com/meatballhat code.google.com/p ; do
+  CDPATH="$HOME/gopath/src/$prefix:$CDPATH"
+done
+
+export GPG_TTY=$(tty)
+
+source ~/.bash_aliases
+
+function dump-ssh-agent() {
+    env | awk '/SSH/ {
+        sub(/=/, "=\"", $1)
+        sub(/$/, "\"", $1)
+        print "export " $1
+    }' | tee ~/.ssh/agent.out
 }
+
+function load-ssh-agent() {
+    source ~/.ssh/agent.out
+}
+
+[[ -e ~/.zshenv ]] && source ~/.zshenv
+
+[ -f ~/.travis/travis.sh ] && source ~/.travis/travis.sh
+[ -f ~/google-cloud-sdk/path.zsh.inc ] && source ~/google-cloud-sdk/path.zsh.inc
+[ -f ~/google-cloud-sdk/completion.zsh.inc ] && source ~/google-cloud-sdk/completion.zsh.inc