From 787a7960b1921461101f39bd8b30d68a5fd508bf Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Mon, 25 Jul 2016 22:36:23 +0200
Subject: [PATCH 1/7] add persistent undos to vim

---
 .gitignore      | 1 +
 vim/undos/.keep | 0
 vimrc           | 6 ++++++
 3 files changed, 7 insertions(+)
 create mode 100644 vim/undos/.keep

diff --git a/.gitignore b/.gitignore
index 9788bcc..795767c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 irssi
 vim/plugged/*
+vim/undos/*
 vim/spell
 .netrwhist
 Xresources.compiled
diff --git a/vim/undos/.keep b/vim/undos/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/vimrc b/vimrc
index 7929f1d..adfd3d6 100644
--- a/vimrc
+++ b/vimrc
@@ -257,6 +257,12 @@ nnoremap <leader>ss :SaveSession<Space>
 nnoremap <leader>sd :DeleteSession<CR>
 nnoremap <leader>sc :CloseSession<CR>
 
+" persistent undo
+set undodir=~/.vim/undos
+set undofile
+set undolevels=1000
+set undoreload=10000
+
 "
 " Plugin Configuration
 "

From 9cf97c635442778b78db9dae84e1ae63f56234b7 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Mon, 25 Jul 2016 22:39:15 +0200
Subject: [PATCH 2/7] add git fix alias to resolve conficts

---
 gitconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gitconfig b/gitconfig
index 94de6d1..888a985 100644
--- a/gitconfig
+++ b/gitconfig
@@ -19,6 +19,7 @@
     changes = diff --name-status -r
     diffstat = diff --stat -r
     lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
+    fix = "!f() { ${EDITOR} $(git diff --name-only | uniq ); }; f"
 [merge]
     tool = bc3
 [mergetool]

From 33ef0957efdc9839dab56e03204608d35593098a Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Mon, 25 Jul 2016 22:39:51 +0200
Subject: [PATCH 3/7] add conflict marker plugin

---
 vimrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vimrc b/vimrc
index adfd3d6..0e25fe0 100644
--- a/vimrc
+++ b/vimrc
@@ -33,6 +33,7 @@ Plug 'scrooloose/syntastic'
 Plug 'pmsorhaindo/syntastic-local-eslint.vim'
 
 Plug 'tpope/vim-fugitive'
+Plug 'rhysd/conflict-marker.vim'
 Plug 'airblade/vim-gitgutter'
 Plug 'inside/vim-search-pulse'
 

From eb104c81765f3b91c95e4d9653fd2b498e09096c Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Mon, 25 Jul 2016 22:40:15 +0200
Subject: [PATCH 4/7] use instant markdown instead of livedown

---
 vimrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vimrc b/vimrc
index 0e25fe0..f6423ef 100644
--- a/vimrc
+++ b/vimrc
@@ -52,7 +52,7 @@ Plug 'marijnh/tern_for_vim', { 'do': 'npm install', 'for': 'javascript'}
 Plug 'mustache/vim-mustache-handlebars'
 "Plug 'mxw/vim-jsx'
 
-Plug 'shime/vim-livedown'
+Plug 'suan/vim-instant-markdown'
 Plug 'xuhdev/vim-latex-live-preview'
 
 Plug 'wesQ3/vim-windowswap'

From 4d7d3d7d81d4623d0107f57799509e92aa413ebf Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Mon, 25 Jul 2016 22:40:38 +0200
Subject: [PATCH 5/7] fix theme name used by base16

---
 vimrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vimrc b/vimrc
index f6423ef..88a9b78 100644
--- a/vimrc
+++ b/vimrc
@@ -104,7 +104,7 @@ endif
 
 set background=dark
 let base16colorspace=256
-colorscheme base16-solarized
+colorscheme base16-solarized-dark
 
 if has("gui_running")
   "disable menu, toolsbar, scrollbar

From 086b787da0911dd5d6d7eeb8a16e9f986484e594 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Mon, 25 Jul 2016 22:41:21 +0200
Subject: [PATCH 6/7] use rbenv if available

---
 zprofile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/zprofile b/zprofile
index 0c576d7..adc18ab 100644
--- a/zprofile
+++ b/zprofile
@@ -7,6 +7,12 @@ export EDITOR=$(which vim)
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
 
+# rbenv
+if [ -s "$HOME/.rbenv/bin/rbenv" ] ; then
+    export PATH="$HOME/.rbenv/bin:$PATH"
+    eval "$(rbenv init -)"
+fi
+
 ########################
 # Dist related settings
 ########################

From ec2a715e53b134ec5885779375d39f83f25bf696 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Mon, 25 Jul 2016 22:41:42 +0200
Subject: [PATCH 7/7] update uttr aliases

---
 zshrc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/zshrc b/zshrc
index e74b1f5..18f7f1c 100644
--- a/zshrc
+++ b/zshrc
@@ -41,12 +41,15 @@ alias tl='tmux list-sessions'
 rl () { $(npm bin)/$* }
 
 # utt time tracking
-alias uh='uttr --add hello'
-alias ust='uttr --add standup'
-alias ul='uttr --add "lunch**"'
+alias ua='uttr --add'
+alias uah='uttr --add hello'
+alias uas='uttr --add standup'
+alias ual='uttr --add "lunch**"'
 alias ue='uttr --edit'
 alias urw='uttr --report=week'
+alias urlw='uttr --report=lastWeek'
 alias urm='uttr --report=month'
+alias urlm='uttr --report=lastMonth'
 
 # colors
 autoload -U colors && colors