X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/f22b24fddcfef913f1a186e686114ad0bf6d27cd..HEAD:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 9d85de2..402a980 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,24 +1,211 @@
+" force python3
+if has('python3') | endif
+
+" space is leader
+let g:mapleader = " "
+
+" disable netrw
+"FIXME: it currently breaks vim-fugitive 2023-04-11
+" instead of opening Git status, a netrw buffer opens instead
+let g:loaded_netrwPlugin = 1
+
 " runtimepath {{{1
 set runtimepath ^=$XDG_CONFIG_HOME/vim
 set runtimepath +=$XDG_CONFIG_HOME/vim/after
 
-" force python3
-if has('python3') | endif
-
 " plugins {{{1
-" remove all autocommands
-autocmd!
-
 call plug#begin('$XDG_DATA_HOME/vim')
 " This does not update vim-plug, use PlugUpgrade instead
 Plug 'junegunn/vim-plug'
 
-Plug 'airblade/vim-gitgutter' " {{{
-" prefer other signs such as ycm diags
-let g:gitgutter_sign_priority = 1
-" don't clobber other signs
-let g:gitgutter_sign_allow_clobber = 0
-"}}}
+if !has("nvim")
+  Plug 'bling/vim-airline' " {{{2
+    let g:airline#extensions#whitespace#enabled = 1
+    let g:airline#extensions#tabline#enabled = 1
+    let g:airline#extensions#searchcount#enabled = 0
+    let g:airline_powerline_fonts = 1
+
+    let g:asyncrun_status = "stopped"
+    " let g:airline_section_error = airline#section#create_right(['%{g:asyncrun_status}'])
+  "}}}
+  Plug 'raimondi/delimitmate' " {{{2
+    let delimitMate_expand_cr = 2
+    let g:delimitMate_expand_space = 1
+  "}}}
+  Plug 'tpope/vim-surround' "{{{2
+  "}}}
+  " Plug 'valloric/youcompleteme' {{{2
+  Plug 'valloric/youcompleteme',
+        \{ 'do': './install.py --clangd-completer --clang-completer' }
+    let g:ycm_clangd_binary_path = 'clangd'   " use clangd in path
+    let g:ycm_clangd_args = ['--clang-tidy']
+    let g:ycm_extra_conf_vim_data = ['getcwd()']
+    let g:ycm_add_preview_to_completeopt = 1
+    let g:ycm_complete_in_comments = 1
+    let g:ycm_complete_in_strings  = 1
+    let g:ycm_autoclose_preview_window_after_insertion = 0
+
+    let g:ycm_language_server =
+          \ [
+          \   {
+          \     'name': 'haskell',
+          \     'cmdline': [ 'haskell-language-server-wrapper', '--lsp' ],
+          \     'filetypes': [ 'haskell', 'lhaskell'  ]
+          \   },
+          \ ]
+  " }}}
+  Plug 'svermeulen/vim-yoink' " {{{2
+  ""}}}
+  Plug 'arcticicestudio/nord-vim' " {{{2
+    let g:nord_bold = 1
+    let g:nord_italic = 1
+    let g:nord_italic_comments = 1
+    let g:nord_underline = 1
+    let g:nord_uniform_status_lines = 0
+    let g:nord_uniform_diff_background = 0
+    let g:nord_cursor_line_number_background = 0
+    let g:nord_bold_vertical_split_line = 0
+  "}}}
+  Plug 'sirver/ultisnips' " replaced by lua-snip {{{2
+  Plug 'honza/vim-snippets'
+    let g:UltiSnipsEditSplit = 'vertical'
+    let g:UltiSnipsSnippetDirectories = [ expand("$XDG_CONFIG_HOME/vim/ultisnips") ]
+    if has('fname_case')
+      let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
+    endif
+    let g:UltiSnipsExpandTrigger       = "<tab>"
+    let g:UltiSnipsJumpForwardTrigger  = "<tab>"
+    let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
+    
+    " UltiSnips completion function that tries to expand a snippet. If there's no
+    " snippet for expanding, it checks for completion window and if it's shown,
+    " selects first element. If there's no completion window it tries to jump to
+    " next placeholder. If there's no placeholder it just returns TAB key
+    " https://github.com/Valloric/YouCompleteMe/issues/36#issuecomment-15451411
+    function! g:UltiSnips_Complete()
+        call UltiSnips#ExpandSnippet()
+        if g:ulti_expand_res == 0
+            if pumvisible()
+                return "\<C-n>"
+            else
+                call UltiSnips#JumpForwards()
+                if g:ulti_jump_forwards_res == 0
+                  return "\<TAB>"
+                endif
+            endif
+        endif
+        return ""
+    endfunction
+    au InsertEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
+    let g:UltiSnipsListSnippets="<c-e>"
+  "}}}
+  Plug 'vim-utils/vim-man'  " replaced by builtin {{{2
+    let g:man_width = 80
+  "}}}
+  Plug 'airblade/vim-gitgutter' " replaced by gitsigns {{{
+  " prefer other signs such as ycm diags
+  let g:gitgutter_sign_priority = 1
+  " don't clobber other signs
+  let g:gitgutter_sign_allow_clobber = 0
+  "}}}
+  Plug 'justinmk/vim-sneak' " replaced by leap {{{2
+  let g:sneak#streak = 1
+  let g:sneak#target_labels = "aoeuisnthdpylrcgfqjkxzmwvz" " dvorak
+  let g:sneak#use_ic_scs = 1  " follow 'ignorecase' and 'smartcase'
+
+  " sneaky f and t
+  nmap f <Plug>Sneak_f
+  nmap F <Plug>Sneak_F
+  xmap f <Plug>Sneak_f
+  xmap F <Plug>Sneak_F
+  omap f <Plug>Sneak_f
+  omap F <Plug>Sneak_F
+  nmap t <Plug>Sneak_t
+  nmap T <Plug>Sneak_T
+  xmap t <Plug>Sneak_t
+  xmap T <Plug>Sneak_T
+  omap t <Plug>Sneak_t
+  omap T <Plug>Sneak_T
+  "}}}
+  Plug 'shougo/unite.vim' " replaced by telescope {{{2
+    function! UniteSetup()
+      call unite#filters#matcher_default#use(['matcher_fuzzy'])
+      call unite#custom#profile('default', 'context', {
+            \ 'winheight': 20,
+            \ 'direction': 'botright'
+            \ })
+
+      nnoremap [unite] <Nop>
+      nmap <leader>u [unite]
+      nnoremap [unite]u :UniteResume<CR>
+      nnoremap <silent> [u :UnitePrevious<CR>
+      nnoremap <silent> ]u :UniteNext<CR>
+
+      " unite-grep {{{3
+      " seems not respected
+      let g:unite_source_grep_max_candidates = 2000
+      if executable('ag')
+        " Use ag in unite grep source.
+        let g:unite_source_grep_command = 'ag'
+        let g:unite_source_grep_default_opts = '--smart-case --vimgrep --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
+        let g:unite_source_grep_recursive_opt = ''
+      end
+      nnoremap <silent> [unite]a :<C-u>Unite grep:.::<CR>
+      nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:<CR>
+      command! -nargs=+ Ag Unite grep:.::<args>
+
+      " unite-file_rec {{{3
+      if executable('ag')
+        " Use ag in unite rec source
+        let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '-g', '']
+      end
+      nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
+
+      " unite-buffer {{{3
+      call unite#custom#default_action('buffer', 'open')
+      nnoremap <silent> [unite]b :<C-u>Unite buffer:-<CR>
+
+      " unite-jumplist {{{3
+      nnoremap <silent> [unite]j :<C-u>Unite output:jumps:<CR>
+
+      " unite-menu {{{3
+      let g:unite_source_menu_menus = {}
+      let g:unite_source_menu_menus.fugitive = { 'description' : 'fugitive menu'}
+      let g:unite_source_menu_menus.fugitive.command_candidates = {
+            \ 'Gstatus <Leader>gs' : 'Gstatus',
+            \ 'Gcommit -v <Leader>gc' : 'Gcommit -v',
+            \ 'Glog' : 'Glog',
+            \}
+
+      nnoremap <silent> <leader>gg :<C-u>Unite menu:fugitive<CR>
+
+      let g:unite_source_history_yank_enable = 1
+      nnoremap <silent> [unite]p :<C-u>Unite history/yank<CR>
+    endfunction
+    augroup unit_setup
+      autocmd VimEnter * ++once call UniteSetup()
+    augroup END
+  "}}}2
+  Plug 'shougo/vimproc.vim', {'do': 'make'} " {{{2
+  "}}}2
+  Plug 'tomtom/tcomment_vim' " replaced by comment.nvim {{{2
+    let g:tcomment_textobject_inlinecomment = 'gic'
+    let g:tcomment#filetype#guess = 0
+    "let g:tcomment#options = {'whitespace' : 'no'}
+  "}}}2
+  " colorschemes
+  Plug 'morhetz/gruvbox' " {{{2
+    let g:gruvbox_contrast_dark  = 'hard'
+    let g:gruvbox_contrast_light = 'soft'
+  " }}}2
+  " staging
+  Plug 'puremourning/vimspector' " replaced by lsp {{{2
+    let g:vimspector_enable_mappings = 'HUMAN'
+  " }}}
+  Plug 'vim-scripts/syntaxrange' " replaced by treesitter {{{2
+  " }}}
+endif
+
 Plug 'alepez/vim-gtest'
 Plug 'alx741/vinfo'
 Plug 'andrewradev/sideways.vim' " {{{2
