Merge branch 'master' of https://gitlab.com/keanegit/dotfiles

vim/_vimrc

@@ -11,7 +11,6 @@
 
     Plug 'junegunn/vim-easy-align'
     Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin --all' }
-    Plug 'junegunn/fzf.vim'
     Plug 'tpope/vim-surround'
     Plug 'tpope/vim-commentary'
     Plug 'w0rp/ale'
@@ -31,32 +30,28 @@
     Plug 'sainnhe/vim-color-forest-night'
     Plug 'justinmk/vim-sneak'
     Plug 'axvr/zepl.vim'
-    Plug 'kovisoft/slimv'
+    " Plug 'kovisoft/slimv'
     Plug 'tpope/vim-vinegar'
-    " Plug 'preservim/nerdtree'
+    Plug 'preservim/nerdtree'
     Plug 'vimwiki/vimwiki'
     Plug 'simnalamburt/vim-mundo'
     Plug 'tpope/vim-dadbod'
     Plug 'junegunn/gv.vim'
     Plug 'rbong/vim-flog'
     Plug 'tpope/vim-unimpaired'
-    Plug 'junegunn/goyo.vim'
+    " Clojure
+    Plug 'guns/vim-clojure-static' " syntax
+    Plug 'tpope/vim-fireplace'
+    Plug 'guns/vim-sexp'
+    Plug 'tpope/vim-sexp-mappings-for-regular-people'
+    Plug 'dylanaraps/wal.vim'
+    Plug 'alvan/vim-closetag'
+    Plug 'mattn/emmet-vim'
+    " Plug 'tpope/vim-salve'
+    Plug 'chrisbra/colorizer'
+    " cljfold
 
     " Todo:
-    " GV
-    " Gundo (or undotree?)
-    " Emmett
-    " Fugitive
-    " Vimwiki
-    " Plug 'ryanss/vim-hackernews'
-    " Plug 'mbbill/undotree' or Plug 'sjl/gundo.vim'
-    " Plug 'tpope/vim-projectionist'
-    " Plug 'mileszs/ack.vim'
-    " Plug 'vim-pandoc/vim-pandoc'
-    " Plug 'alfredodeza/pytest.vim'
-    " Plug 'docker/docker'
-    " Plug vim-scripts/indentpython.vim
-    "
     call plug#end()
 
 "}}}
@@ -168,7 +163,7 @@
 
     " Clear search highlighting with leader-space
     nnoremap <leader><space> :noh<cr>
-    
+   
     " Underline with line of the same length
     nnoremap <leader>- yypv$r-
 
@@ -176,6 +171,7 @@
     nnoremap <leader>d k :r !date <cr>
 
     nnoremap <leader>k :vert new ~/.vim/bindings.md <cr>
+    tnoremap <leader><esc> <C-\><C-n>
 
 "}}}
 
@@ -205,11 +201,31 @@
 "}}}
 
 " slimv{{{
-    let g:slimv_repl_split=2
-    let g:slimv_repl_split_size=10
-"
+    " let g:slimv_repl_split=2
+    " let g:slimv_repl_split_size=10
+
 "}}}
 
+" {{{ web dev
+    autocmd FileType html set softtabstop=2     
+    autocmd FileType html set ts=2     
+    autocmd FileType html set shiftwidth=2     
+    autocmd FileType css set softtabstop=2     
+    autocmd FileType css set ts=2     
+    autocmd FileType html set shiftwidth=2     
+
+    " Emmet tab size
+    let g:user_emmet_settings = {
+    \    'indentation' : ' '
+    \}
+" }}}
+
+" clojure {{{
+    " TODO: make only work in clojure files
+    nnoremap <leader>e :Eval<CR>      " eval form
+    nnoremap <leader>E :%Eval<CR>     " eval file
+" }}}
+
 " split pane navigation {{{
     " Map vertical split to \ w, switch to it, open explorer, prompt for filename
     " TODO: make new window prompt use fzf
@@ -308,15 +324,15 @@
 "}}}
 
 " git commands {{{
-" TODO: map fugitive commands 
-" TODO: check out gv etc
-" TODO: bind hunk committing
     " Gitgutter hunk view
     nmap ghv <Plug>(GitGutterPreviewHunk)
     nmap ghn <Plug>(GitGutterNextHunk)
     nmap ghp <Plug>(GitGutterPrevHunk)
     nmap ghf <Plug>(GitGutterFold)
-    
+    nmap ghs <Plug>(GitGutterStageHunk)
+    " Controls fugitive diff split direction
+    set diffopt=vertical
+    command! Gundo !git reset --soft HEAD~1
 "}}}
 
 " fold search {{{
@@ -407,6 +423,8 @@ command! -register CopyMatches call CopyMatches(<q-reg>)
     augroup END
 "}}}
 
+" TODO: rebind c-n
+" TODO: change ,k to ,n and add notes to version control
 
 " folding options, this must be last in file
 " vim:foldmethod=marker:foldlevel=0