move some stuff from old world into new world

git-files/gitconfig

@@ -1,6 +1,6 @@
 [user]
 	name = Haak Saxberg
-	email = haak.erling@gmail.com
+	email = haak@zenpayroll.com
 [color]
 	ui = auto
 [alias]
@@ -8,3 +8,5 @@
 	dc = diff --cached
 	ff = merge --ff-only
 	fa = fetch --all
+[push]
+	default = simple

vim-files/vimrc

@@ -32,6 +32,8 @@ Bundle 'myusuf3/numbers.vim'
 Bundle 'mhinz/vim-signify'
 Bundle 'nathanaelkane/vim-indent-guides'
 Bundle 'tpope/vim-surround'
+Bundle 'tpope/vim-rails'
+Bundle 'tpope/vim-rake'
 Bundle 'scrooloose/syntastic'
 Bundle 'Valloric/YouCompleteMe'
 Bundle 'christoomey/vim-tmux-navigator'
@@ -99,6 +101,7 @@ if v:version >= 703
 endif
 
 
+set hidden
 set showmode
 set number
 set numberwidth=1

zsh-files/aliases.zsh

@@ -0,0 +1 @@
+alias vim="~/local/bin/vim"

zsh-files/functions.zsh

@@ -0,0 +1,8 @@
+fancy-ctrl-z () {
+  if [[ $#BUFFER -eq 0 ]]; then
+    bg
+    zle redisplay
+  else
+    zle push-input
+  fi
+}

zsh-files/zshrc

@@ -21,30 +21,13 @@ antigen apply
 
 source ~/dotfiles/zsh-files/zsh_opts.zsh
 source ~/dotfiles/zsh-files/exports.zsh
-
+source ~/dotfiles/zsh-files/functions.zsh
+source ~/dotfiles/zsh-files/aliases.zsh
 
 zstyle :compinstall filename '/Users/haak/.zshrc'
 
 autoload -Uz compinit
 compinit
 
-function branch_prompt {
-	BRANCH=$(current_branch)
-	SHA=$(command git rev-parse --short HEAD 2> /dev/null)
-	if [[ $SHA = $BRANCH ]]; then
-		echo "$(git_prompt_long_sha)"
-	else
-		echo "$(current_branch)$(git_prompt_short_sha)"
-	fi
-}
-
-fancy-ctrl-z () {
-  if [[ $#BUFFER -eq 0 ]]; then
-    bg
-    zle redisplay
-  else
-    zle push-input
-  fi
-}
 zle -N fancy-ctrl-z
 bindkey '^Z' fancy-ctrl-z