@@ -26,79 +213,42 @@ nnoremap <silent> ,h :SidewaysLeft<CR>:delmarks z<CR>
 nnoremap <silent> ,l :SidewaysRight<CR>:delmarks z<CR>
 "}}}
 Plug 'andrewradev/switch.vim'
-if !has('nvim')
-  Plug 'bling/vim-airline' "{{{2
-  let g:airline#extensions#whitespace#enabled = 1
-  let g:airline#extensions#tabline#enabled = 1
-  let g:airline#extensions#searchcount#enabled = 0
-  let g:airline_powerline_fonts = 1
-
-  let g:asyncrun_status = "stopped"
-  " let g:airline_section_error = airline#section#create_right(['%{g:asyncrun_status}'])
-  "}}}
-endif
-
 Plug 'chrisbra/checkattach'
 Plug 'derekwyatt/vim-fswitch'
 Plug 'elzr/vim-json'
 Plug 'firef0x/pkgbuild.vim'
 Plug 'junegunn/vim-easy-align'
-Plug 'justinmk/vim-sneak'
-Plug 'klen/python-mode'
 Plug 'kshenoy/vim-signature'
-Plug 'majutsushi/tagbar'
+" Plug 'majutsushi/tagbar' " TODO: delete? {{{2
+"   map <F5> :TagbarToggle<cr>
+"   let g:tagbar_sort = 0
+"   let g:tagbar_compact = 1
+"   let g:tagbar_autoshowtag = 1
+"   let g:tagbar_width = 25
+"   let g:tagbar_iconchars = ['+', '-']
+"}}}
 Plug 'octol/vim-cpp-enhanced-highlight'
-Plug 'raimondi/delimitmate'
 Plug 'sgeb/vim-diff-fold'
 Plug 'skywind3000/asyncrun.vim' " {{{2
 command! -bang -nargs=* -complete=file Make AsyncRun -save=2 -program=make @ <args>
 let g:asyncrun_open = 10
 "}}}
-Plug 'shougo/unite.vim'
-Plug 'shougo/vimproc.vim', {'do': 'make'}
 Plug 'sjl/gundo.vim'
-Plug 'thinca/vim-qfreplace'
-Plug 'tomtom/tcomment_vim'
+" Plug 'thinca/vim-qfreplace' " TODO: delete?
 Plug 'tpope/vim-abolish'
 Plug 'tpope/vim-characterize'
-Plug 'tpope/vim-endwise'
+" Plug 'tpope/vim-endwise' " TODO: delete?
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-scriptease'
 Plug 'tpope/vim-speeddating'
-Plug 'tpope/vim-surround'  "investigate vim-sandwich
 Plug 'tpope/vim-unimpaired'
 Plug 'tweekmonster/spellrotate.vim'
-Plug 'valloric/youcompleteme', { 'do': './install.py --clangd-completer --clang-completer' }
-Plug 'vim-scripts/mediawiki.vim'
-Plug 'vim-scripts/replacewithregister'
-Plug 'vim-scripts/yankring.vim'
+" Plug 'vim-scripts/mediawiki.vim' " TODO: delete?
+Plug 'vim-scripts/replacewithregister' " FIXME: is overridden by lsp
 Plug 'wincent/loupe'
 
-" colorschemes
-Plug 'morhetz/gruvbox' " {{{2
-let g:gruvbox_contrast_dark  = 'hard'
-let g:gruvbox_contrast_light = 'soft'
-
-if !has('nvim')
-  Plug 'arcticicestudio/nord-vim' " {{{2
-  let g:nord_bold = 1
-  let g:nord_italic = 1
-  let g:nord_italic_comments = 1
-  let g:nord_underline = 1
-  let g:nord_uniform_status_lines = 0
-  let g:nord_uniform_diff_background = 0
-  let g:nord_cursor_line_number_background = 0
-  let g:nord_bold_vertical_split_line = 0
-endif
-
-"}}}
-
-" snippets
-Plug 'sirver/ultisnips'
-Plug 'honza/vim-snippets'
-
 " text objects
 Plug 'kana/vim-textobj-user'
 Plug 'julian/vim-textobj-variable-segment'
@@ -107,11 +257,22 @@ Plug 'kana/vim-operator-user'
 
 " staging
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
+Plug 'imsnif/kdl.vim'
 
-Plug 'git@github.com:/ram-z/vim-orgmode', { 'branch': 'dev' } " {{{2
-Plug 'vim-scripts/syntaxrange'
+Plug 'ilyachur/cmake4vim'
+Plug 'ilyachur/gtest-vim'
 
-let g:org_agenda_files = ['~/org/*.org']
+Plug 'junegunn/vim-peekaboo' "{{{2
+  " issue with having it at the bottom is that it doesn't leave much 
+  let g:peekaboo_window = 'bo 16new'
+  let g:peekaboo_compact = 1
+  let g:peekaboo_delay = 500
+"}}}
+
+" Plug 'vim-scripts/ansiesc.vim' " TODO: delete? {{{2
+"   nmap corwp <Plug>RestoreWinPosn
+"   nmap coswp <Plug>SaveWinPosn
+" "}}}
 
 Plug 'neovimhaskell/haskell-vim'  " {{{2
 let g:haskell_enable_quantification = 1   " to enable highlighting of `forall`
@@ -132,17 +293,28 @@ Plug 'mtth/scratch.vim'  " {{{2
   let g:scratch_autohide = 0
 "}}}
 
-let g:man_hardwrap = 80
-if !has('nvim')
-  Plug 'vim-utils/vim-man'  " {{{2
-  let g:man_width = 80
+Plug 'vim-pandoc/vim-pandoc'  " {{{2
+Plug 'vim-pandoc/vim-pandoc-syntax'
+let g:pandoc#syntax#conceal#use = 1
+let g:pandoc#syntax#conceal#blacklist = [
+    \ 'titleblock',
+    \ 'codeblock_start',
+    \ 'codeblock_delim',
+    \ 'atx',
+    \ ]
+let g:pandoc#syntax#codeblocks#embeds#langs = [
+    \ 'plantuml',
+    \ ]
+let g:pandoc#keyboard#blacklist_submodule_mappings = [
+    \ 'para',
+    \ ]
 "}}}
