Merge branch 'master' into jenipapo

.gitignore

@@ -1,5 +1,6 @@
 irssi
 vim/plugged/*
+vim/undos/*
 vim/spell
 .netrwhist
 Xresources.compiled

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]

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'
 
@@ -51,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'
@@ -103,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
@@ -257,6 +258,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
 "

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
 ########################

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