3 files changed, 24 insertions, 14 deletions

diff --git a/bookmarks b/bookmarks
index 4bf977a..2c72c81 100644
--- a/bookmarks
+++ b/bookmarks
@@ -1,5 +1,6 @@
 code : /home/urbain/Dropbox/phd/code/spectral
 dotfiles : /home/urbain/dotfiles
+fuzzymarks : /home/urbain/github/fuzzy-zsh-marks
 paper : /home/urbain/Dropbox/phd/papers/spectral
 phd : /home/urbain/Dropbox/phd
 report : /home/urbain/Dropbox/phd/reports/esa
diff --git a/install.sh b/install.sh
index 1df41e3..782c1c3 100755
--- a/install.sh
+++ b/install.sh
@@ -5,16 +5,16 @@ dir=$home/dotfiles
 olddir=$home/dotfiles_old
 
 declare -A repodirs
-repodirs[altercation/mutt-colors-solarized]=$home/.solarized/mutt-colors-solarized
 repodirs[Anthony25/gnome-terminal-colors-solarized]=$home/.solarized/gnome-terminal-colors-solarized
-repodirs[seebi/dircolors-solarized]=$home/.solarized/dircolors-solarized
+repodirs[alols/xcape]=$home/xcape
+repodirs[altercation/mutt-colors-solarized]=$home/.solarized/mutt-colors-solarized
 repodirs[gmarik/vundle]=$dir/bundle/vundle
-repodirs[junegunn/vim-plug]=$dir/nvim/vim-plug
+repodirs[icholy/ttygif]=$home/ttygif
 repodirs[junegunn/fzf]=$home/.fzf
+repodirs[junegunn/vim-plug]=$dir/nvim/vim-plug
+repodirs[seebi/dircolors-solarized]=$home/.solarized/dircolors-solarized
 repodirs[tmux-plugins/tpm]=$home/.tmux/plugins/tpm
 repodirs[uvaes/fuzzy-zsh-marks]=$home/github/fuzzy-zsh-marks
-repodirs[alols/xcape]=$home/xcape
-repodirs[icholy/ttygif]=$home/ttygif
 
 function after_vimplug {
     cd ..
@@ -25,16 +25,16 @@ function after_vimplug {
 }
 
 declare -A actions
-actions[altercation/mutt-colors-solarized]=''
 actions[Anthony25/gnome-terminal-colors-solarized]=''
-actions[seebi/dircolors-solarized]=''
+actions[alols/xcape]='make'
+actions[altercation/mutt-colors-solarized]=''
 actions[gmarik/vundle]=''
-actions[junegunn/vim-plug]='after_vimplug'
+actions[icholy/ttygif]='make'
 actions[junegunn/fzf]='./install'
+actions[junegunn/vim-plug]='after_vimplug'
+actions[seebi/dircolors-solarized]=''
 actions[tmux-plugins/tpm]=''
 actions[uvaes/fuzzy-zsh-marks]=''
-actions[alols/xcape]='make'
-actions[icholy/ttygif]='make'
 
 function fetch_repo {
     cd $1
diff --git a/nvimrc b/nvimrc
index e087bbc..a94c9ad 100644
--- a/nvimrc
+++ b/nvimrc
@@ -39,6 +39,7 @@ Plug 'ton/vim-bufsurf'
 Plug 'tpope/vim-abolish', { 'for' : 'tex' }
 Plug 'tpope/vim-commentary'
 Plug 'tpope/vim-fugitive'
+Plug 'tpope/vim-git'
 Plug 'tpope/vim-obsession'
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-sensible'
@@ -185,7 +186,7 @@ set hidden
 silent! colo seoul256
 highlight Comment cterm=italic
 set t_ZH=
-set t_ZR=[23m
+set t_ZR=
 
 "" Maps
 
@@ -239,9 +240,6 @@ nnoremap <Return> o<Esc>
 nnoremap <s-Return> O<Esc>
 nnoremap >f :FZF ~ <cr>
 
-" Substitute shadowed by vim-sneak
-nnoremap _ s
-
 " Git
 nnoremap <Leader>gs :Gstatus<cr>
 nnoremap <Leader>gr :Gread<cr>
@@ -283,6 +281,17 @@ augroup nvimrc
                 \ endif
 augroup END
 
+"" Taken from Junegunn Chong
+nnoremap <silent> <Leader>C :call fzf#run({
+\   'source':
+\     map(split(globpath(&rtp, "colors/*.vim"), "\n"),
+\         "substitute(fnamemodify(v:val, ':t'), '\\..\\{-}$', '', '')"),
+\   'sink':     'colo',
+\   'options':  '+m',
+\   'left':     30,
+\   'launcher': 'iterm2-launcher 20 30 %s'
+\ })<CR>
+
 "" Experimental
 let g:notes_directories = ['~/dotfiles/notes']
 " Idea: instant download colorscheme