-endif
 
-Plug 'jenterkin/vim-autosource'  " {{{2
-  let g:autosource_hashdir = $XDG_CACHE_HOME . '/vim/vim-autosource'
-  let g:autosource_conf_names = ['.vimrc', '.vimrc.lua']
-"}}}
+" Plug 'jenterkin/vim-autosource'  " TODO: delete? {{{2
+"   let g:autosource_hashdir = $XDG_CACHE_HOME . '/vim/vim-autosource'
+"   let g:autosource_conf_names = ['.vimrc', '.vimrc.lua']
+" "}}}
+
 call plug#end()
 
 filetype plugin indent on
@@ -178,8 +350,6 @@ set linebreak                   " wrap long lines at a character in 'breakat'
 set showbreak=↪                 " show these chars for wrapped lines
 set breakindent                 " preserve indentation in wrapped text
 
-set lazyredraw                  " don't redraw while executing macros
-
 set list                        " show chars defined in 'listchars'
 set listchars=tab:❭\            " list of strings used for list mode
 set listchars+=extends:❯,precedes:❮
@@ -196,6 +366,7 @@ augroup END
 set scrolloff=5                 " number of screen lines to show around the cursor
 set sidescroll=1                " number of collumns to scroll
 set sidescrolloff=1             " don't scroll over the listchars
