X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=init.vim;h=e16c816ab01c0e34e04225ee80ac74f6200eb2e3;hb=07c883a5418028bbb48b38d6a2cf86d011de4b1b;hp=845bc422d3321a9bdc81f5c63d0b7fcc013bf118;hpb=4dd74699e5c889cf5469cb9577c0fed74cf51458;p=vimconf.git

diff --git a/init.vim b/init.vim
index 845bc42..e16c816 100644
--- a/init.vim
+++ b/init.vim
@@ -204,7 +204,7 @@ let g:detectspelllang_langs = {}
 let g:detectspelllang_langs.aspell =[ 'en_US', 'de_AT']
 au FileType mail let g:VimMailSpellLangs=['de', 'en']
 
-:let g:org_todo_keywords = [['TODO(t)', 'WAITING(w)', '|', 'DONE(d)'],
+let g:org_todo_keywords = [['TODO(t)', 'WAITING(w)', '|', 'DONE(d)'],
       \ ['|', 'OBSOLETE(o)', 'WONT(n)'],
       \ ['CANCELED(c)']]
 
@@ -228,95 +228,125 @@ let g:VimMailContactsCommands={
 let g:vimtex_fold_enabled = 1
 let g:vimtex_fold_levelmarker = '➜'
 
-" The denite settings are largely stolen from spacevim
-let s:denite_options = {
-      \ 'default' : {
-      \ 'winheight' : 15,
-      \ 'mode' : 'insert',
-      \ 'start_filter' : 1,
-      \ 'quit' : 1,
-      \ 'highlight_matched_char' : 'MoreMsg',
-      \ 'highlight_matched_range' : 'MoreMsg',
-      \ 'direction': 'rightbelow',
-      \ }}
-
-augroup spacevim_layer_denite
-  autocmd!
-  autocmd FileType denite call s:denite_my_settings()
-augroup END
-
-function! s:denite_my_settings() abort
-  nnoremap <silent><buffer><expr> i
-        \ denite#do_map('open_filter_buffer')
-  nnoremap <silent><buffer><expr> '
-        \ denite#do_map('toggle_select').'j'
-  nnoremap <silent><buffer><expr> q
-        \ denite#do_map('quit')
-  nnoremap <silent><buffer><expr> <C-t>
-        \ denite#do_map('do_action', 'tabopen')
-  nnoremap <silent><buffer><expr> <C-v>
-        \ denite#do_map('do_action', 'vsplit')
-  nnoremap <silent><buffer><expr> <C-s>
-        \ denite#do_map('do_action', 'split')
-  nnoremap <silent><buffer><expr> <CR>
-        \ denite#do_map('do_action')
-  nnoremap <silent><buffer><expr> p
-        \ denite#do_map('do_action', 'preview')
-  nnoremap <silent><buffer><Tab> j
-  nnoremap <silent><buffer><S-Tab> k
-endfunction
+" termdebug split windows
+let g:termdebug_wide = 1
+let termdebugger = $HOME . '/.vim/gdb.sh'
 
-" FIND and GREP COMMANDS
-if executable('rg')
-  " Ripgrep command on grep source
-  call denite#custom#var('grep', 'command', ['rg'])
-  call denite#custom#var('grep', 'default_opts',
-        \ ['--vimgrep', '--no-heading'])
-  call denite#custom#var('grep', 'recursive_opts', [])
-  call denite#custom#var('grep', 'pattern_opt', ['--regexp'])
-  call denite#custom#var('grep', 'separator', ['--'])
-  call denite#custom#var('grep', 'final_opts', [])
+let g:startify_files_number = 5
+let g:startify_session_persistence = 1
+let g:startify_lists = [
+            \ { 'type': 'dir',       'header': ['   Recent files'] },
+            \ { 'type': 'sessions',  'header': ['   Saved sessions'] },
+            \ ]
+
+if has('nvim')
+    let verstr = matchstr(execute('version'), 'NVIM v\zs[^\n]*')
+    let g:startify_custom_header = [
+                \ '',
+                \ '        ╻ ╻   ╻   ┏┳┓',
+                \ '   NEO  ┃┏┛   ┃   ┃┃┃',
+                \ '        ┗┛    ╹   ╹ ╹  ' . verstr,
+                \ '',
+                \ ]
+else
+    let verstr = matchstr(execute('version'), 'IMproved \zs[^\n ]*')
+    let g:startify_custom_header = [
+                \ '',
+                \ '   ╻ ╻   ╻   ┏┳┓',
+                \ '   ┃┏┛   ┃   ┃┃┃',
+                \ '   ┗┛    ╹   ╹ ╹  ' . verstr,
+                \ '',
+                \ ]
 endif
 
-let s:insert_mode_mappings = [
-      \ ['jk', '<denite:enter_mode:normal>', 'noremap'],
-      \ ['<Tab>', '<denite:move_to_next_line>', 'noremap'],
-      \ ['<C-j>', '<denite:move_to_next_line>', 'noremap'],
-      \ ['<S-tab>', '<denite:move_to_previous_line>', 'noremap'],
-      \ ['<C-k>', '<denite:move_to_previous_line>', 'noremap'],
-      \ ['<C-t>', '<denite:do_action:tabopen>', 'noremap'],
-      \ ['<C-v>', '<denite:do_action:vsplit>', 'noremap'],
-      \ ['<C-s>', '<denite:do_action:split>', 'noremap'],
-      \ ['<Esc>', '<denite:enter_mode:normal>', 'noremap'],
-      \ ['<C-N>', '<denite:assign_next_matched_text>', 'noremap'],
-      \ ['<C-P>', '<denite:assign_previous_matched_text>', 'noremap'],
-      \ ['<Up>', '<denite:assign_previous_text>', 'noremap'],
-      \ ['<Down>', '<denite:assign_next_text>', 'noremap'],
-      \ ['<C-Y>', '<denite:redraw>', 'noremap'],
-      \ ]
-
-let s:normal_mode_mappings = [
-      \ ["'", '<denite:toggle_select_down>', 'noremap'],
-      \ ['<C-n>', '<denite:jump_to_next_source>', 'noremap'],
-      \ ['<C-p>', '<denite:jump_to_previous_source>', 'noremap'],
-      \ ['<Tab>', '<denite:move_to_next_line>', 'noremap'],
-      \ ['<C-j>', '<denite:move_to_next_line>', 'noremap'],
-      \ ['<S-tab>', '<denite:move_to_previous_line>', 'noremap'],
-      \ ['<C-k>', '<denite:move_to_previous_line>', 'noremap'],
-      \ ['gg', '<denite:move_to_first_line>', 'noremap'],
-      \ ['<C-t>', '<denite:do_action:tabopen>', 'noremap'],
-      \ ['<C-v>', '<denite:do_action:vsplit>', 'noremap'],
-      \ ['<C-s>', '<denite:do_action:split>', 'noremap'],
-      \ ['q', '<denite:quit>', 'noremap'],
-      \ ['r', '<denite:redraw>', 'noremap'],
-      \ ]
 
-" termdebug split windows
-let g:termdebug_wide = 1
-let termdebugger = $HOME . '/.vim/gdb.sh'
+if $USER != "root" && g:lowendbox == 0
+
+    " The denite settings are largely stolen from spacevim
+    let s:denite_options = {
+          \ 'default' : {
+          \ 'winheight' : 15,
+          \ 'mode' : 'insert',
+          \ 'start_filter' : 1,
+          \ 'quit' : 1,
+          \ 'highlight_matched_char' : 'MoreMsg',
+          \ 'highlight_matched_range' : 'MoreMsg',
+          \ 'direction': 'rightbelow',
+          \ }}
+
+    augroup spacevim_layer_denite
+      autocmd!
+      autocmd FileType denite call s:denite_my_settings()
+    augroup END
+
+    function! s:denite_my_settings() abort
+      nnoremap <silent><buffer><expr> i
+            \ denite#do_map('open_filter_buffer')
+      nnoremap <silent><buffer><expr> '
+            \ denite#do_map('toggle_select').'j'
+      nnoremap <silent><buffer><expr> q
+            \ denite#do_map('quit')
+      nnoremap <silent><buffer><expr> <C-t>
+            \ denite#do_map('do_action', 'tabopen')
+      nnoremap <silent><buffer><expr> <C-v>
+            \ denite#do_map('do_action', 'vsplit')
+      nnoremap <silent><buffer><expr> <C-s>
+            \ denite#do_map('do_action', 'split')
+      nnoremap <silent><buffer><expr> <CR>
+            \ denite#do_map('do_action')
+      nnoremap <silent><buffer><expr> p
+            \ denite#do_map('do_action', 'preview')
+      nnoremap <silent><buffer><Tab> j
+      nnoremap <silent><buffer><S-Tab> k
+    endfunction
+
+    " FIND and GREP COMMANDS
+    if executable('rg')
+      " Ripgrep command on grep source
+      call denite#custom#var('grep', 'command', ['rg'])
+      call denite#custom#var('grep', 'default_opts',
+            \ ['--vimgrep', '--no-heading'])
+      call denite#custom#var('grep', 'recursive_opts', [])
+      call denite#custom#var('grep', 'pattern_opt', ['--regexp'])
+      call denite#custom#var('grep', 'separator', ['--'])
+      call denite#custom#var('grep', 'final_opts', [])
+    endif
 