+set display+=lastline           " display as much as possible of last line
 
 set fillchars=diff:⣿,vert:│
 
@@ -232,7 +403,6 @@ endif
 set showcmd         " Show (partial) command in status line.
 set ruler           " show the cursor position all the time
 set confirm         " Ask what to do when closing unsaved documents
-set shortmess=      " reset option
 set shortmess+=a    " all abbreviations
 set shortmess+=o    " overwrite file-written message
 set shortmess+=O    " file-read message overrides previous
@@ -241,6 +411,8 @@ set shortmess+=T    " truncate other messages in the middle
 set shortmess+=W    " don't give 'written' or '[w]' when writing a file
 set shortmess+=A    " ignore swapfile warning
 set shortmess+=I    " no splash screen
+set shortmess+=F    " don't give the file info when editing a file
+set shortmess+=c    " don't give |ins-completion-menu| messages
 
 " editing text {{{2
 set backspace=indent,eol,start  " allow backspacing over everything in insert mode
@@ -257,7 +429,8 @@ set formatoptions+=l    " do not wrap lines that have been longer when starting
 set formatoptions+=t    " Auto-wrap text using textwidth
 set formatoptions-=o    " Do not insert comment leader after hitting o or O in normal mode
 
-set nrformats=hex               " number formats recognized for CTRL-A and CTRL-X commands
+set nrformats-=octal    " don't inc/dec octal numbers with ^[AX]
+set nrformats+=unsigned " treat all numbers as unsigned
 
 set complete=.       " scan the current buffer ( 'wrapscan' is ignored)
 set complete+=w      " scan buffers from other windows
@@ -278,7 +451,9 @@ set shiftround                  " round to 'shiftwidth' for "<<" and ">>"
 set expandtab                   " expand <Tab> to spaces in Insert mode
 set autoindent
 
-set pastetoggle=<F11>           " key sequence to toggle paste mode
+if !has('nvim')
+  set pastetoggle=<F11>           " key sequence to toggle paste mode
+endif
 
 " folding {{{2
 set foldmethod=marker           " folding type
@@ -309,7 +484,10 @@ set backupskip+=.netrc          " skip netrc
 set backupskip+=/dev/shm/pass*  " skip passwordstore files
 
 set undofile                    " persistent undo history
-set undodir=$XDG_CACHE_HOME/vim/undo//
+set undolevels=10000            " moar undos
+if !has('nvim')
+  set undodir=$XDG_CACHE_HOME/vim/undo//
+endif
 
 augroup undoskip
     au!
@@ -344,6 +522,7 @@ set wildignore+=*.orig                           " Merge resolution files
 " running make and jumping to errors {{{2
 set makeprg=make\ -w     " print changing directories
 
+set grepformat=%f:%l:%c:%m
 set grepprg=ag\ --vimgrep\ $*
 
 " language specific {{{2
@@ -352,7 +531,15 @@ set isfname-==    " don't treat `=` as being part of filenames
 " various {{{2
 set virtualedit+=block     " let cursor move past last char in <C-V> mode
 set virtualedit+=onemore   " allow the cursor to move just past the end of the line
-set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but save file in .cache
+if !has('nvim')
+  " viminfo defaults but save file in .cache
+  set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo
+else
+  " shada is the replacement format for viminfo
+  " this setting is probably not needed as it's most likely the default
+  " the default path is in XDG_DATA_HOME, which is fine
+  set shada='100,<50,s10,h
+endif
 
 set viewdir=$XDG_CACHE_HOME/vim/view//
 
@@ -360,9 +547,9 @@ set sessionoptions+=unix,slash  " damn windows and it's silly ways
 
 " autocmds {{{1
 " Resize splits when the window is resized {{{2
-augroup resize
+augroup resize_splits
     au!
-    autocmd VimResized * :wincmd =
+    autocmd VimResized * :tabdo wincmd =
 augroup END
 
 " Only show cursorline in the current window and in normal mode {{{2
@@ -378,45 +565,40 @@ augroup ft_stdin
     au StdinReadPost * :set buftype=nofile
 augroup END
 
-" Jump to last known cursor position {{{2
-augroup cursor_pos
+if !has("nvim")
+  " autocmds that already exist in neovim
+  " Jump to last known cursor position {{{2
+  augroup last_loc
+      au!
+      " blacklist certain filetype
+      let blacklist = ['gitcommit']
+      autocmd BufReadPost *
+                  \ if index(blacklist, &ft) < 0 && line("'\"") > 1 && line("'\"") <= line("$") |
+                  \   exe "normal! g`\"" |
+                  \ endif
+  augroup END
+
+  " Check for file modifications automatically {{{2
+  " (current buffer only)
+  " Use :NoAutoChecktime to disable it (uses b:autochecktime)
+  fun! MyAutoCheckTime()
+    " only check timestamp for normal files
+    if &buftype != '' | return | endif
+    if ! exists('b:autochecktime') || b:autochecktime
+      checktime %
+      let b:autochecktime = 1
+    endif
+  endfun
+  augroup MyAutoChecktime
     au!