-if g:lowendbox == 0
-    if has('nvim-0.5') && $USER != "root"
+    let s:insert_mode_mappings = [
+          \ ['jk', '<denite:enter_mode:normal>', 'noremap'],
+          \ ['<Tab>', '<denite:move_to_next_line>', 'noremap'],
+          \ ['<C-j>', '<denite:move_to_next_line>', 'noremap'],
+          \ ['<S-tab>', '<denite:move_to_previous_line>', 'noremap'],
+          \ ['<C-k>', '<denite:move_to_previous_line>', 'noremap'],
+          \ ['<C-t>', '<denite:do_action:tabopen>', 'noremap'],
+          \ ['<C-v>', '<denite:do_action:vsplit>', 'noremap'],
+          \ ['<C-s>', '<denite:do_action:split>', 'noremap'],
+          \ ['<Esc>', '<denite:enter_mode:normal>', 'noremap'],
+          \ ['<C-N>', '<denite:assign_next_matched_text>', 'noremap'],
+          \ ['<C-P>', '<denite:assign_previous_matched_text>', 'noremap'],
+          \ ['<Up>', '<denite:assign_previous_text>', 'noremap'],
+          \ ['<Down>', '<denite:assign_next_text>', 'noremap'],
+          \ ['<C-Y>', '<denite:redraw>', 'noremap'],
+          \ ]
+
+    let s:normal_mode_mappings = [
+          \ ["'", '<denite:toggle_select_down>', 'noremap'],
+          \ ['<C-n>', '<denite:jump_to_next_source>', 'noremap'],
+          \ ['<C-p>', '<denite:jump_to_previous_source>', 'noremap'],
+          \ ['<Tab>', '<denite:move_to_next_line>', 'noremap'],
+          \ ['<C-j>', '<denite:move_to_next_line>', 'noremap'],
+          \ ['<S-tab>', '<denite:move_to_previous_line>', 'noremap'],
+          \ ['<C-k>', '<denite:move_to_previous_line>', 'noremap'],
+          \ ['gg', '<denite:move_to_first_line>', 'noremap'],
+          \ ['<C-t>', '<denite:do_action:tabopen>', 'noremap'],
+          \ ['<C-v>', '<denite:do_action:vsplit>', 'noremap'],
+          \ ['<C-s>', '<denite:do_action:split>', 'noremap'],
+          \ ['q', '<denite:quit>', 'noremap'],
+          \ ['r', '<denite:redraw>', 'noremap'],
+          \ ]
+
+    if has('nvim-0.5')
+        set foldexpr=nvim_treesitter#foldexpr()
 lua <<EOF
         require'nvim-treesitter.configs'.setup {
             -- one of "all", "maintained" (parsers with maintainers), or a list of languages
@@ -328,17 +358,48 @@ lua <<EOF
               enable = true,
               disabled = {}
             },
-            incremental_selection = {
+            indent = {
               enable = true
             },
+            incremental_selection = {
+              enable = true,
+              keymaps = {
+                init_selection = "gnn",
+                node_incremental = "grn",
+                scope_incremental = "grc",
+                node_decremental = "grm",
+              },
+            },
             textobjects = {
               enable = true
-            }
+            },
+            refactor = {
+                highlight_definitions = {
+                    enable = true
+                },
+                smart_rename = {
+                    enable = true,
+                    keymaps = {
+                        smart_rename = "grr",
+                        },
+                    },
+                navigation = {
+                    enable = true,
+                    keymaps = {
+                        goto_definition = "gnd",
+                        list_definitions = "gnD",
+                        list_definitions_toc = "gO",
+                        goto_next_usage = "<a-*>",
+                        goto_previous_usage = "<a-#>",
+                    },
+                },
+            },
         }
 EOF
     endif
 endif
 
+
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 runtime keymaps.vim