-    " blacklist certain filetype
-    let blacklist = ['gitcommit']
-    autocmd BufReadPost *
-                \ if index(blacklist, &ft) < 0 && line("'\"") > 1 && line("'\"") <= line("$") |
-                \   exe "normal! g`\"" |
-                \ endif
-augroup END
-
-" Check for file modifications automatically {{{2
-" (current buffer only)
-" Use :NoAutoChecktime to disable it (uses b:autochecktime)
-fun! MyAutoCheckTime()
-  " only check timestamp for normal files
-  if &buftype != '' | return | endif
-  if ! exists('b:autochecktime') || b:autochecktime
-    checktime %
-    let b:autochecktime = 1
-  endif
-endfun
-augroup MyAutoChecktime
-  au!
-  au FocusGained,BufEnter,CursorHold,InsertEnter * call MyAutoCheckTime()
-augroup END
-command! NoAutoChecktime let b:autochecktime=0
-command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime
-
-augroup terminal
-  au!
-  au TerminalOpen * if &buftype == 'terminal' | setlocal bufhidden=hide | endif
-augroup END
+    au FocusGained,BufEnter,CursorHold,InsertEnter * call MyAutoCheckTime()
+  augroup END
+  command! NoAutoChecktime let b:autochecktime=0
+  command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime
+endif
 
 " bindings {{{1
 
-" allow both <space> and \ to be <leader>
-map <space> <leader>
-
 " make
 function! MakeWithOpt()
   " TODO only do this if makeprg matches make
@@ -469,6 +651,9 @@ nnoremap <silent> <leader>ww :Untrail<CR>
 " Source
 vnoremap <leader>S y:execute @@<cr>:echo 'Sourced selection.'<cr>
 nnoremap <leader>S ^vg_y:execute @@<cr>:echo 'Sourced line.'<cr>
+" Technically this is similar to execute this file, which is usually mapped to
+" <leader>r and it would make sense to have that for lua files in nvim folder
+nnoremap <leader>SS :source %<cr>:echo 'Sourced file.'<cr>
 
 " jump to last cursor position
 noremap ' `
@@ -487,11 +672,6 @@ nnoremap U
 " nnoremap <leader>r :silent !ranger %:h<cr>:redraw!<cr>
 " nnoremap <leader>R :silent !ranger<cr>:redraw!<cr>
 
-" Use sane regexes.
-nnoremap / /\v
-vnoremap / /\v
-cnoremap s/ s/\v
-
 " display the number of matches for the last search
 nmap <Leader># :%s:<C-R>/::gn<CR>
 
@@ -594,7 +774,7 @@ vnoremap <leader><Space> zf
 cabbrev w!! SudoWrite
 
 " uppercase previous word
-inoremap <C-C> <Esc>gUiwgi
+inoremap <C-C> <C-G>u<Esc>gUiwgi
 
 " http://git.io/v3ZeU
 nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
@@ -604,9 +784,14 @@ nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"na
 let g:checkattach_filebrowser = 'ranger'
 let g:checkattach_once = 'y'
 
-" delimitmate {{{2
-let delimitMate_expand_cr = 2
-let g:delimitMate_expand_space = 1
+" close-another-window {{{2
+nnoremap <silent> <C-W>c  <NOP>
+nnoremap <silent> <C-W>cc <C-W>c
+nnoremap <silent> <C-W>ch :CloseLeftWindow<CR>
+nnoremap <silent> <C-W>cl :CloseRightWindow<CR>
+nnoremap <silent> <C-W>cj :CloseBelowWindow<CR>
+nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
+
 
 " fswitch {{{2
 nnoremap <silent> <Leader>ff :FSHere<CR>
@@ -629,8 +814,11 @@ function! GitToggle()
   if buflisted(l:status_buffer)
     execute 'bdelete '.l:status_buffer
   else
-    Git
-    16wincmd_
+    execute 'Git'
+    if !empty(FugitiveGitDir())
+      " only resize status if Git was sucessful
+      16wincmd_
+    endif
   endif
 endfunction
 command! GitToggle :call GitToggle()
@@ -638,11 +826,9 @@ command! GToggle GitToggle
 nnoremap <silent> <leader>gs :GitToggle<CR>
 
 nnoremap <silent> <leader>gd :Gdiffsplit<CR>
-nnoremap <silent> <leader>gc :echohl WarningMsg \| echo "use \<leader>gcc instead" \| echohl None<CR> 
 nnoremap <silent> <leader>gcc :tab G commit -v<CR>
 nnoremap <silent> <leader>gca :tab G commit -v --amend<CR>
 nnoremap          <leader>gcf :tab G commit -v --fixup=
-nnoremap <silent> <leader>gp :echohl WarningMsg \| echo "use \<leader>gpp instead" \| echohl None<CR> 
 nnoremap <silent> <leader>gpp :Git push \| copen<CR>
 nnoremap <silent> <leader>gpf :Git push --force-with-lease \| copen<CR>
 nnoremap <silent> <leader>gll :Git pull<CR>
@@ -668,23 +854,8 @@ nmap <silent> cog <Plug>IndentGuidesToggle
 nmap <silent> [og <Plug>IndentGuidesEnable
 nmap <silent> ]og <Plug>IndentGuidesDisable
 
-" close-another-window {{{2
-nnoremap <silent> <C-W>c  <NOP>
-nnoremap <silent> <C-W>cc <C-W>c
-nnoremap <silent> <C-W>ch :CloseLeftWindow<CR>
-nnoremap <silent> <C-W>cl :CloseRightWindow<CR>
-nnoremap <silent> <C-W>cj :CloseBelowWindow<CR>
-nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
-
-" python-mode {{{2
-
-let g:pymode_rope_completion = 0
-let g:pymode_rope = 0
-let g:pymode_run = 0
-let g:pymode_folding = 1
-let g:pymode_lint_ignore = "E221,E266,E501"
-let g:pymode_lint_cwindow = 0           " don't open cwindow when linting
-let g:pymode_syntax_space_errors = 0    " don't bother me when I'm typing
+" netrw {{{2
+let g:netrw_sort_sequence = '[\/]$,\.\%(h\|hpp\)$,\.c$,\.cpp$,\~\=\*$,*,\.o$,\.obj$,\.info$,\.swp$,\.bak$,\~$'
 
 " signature {{{2
 " disable '[ mappings
@@ -723,134 +894,6 @@ if ! &diff
   let g:syntastic_check_on_open=1
 endif
 
-" tagbar {{{2
-map <F5> :TagbarToggle<cr>
-let g:tagbar_sort = 0
-let g:tagbar_compact = 1
-let g:tagbar_autoshowtag = 1
-let g:tagbar_width = 25
-let g:tagbar_iconchars = ['+', '-']
-
-" tcomments {{{2
-let g:tcomment_textobject_inlinecomment = 'gic'
-let g:tcomment#filetype#guess = 0
-"let g:tcomment#options = {'whitespace' : 'no'}
-
-" ultisnips {{{2
-let g:UltiSnipsEditSplit = 'vertical'
-let g:UltiSnipsSnippetDirectories = [ expand("$XDG_CONFIG_HOME/vim/ultisnips") ]
-if has('fname_case')
-  let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
-endif
-let g:UltiSnipsExpandTrigger       = "<tab>"
-let g:UltiSnipsJumpForwardTrigger  = "<tab>"
-let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
-
-" UltiSnips completion function that tries to expand a snippet. If there's no
-" snippet for expanding, it checks for completion window and if it's shown,
-" selects first element. If there's no completion window it tries to jump to
-" next placeholder. If there's no placeholder it just returns TAB key
-" https://github.com/Valloric/YouCompleteMe/issues/36#issuecomment-15451411
-function! g:UltiSnips_Complete()
-    call UltiSnips#ExpandSnippet()
-    if g:ulti_expand_res == 0
-        if pumvisible()
-            return "\<C-n>"
-        else
-            call UltiSnips#JumpForwards()
-            if g:ulti_jump_forwards_res == 0
-               return "\<TAB>"
-            endif
-        endif
-    endif
-    return ""
-endfunction
-au InsertEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
-let g:UltiSnipsListSnippets="<c-e>"
-
-" unite {{{2
-call unite#filters#matcher_default#use(['matcher_fuzzy'])
-call unite#custom#profile('default', 'context', {
-            \ 'winheight': 20,
-            \ 'direction': 'botright'
-            \ })
-
-nnoremap [unite] <Nop>
-nmap <leader>u [unite]
-nnoremap [unite]u :UniteResume<CR>
-nnoremap <silent> [u :UnitePrevious<CR>
-nnoremap <silent> ]u :UniteNext<CR>
-
-" unite-grep {{{3
-" seems not respected
-let g:unite_source_grep_max_candidates = 2000
-if executable('ag')
-    " Use ag in unite grep source.
-    let g:unite_source_grep_command = 'ag'
-    let g:unite_source_grep_default_opts = '--smart-case --vimgrep --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
-    let g:unite_source_grep_recursive_opt = ''
-end
-nnoremap <silent> [unite]a :<C-u>Unite grep:.::<CR>
-nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:<CR>
-command! -nargs=+ Ag Unite grep:.::<args>
-
-" unite-file_rec {{{3
-if executable('ag')
-    " Use ag in unite rec source
-    let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '-g', '']
-end
-nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
-call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta')
-
-" unite-buffer {{{3
-call unite#custom#default_action('buffer', 'open')
-nnoremap <silent> [unite]b :<C-u>Unite buffer:-<CR>
-
-" unite-jumplist {{{3
-nnoremap <silent> [unite]j :<C-u>Unite output:jumps:<CR>
-
-" unite-menu {{{3
-let g:unite_source_menu_menus = {}
-let g:unite_source_menu_menus.fugitive = { 'description' : 'fugitive menu'}
-let g:unite_source_menu_menus.fugitive.command_candidates = {
-            \ 'Gstatus <Leader>gs' : 'Gstatus',
-            \ 'Gcommit -v <Leader>gc' : 'Gcommit -v',
-            \ 'Glog' : 'Glog',
-            \}
-
-nnoremap <silent> <leader>gg :<C-u>Unite menu:fugitive<CR>
-
-let g:unite_source_history_yank_enable = 1
-nnoremap <silent> [unite]p :<C-u>Unite history/yank<CR>
-
-" yankring {{{2
-nnoremap <silent> <leader>p :YRShow<cr>
-let g:yankring_history_dir = expand('$XDG_CACHE_HOME/vim')
-let g:yankring_replace_n_pkey = ''
-let g:yankring_replace_n_nkey = ''
-
-" map Y to y$ for the yank ring
-function! YRRunAfterMaps()
-    nnoremap Y   :<C-U>YRYankCount 'y$'<CR>
-endfunction
-
-" youcompleteme {{{2
-let g:ycm_clangd_binary_path = 'clangd'   " use clangd in path
-let g:ycm_clangd_args = ['--clang-tidy']
-let g:ycm_extra_conf_vim_data = ['getcwd()']
-let g:ycm_add_preview_to_completeopt = 1
-let g:ycm_complete_in_comments = 1
-let g:ycm_complete_in_strings  = 1
-let g:ycm_autoclose_preview_window_after_insertion = 0
-
-let g:ycm_language_server =
-    \ [
-    \   {
-    \     'name': 'haskell',
-    \     'cmdline': [ 'haskell-language-server-wrapper', '--lsp' ],
-    \     'filetypes': [ 'haskell', 'lhaskell'  ]
-    \   },
-    \ ]
 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
@@ -870,25 +913,6 @@ nnoremap <silent> <Leader>tu :GTestRunUnderCursor<CR>
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 
-" vim-sneak {{{2
-let g:sneak#streak = 1
-let g:sneak#target_labels = "aoeuisnthdpylrcgfqjkxzmwvz" " dvorak
-let g:sneak#use_ic_scs = 1  " follow 'ignorecase' and 'smartcase'
-
-" sneaky f and t
-nmap f <Plug>Sneak_f
-nmap F <Plug>Sneak_F
-xmap f <Plug>Sneak_f
-xmap F <Plug>Sneak_F
-omap f <Plug>Sneak_f
-omap F <Plug>Sneak_F
-nmap t <Plug>Sneak_t
-nmap T <Plug>Sneak_T
-xmap t <Plug>Sneak_t
-xmap T <Plug>Sneak_T
-omap t <Plug>Sneak_t
-omap T <Plug>Sneak_T
-
 " functions {{{1
 
 " Convenient command to see the difference between the current buffer and the
@@ -907,21 +931,21 @@ nnoremap <silent> gs :<C-U>set operatorfunc=SortLinesOpFunc<CR>g@
 vnoremap <silent> gs :sort<cr>
 
 " edit configs  {{{2
+" TODO: populate location list with both .vim and .lua files
+" TODO: create file if it doesn't exist in nvim or vim rtps
 function! EditConfig(what, ext = '.vim')
-    let l:dir = split(&runtimepath,',')[0]
-    if a:what == 'vimrc'
-        let l:file = expand($MYVIMRC)
-    elseif ! isdirectory(globpath(l:dir, a:what))
-        echoe a:what." is not valid!"
+    if a:what == 'vimrc' || a:what == 'init.lua'
+        let l:file = a:what
     elseif empty(&filetype)
         echoe 'filetype is empty!'
+        return
     else
-        let l:file = l:dir.'/'.a:what.'/'.&filetype.a:ext
+        let l:file = a:what.'/'.&filetype.a:ext
     endif
 
-    execute ':vsplit '.file
-    execute ':lcd %:p:h'
+    execute ':Vvsplit! '.file
 endf
+nmap <leader>en :call EditConfig('init.lua')<CR>
 nmap <leader>ev :call EditConfig('vimrc')<CR>
 nmap <leader>ef :call EditConfig('ftplugin')<CR>
 nmap <leader>es :call EditConfig('syntax')<CR>
@@ -955,8 +979,6 @@ function! SwitchSpell()
 endfunction
 
 nnoremap <silent> coS :call SwitchSpell()<CR>
-" fix spelling with first choice
-nnoremap <Leader>f 1z=
 
 " gitdir or home {{{2
 " from derek wyatt: