aboutsummaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorMax Christian Pohle2022-12-18 20:29:55 +0100
committerMax Christian Pohle2022-12-18 20:56:01 +0100
commit07797b39851da045aa1bfd0289de0858a1377c48 (patch)
tree4ca5d2b26d2ca9d01fc052fce5a26f88364a53d0 /plugin
parent1086af63639d2a108f39ae077e0e201dddf4f523 (diff)
downloadvim-07797b39851da045aa1bfd0289de0858a1377c48.tar.bz2
vim-07797b39851da045aa1bfd0289de0858a1377c48.zip
Switched to nvim and neovide
Diffstat (limited to 'plugin')
-rw-r--r--plugin/ale.vim8
-rw-r--r--plugin/cscope.vim57
-rw-r--r--plugin/fix-pumvisible-no-newline.vim1
-rw-r--r--plugin/jedi.vim15
-rw-r--r--plugin/karlmarks.vim7
-rw-r--r--plugin/max-change-icon.vim11
-rw-r--r--plugin/max-fix-colorschemes.vim31
-rw-r--r--plugin/max-function-menu.vim173
-rw-r--r--plugin/nerdtree.vim25
-rw-r--r--plugin/printing-hardcopy.vim10
-rw-r--r--plugin/signify.vim35
-rw-r--r--plugin/snippets.vim3
-rw-r--r--plugin/statusline.vim153
-rw-r--r--plugin/tagbar.vim10
-rw-r--r--plugin/terminal.vim19
-rw-r--r--plugin/youcompleteme.vim10
16 files changed, 17 insertions, 551 deletions
diff --git a/plugin/ale.vim b/plugin/ale.vim
deleted file mode 100644
index 4efc137..0000000
--- a/plugin/ale.vim
+++ /dev/null
@@ -1,8 +0,0 @@
1let g:ale_pattern_options = {'\.py$': {'ale_enabled': 1}}
2let g:ale_linters = {'python': ['pycodestyle'] }
3let g:ale_fixers =
4 \ {
5 \ 'python': ['black', 'isort', 'remove_trailing_lines', 'trim_whitespace'],
6 \ 'bash': ['remove_trailing_lines', 'trim_whitespace']
7 \ }
8
diff --git a/plugin/cscope.vim b/plugin/cscope.vim
deleted file mode 100644
index b9ca444..0000000
--- a/plugin/cscope.vim
+++ /dev/null
@@ -1,57 +0,0 @@
1"=======================================================================================================================
2" CSCOPE: http://vim.wikia.com/wiki/Cscope
3"=======================================================================================================================
4
5augroup MAX_CSCOPE
6 if has('cscope') " compiled with cscope support?
7 set cscopetag " CTRL-] uses cscope first, then ctags
8 set cscopeverbose
9
10 if has('quickfix')
11 set cscopequickfix=s+,c+,d+,i+,t+,e+
12 endif
13
14 if has('menu')
15 1001menu &Cscope.find.c\ symbol
16 \<tab>s
17 \ :cscope find s <cword><:cR>
18 1001menu &Cscope.find.definition
19 \<tab>g
20 \ :cscope find g <cword><:cR>
21 1001menu &Cscope.find.functions\ called\ by\ this
22 \<tab>d
23 \ :cscope find d <cword><:cR>
24 1001menu &Cscope.find.functions\ calling\ this
25 \<tab>c
26 \ :cscope find c <cword><:cR>
27 1001menu &Cscope.find.text\ string
28 \<tab>t
29 \ :cscope find t <cword><:cR>
30 1001menu &Cscope.find.egrep\ pattern
31 \<tab>e
32 \ :cscope find e <cword><:cR>
33 1001menu &Cscope.find.this\ file
34 \<tab>f
35 \ :cscope find f <cword><:cR>
36 1001menu &Cscope.find.files\ including\ this\ file
37 \<tab>i
38 \ :cscope find i <cword><:cR>
39 1001menu &Cscope.find.places\ where\ this\ symbol\ is\ assigned\ a\ value
40 \<tab>a
41 \ :cscope find a <cword><:cR>
42 1001menu &Cscope.-Sep1-
43 \ :
44 1001menu &Cscope.create\ and\ add\ database
45 \ :cscope kill -1<CR>:execute '!find -type f -regex ".*\.\(c\\|h\\|cpp\\|cxx\\|hh\\|hpp\\|hxx\)$" <bar> cscope -i- -b -q -v'<CR>:cscope add .<CR>
46 1001menu &Cscope.-Sep2-
47 \ :
48 1001menu &Cscope.add\ \.
49 \ :cscope add .<CR>
50 1001menu &Cscope.show
51 \ :cscope show<CR>
52 1001menu &Cscope.reset
53 \ :cscope reset<CR>
54 endif
55 endif
56augroup END " MAX_CSCOPE
57
diff --git a/plugin/fix-pumvisible-no-newline.vim b/plugin/fix-pumvisible-no-newline.vim
deleted file mode 100644
index ad27182..0000000
--- a/plugin/fix-pumvisible-no-newline.vim
+++ /dev/null
@@ -1 +0,0 @@
1imap <expr> <CR> pumvisible() ? "\<C-y>" : "\<CR>"
diff --git a/plugin/jedi.vim b/plugin/jedi.vim
deleted file mode 100644
index dca8838..0000000
--- a/plugin/jedi.vim
+++ /dev/null
@@ -1,15 +0,0 @@
1" JEDI: ==============================================================================================================
2augroup JEDI
3 if has("python") || has('python3')
4 let g:jedi#completions_enabled = 0 " we do not need completions, because we have YouCompleteMe
5 let g:jedi#show_call_signatures = 1 " which sadly does not support signatures like jedi
6 let g:jedi#show_call_signatures_delay = 0
7 let g:jedi#auto_vim_configure = 0
8 let g:pymode_rope = 0 " https://github.com/davidhalter/jedi-vim/issues/163
9 " autocmd FileType python jedi.preload_module('os', 'sys', 'math')
10 " let g:pymode_options_max_line_length = 120
11 " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301'
12
13 packadd jedi-vim
14 endif " has("python")
15augroup END
diff --git a/plugin/karlmarks.vim b/plugin/karlmarks.vim
deleted file mode 100644
index 9e22144..0000000
--- a/plugin/karlmarks.vim
+++ /dev/null
@@ -1,7 +0,0 @@
1let g:karlmarks = '"' " position in buffer when left
2let g:karlmarks .= '{}' " start/end paragraph
3let g:karlmarks .= '()' " start/end sentence
4let g:karlmarks .= '[]' " start/end sentence
5let g:karlmarks .= '.' " last change
6let g:karlmarks .= "^" " insert mode stopped
7let g:karlmarks .= "'`"
diff --git a/plugin/max-change-icon.vim b/plugin/max-change-icon.vim
deleted file mode 100644
index f544a5e..0000000
--- a/plugin/max-change-icon.vim
+++ /dev/null
@@ -1,11 +0,0 @@
1
2
3
4augroup ChangeIcon
5 "if filereadable("/usr/bin/xseticon")
6 "if filereadable("~/.vim/nvim.png")
7 " autocmd VimEnter * silent :execute "!xseticon -id $WINDOWID ~/.vim/nvim.png"
8 " autocmd VimLeave * silent :execute "!xseticon -id $WINDOWID /usr/share/icons/gnome/32x32/apps/xfce-terminal.png"
9 "endif
10 "endif
11augroup END
diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim
index edbb0ee..0a5e401 100644
--- a/plugin/max-fix-colorschemes.vim
+++ b/plugin/max-fix-colorschemes.vim
@@ -23,6 +23,7 @@ function! ExtendColorTheme()
23 highlight! link PmenuSbar Pmenu 23 highlight! link PmenuSbar Pmenu
24 highlight! link VertSplit LineNr 24 highlight! link VertSplit LineNr
25 highlight! link SignColumn LineNr 25 highlight! link SignColumn LineNr
26 highlight! link ALEErrorSign LineNr
26 highlight! link FoldColumn VertSplit 27 highlight! link FoldColumn VertSplit
27 " highlight! link Folded LineNr 28 " highlight! link Folded LineNr
28 highlight! link EndOfBuffer NonText 29 highlight! link EndOfBuffer NonText
@@ -39,23 +40,17 @@ else
39 set termguicolors 40 set termguicolors
40endif 41endif
41 42
42if filereadable(expand('~/.vimrc_background')) && filereadable(expand('~/.local/share/base16/base16-shell/colortest')) 43
43 let g:base16_shell_path = '~/.local/share/base16/base16-shell/scripts' 44let g:PaperColor_Theme_Options = {
44 let base16colorspace = 256 45 \ 'theme': {
45 source ~/.vimrc_background 46 \ 'default.dark': {
46else 47 \ 'transparent_background': 1
47 let g:PaperColor_Theme_Options = { 48 \ },
48 \ 'theme': { 49 \ 'default.light': {
49 \ 'default.dark': { 50 \ 'transparent_background': 1
50 \ 'transparent_background': 1 51 \ }
51 \ }, 52 \ }
52 \ 'default.light': { 53 \ }
53 \ 'transparent_background': 1
54 \ }
55 \ }
56 \ }
57 colorscheme PaperColor
58 set background=dark
59endif
60 54
61 55
56colorscheme PaperColor
diff --git a/plugin/max-function-menu.vim b/plugin/max-function-menu.vim
deleted file mode 100644
index b981997..0000000
--- a/plugin/max-function-menu.vim
+++ /dev/null
@@ -1,173 +0,0 @@
1augroup MAX_FUNCTION_MENU
2 if has('menu')
3 source $VIMRUNTIME/menu.vim
4 set wildmenu
5 set cpo-=<
6 set wcm=<C-Z>
7
8 01menu &Functions.toggle\ file\ browser
9 \<Tab><leader><leader>
10 \ <leader><leader>
11 01menu &Functions.-Sep0- :
12
13 01menu &Functions.help
14 \<Tab><F1>
15 \ <F1>
16 01menu &Functions.bp:\ previous\ buffer
17 \<Tab><F2>
18 \ <F2>
19 01menu &Functions.bn:\ next\ buffer
20 \<Tab><F3>
21 \ <F3>
22 01menu &Functions.^wc\:\ close\ window
23 \<Tab><F4>
24 \ <F4>
25 01menu &Functions.-Sep1- :
26
27 01menu &Functions.make
28 \<Tab><F5>
29 \ <F5>
30 01menu &Functions.clear\ matches,\ update\ viewport
31 \<Tab><F6>
32 \ <F6>
33 01menu &Functions.copen\:\ show\ quickfix\ list
34 \<Tab><F7>
35 \ <F7>
36 01menu &Functions.lopen\:\ show\ location\ list
37 \<Tab><F8>
38 \ <F8>
39 01menu &Functions.-Sep2- :
40
41 01menu &Functions.toggle\ tagbar
42 \<Tab><F9>
43 \ <F9>
44
45 if has("gui_running") == 0
46 " in the gui F10 already triggers the menu, not in a terminal vim, so upgrade that...
47 map <F10> :emenu <C-Z>
48 endif
49 01menu &Functions.activate\ menu\ (:emenu)
50 \<Tab><F10>
51 \ <F10>
52
53 01menu &Functions.undef11
54 \<Tab><F11>
55 \ <F11>
56 01menu &Functions.undef12
57 \<Tab><F12>
58 \ <F12>
59 01menu &Functions.-Sep2- :
60
61
62 09menu &Directory.print\ current\ directory
63 \<Tab>:pwd
64 \ :pwd<CR>
65
66 09menu &Directory.-Sep- :
67
68 09menu &Directory.Change\ to\ GIT\ root
69 \<Tab>:Gcd
70 \ :Gcd<CR>:pwd<CR>
71
72 09menu &Directory.Change\ to\ current\ buffers\ directory\ (global)
73 \<tab>:cd\ %:p:h
74 \ :cd %:h<CR>:pwd<CR>
75
76 09menu &Directory.Change\ to\ current\ buffers\ directory\ (local\ window)<tab>:lcd\ %:p:h
77 \ :lcd %:p:h<CR>:pwd<CR>
78
79 menu &Git.&Display\ uncommited\ files\ in\ location\ list
80 \ :call setloclist(0, map(systemlist("git diff --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR>
81 menu &Git.&Display\ recently\ changed\ files\ in\ quickfix\ list
82 \ :call setqflist([], 'r', {'title': 'Recently changed in GIT', 'items':map(systemlist("git show --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}) })<CR>:copen<CR>
83 menu &Git.&Display\ last\ changes
84 \ :let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f', 'svn': '', 'cvs': ''}<CR>:SignifyRefresh<CR>
85 menu &Git.&Display\ unmerged\ files\ in\ location\ list
86 \ :call setloclist(0, map(systemlist("git diff --name-only --diff-filter=U \| uniq"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR>
87 menu &Git.&Display\ significance\ of\ changes
88 \ :!git diff --stat HEAD~1..HEAD
89 menu &Git.&Display\ Changed\ files\ compared\ to\ master
90 \ :!git diff --name-status ..master
91
92 menu &Match.Clear\ All\ Matches
93 \<Tab><F6>
94 \ :call clearmatches()<CR>
95
96 menu &Match.-Sep- :
97
98 menu &Match.&dispensable\ white\ spaces
99 \ :call matchadd("Convention", '\s\+$', 0)<CR>
100
101 menu &Match.&long\ lines\ (exeeding\ textwidth)
102 \ :call matchadd("Convention", '\%>'.&textwidth.'v.', 0)<CR>
103
104 menu &Match.Highlight\ current\ file\ name
105 \ :call matchadd("Search", escape(expand('%:t'), '.'))<CR>
106
107 " :execute ':match SpellBad /'.escape(expand('%:t'), '.').'/'<CR>
108
109 menu &Window.-Sep- :
110
111
112 menu &Window.Scratch
113 \ :Scratch<CR>
114
115
116 menu &Find.file\ under\ the\ cursor
117 \<Tab>gf
118 \ gf
119
120 menu &Find.Open\ search\ results\ in\ location\ list
121 \<Tab>:gf
122 \ :execute ':vimgrep /'.escape(getreg('/'), '.').'/g %'<CR>
123 \ :copen<CR>
124
125 menu &Changes.list
126 \<Tab>:changes
127 \ :changes<CR>
128 menu &Changes.-Sep- :
129 menu &Changes.previous
130 \<Tab>g;
131 \ g;
132 menu &Changes.next
133 \<Tab>g,
134 \ g,
135 menu &List.location.signs\ to\ list
136 \<Tab>CMD
137 \ :execute ":call setloclist(0, map(get(getbufinfo('%')[0], 'signs'), {_, p->extend(p, {'bufnr':buffer_number('.'), 'text':get(p, 'name')})}))"<CR>
138 menu &List.location.list\ to\ signs
139 \<Tab>CMD
140 \ :call execute(extend(['sign define LocationListEntry text=L', 'sign unplace *'], map(getloclist('%'), {key, val->'sign place '.(key+100).' name=LocationListEntry line='.val['lnum'].' buffer='.buffer_number('%')})))<CR>
141 menu &Jump.list
142 \<Tab>:jumps
143 \ :jumps<CR>
144 menu &Jump.-Sep1- :
145 menu &Jump.previous\ position
146 \<Tab>CTRL-O
147 \ <C-O>
148 menu &Jump.next\ position
149 \<Tab>CTRL-I
150 \ <C-I>
151 menu &Jump.-Sep2- :
152 menu &Jump.clear\ list
153 \<Tab>:clearjumps
154 \ :clearjumps
155
156 1000menu &Tag.list
157 \<Tab>:tags
158 \ :tags<CR>
159 1000menu &Tag.selection\ list
160 \<Tab>:ts
161 \ :ts<CR>
162
163 1000menu &Tag.-Sep1- :
164
165 1000menu &Tag.stack.jump\ older
166 \<Tab><C-T>
167 \ :po
168 1000menu &Tag.stack.jump\
169 \<Tab>:ta
170 \ :ta
171 endif
172augroup END " MAX_FUNCTION_MENU
173
diff --git a/plugin/nerdtree.vim b/plugin/nerdtree.vim
deleted file mode 100644
index b9665fb..0000000
--- a/plugin/nerdtree.vim
+++ /dev/null
@@ -1,25 +0,0 @@
1augroup NERDTREE
2 " NERDTree: replaces NetRW, as long as it has so many bugs
3 let NERDTreeIgnore = ['\.aux$', '\.o$']
4 let NERDTreeCascadeSingleChildDir = 0 | " I don't get how one can use <m> to create files in that included directory
5 let NERDTreeChDirMode = 0
6 let NERDTreeHiddenFirst = 1
7 let NERDTreeMinimalUI = 1
8 let NERDTreeShowBookmarks = 1 | " show bookmarks by default (when opening for the first time)
9 let NERDTreeWinSize = 40
10 let NERDTreeQuitOnOpen = 1
11
12 " depending on if NERDTree has the focus:
13 nnoremap <expr>
14 \ <leader><leader>
15 \ bufwinnr("%")==g:NERDTree.GetWinNum() ? ':NERDTreeClose<CR>' : ':NERDTreeFind<CR>'
16 nnoremap <expr>
17 \ <F2>
18 \ bufwinnr("%")==g:NERDTree.GetWinNum() ? '<C-W><C-W>' : ':N<CR>'
19
20 nnoremap <expr>
21 \ <F3>
22 \ bufwinnr("%")==g:NERDTree.GetWinNum() ? '<C-W><C-W>' : ':n<CR>'
23
24 packadd nerdtree
25augroup END
diff --git a/plugin/printing-hardcopy.vim b/plugin/printing-hardcopy.vim
deleted file mode 100644
index ad51b02..0000000
--- a/plugin/printing-hardcopy.vim
+++ /dev/null
@@ -1,10 +0,0 @@
1let default_expr=&printexpr
2
3" if filereadable("/usr/bin/a2ps")
4" let &printexpr = "system('a2ps -1gEmail --borders=no --strip=3')"
5" endif
6"
7set printoptions=portrait:y,number:n,syntax:n,left:25mm,right:20mm,top:27mm,bottom:25mm
8
9let &printfont = "monospace 11"
10let &printexpr = "system('lpr -p' . (&printdevice == '' ? '' : ' -P' . &printdevice) . ' ' . v:fname_in) . delete(v:fname_in) + v:shell_error"
diff --git a/plugin/signify.vim b/plugin/signify.vim
deleted file mode 100644
index 9edc3c5..0000000
--- a/plugin/signify.vim
+++ /dev/null
@@ -1,35 +0,0 @@
1augroup SIGNIFY
2 " displays file changes in sign column
3
4 let @l = ":let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f'}|:SignifyRefresh"
5
6 " use signify only with git (improves speed when loading buffers, see :h signify)
7 let g:signify_vcs_list = [ 'git' ]
8
9 let g:signify_cursorhold_insert = 0
10 let g:signify_cursorhold_normal = 0
11 let g:signify_update_on_bufenter = 0
12 let g:signify_update_on_focusgained = 0
13 let g:signify_sign_show_count = 0
14
15 if has("multi_byte") && (&enc == 'utf-8' || &enc == 'utf-16' || &enc == 'ucs-4')
16 let g:signify_sign_add = '⊕.'
17 let g:signify_sign_delete = '⊖.'
18 let g:signify_sign_delete_first_line = '⊖.'
19 let g:signify_sign_change = '⊗.'
20 let g:signify_sign_changedelete = '⊗.'
21 endif
22
23 function! SignifyColorScheme()
24 highlight! SignifySignAdd ctermbg=NONE
25 highlight! link SignifySignAdd SignColumn
26 highlight! link SignifySignChange SignColumn
27 highlight! link SignifySignDelete SignColumn
28 highlight! link SignifySignChangeDelete SignColumn
29 highlight! link SignifySignDeleteFirstLine SignColumn
30 endfunction
31
32 " packadd vim-signify
33
34 autocmd VimEnter,ColorScheme * call SignifyColorScheme()
35augroup END
diff --git a/plugin/snippets.vim b/plugin/snippets.vim
deleted file mode 100644
index fe5d29d..0000000
--- a/plugin/snippets.vim
+++ /dev/null
@@ -1,3 +0,0 @@
1" vv if we ever want snippets, that seems to be the best choice right now
2" packadd neosnippet-snippets
3" packadd neosnippet
diff --git a/plugin/statusline.vim b/plugin/statusline.vim
deleted file mode 100644
index 561a47e..0000000
--- a/plugin/statusline.vim
+++ /dev/null
@@ -1,153 +0,0 @@
1scriptencoding utf-8
2
3augroup MAX_FANCYLINE
4 set noshowmode | " mode would otherwise be shown twice- in lightline and below. We want to deactivate one.
5 set laststatus=2 | " required by AirLine and Lightline, without status line does not appear until a window split
6
7 let g:status_sym_start = ''
8 let g:status_sym_end = ''
9 let g:status_sym_sep_start = '│'
10 let g:status_sym_sep_end = '│'
11 let g:symbol_branch = ''
12 let g:symbol_screen_edge = '░'
13
14 if &term ==? 'linux'
15 let g:group_active = 'StatusLineTerm'
16 let g:group_inactive = 'StatusLineTermNC'
17 let g:group_tabline = 'TabLine'
18 else
19 let g:group_active = 'StatusLine'
20 let g:group_inactive = 'StatusLineNC'
21 let g:group_tabline = 'TabLine'
22 endif
23
24 " this function reverts foreground color and background color of a given
25 " highlight group and returns the name of a newly created _invert group
26 function! CreateInvertGroup(highlight_group)
27 if(synIDattr(synIDtrans(hlID(a:highlight_group)), 'reverse', 'gui')==1)
28 let w:color=synIDattr(hlID(a:highlight_group), 'fg#')
29 else
30 let w:color=synIDattr(hlID(a:highlight_group), 'bg#')
31 endif
32
33 let l:retval=a:highlight_group.'_invert'
34 if(exists('w:color') && w:color ==# '')
35 let w:color = 'NONE'
36 endif
37 silent! exec 'highlight '.l:retval.' guifg='.w:color.' ctermfg='.w:color
38 return l:retval
39 endfunction
40
41 function! UpdateStatus(highlight_group)
42 let l:invert_group = CreateInvertGroup(a:highlight_group)
43 let l:mode = get({
44 \ 'n' : 'normal',
45 \ 'i' : 'insert',
46 \ 'R' : 'replace',
47 \ 'v' : 'visual',
48 \ 'V' : 'visual line',
49 \ "\<C-V>" : 'visual block',
50 \ 'c' : 'command',
51 \ 's' : 'select',
52 \ 'S' : 'select line',
53 \ "\<C-s>" : 'select block',
54 \ 't' : 'terminal'
55 \ }, mode(), mode())
56 return ''
57 \ .'%#StatusLineHighlight#'
58 \ .'%#'.a:highlight_group.'#'
59 \ .g:symbol_screen_edge
60 \ .'%{&buftype != "" ? " ".&buftype : ""}'
61 \ .' '.l:mode.g:status_sym_sep_start
62 \ .'%{argc() > 1 ? " ".(argidx() + 1).":".argc()." ".g:status_sym_sep_start : ""}'
63 \ .'%{haslocaldir() ? fnamemodify(getcwd(), ":.:~")." " :""}'
64 \ .'%{&readonly ? " 🔒" : ""}'
65 \ .'%{&modified ? " 💾 " : ""}'
66 \ .'%{" [".winbufnr(0)."] "}'
67 \ .'%{bufname("%") == "" ? "" : fnamemodify(expand("%"), ":~:.")}'
68 \ .'%{&titlestring ? has("nvim") ? b:term_title:expand(&titlestring) : "" }'
69 \ .'%{exists("w:quickfix_title") ? w:quickfix_title : ""}'
70 \ .' '
71 \ .'%#'.l:invert_group.'#'
72 \ .g:status_sym_end
73 \ .'%<'
74 \ .''
75 \ .'%='
76 \ .''
77 \ .'%#'.l:invert_group.'#'
78 \ .g:status_sym_start
79 \ .'%#'.a:highlight_group.'#'.' '
80 \ .'%{&buftype == "" ? "" : &buftype." ".g:status_sym_sep_end." "}'
81 \ .'%{&filetype == "" ? "" :&filetype." ".g:status_sym_sep_end." "}'
82 \ .'%{&spell ? &spelllang." ".g:status_sym_sep_end : ""}'
83 \ .'%{&fileencoding =~ "^$\\|^utf\-8$" ? "" : &fileencoding." ".g:status_sym_sep_end." "}'
84 \ .'%{&fileformat =~ "^$\\|^unix$" ? "" : &fileformat." ".g:status_sym_sep_end}'
85 \ .' '
86 \ .'%cx%-l: '
87 \ .g:status_sym_sep_end
88 \ .' '
89 \ .'%p%% '
90 \ .g:symbol_screen_edge
91 endfunction
92
93 function! UpdateTabline(highlight_group)
94 let l:invert_group = CreateInvertGroup(a:highlight_group)
95 let l:git_branch = FugitiveHead()
96 return ''
97 \ .'%#'.a:highlight_group.'#'
98 \ .g:symbol_screen_edge
99 \ .' '
100 \ .'%#'.a:highlight_group.'#'
101 \ .'%-2( %)'
102 \ .'%{fnamemodify(getcwd(-1), ":~")}'
103 \ .' '
104 \ .'%{FugitiveHead() == "" ? "" : g:status_sym_sep_start." ".g:symbol_branch." ".FugitiveHead()}'
105 \ .' '
106 \ .'%#'.l:invert_group.'#'
107 \ .g:status_sym_end
108 \ .'%<'
109 \ .'%='
110 \ .'%#'.l:invert_group.'#'
111 \ .g:status_sym_start
112 \ .'%(%#'.a:highlight_group.'#%)'
113 \ .' '
114 \ .'%-2(%)'
115 \ .'%(%#'.a:highlight_group.'#%)'
116 \ .'%(%{v:servername} %{v:this_session}%)'
117 \ .g:status_sym_sep_end.' '
118 \ .'%-3(%)'
119 \ .'%#'.a:highlight_group.'#'
120 \ .'%{tabpagenr()}/%{tabpagenr()}'
121 \ .' '
122 \ .g:symbol_screen_edge
123 \ .'%##'
124 endfunction
125
126
127 if $USER ==? 'root'
128 let highlight_group_root = "ErrorMsg"
129 let invert_group = CreateInvertGroup(highlight_group_root)
130 let g:group_tabline = highlight_group_root
131 endif
132
133 function! ApplyColorScheme()
134 " set termguicolors | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) incompatible with nvim
135 " set t_ut=
136 " set up statusline, global and current window individually
137 set statusline=%!UpdateStatus(g:group_inactive)
138 setlocal statusline=%!UpdateStatus(g:group_active)
139 " set up the tabline (match colors)
140 set tabline=%!UpdateTabline(g:group_tabline)
141
142 " otherwise 'bold' can mess up icon sizes and I do not know why
143 highlight! StatusLine cterm=reverse
144 " exec 'highlight! User3 guifg=#D2A032 guibg='.l:fgcolor
145 endfunction
146 call ApplyColorScheme()
147
148 " apply colors from the loaded colorscheme...
149 " when changing the colorscheme also apply new colors to the statusbar...
150 autocmd ColorScheme * call ApplyColorScheme()
151 autocmd WinEnter * setlocal statusline=%!UpdateStatus(g:group_active)
152 autocmd WinLeave * setlocal statusline<
153augroup END " MAX_FANCYLINE
diff --git a/plugin/tagbar.vim b/plugin/tagbar.vim
deleted file mode 100644
index 2758f20..0000000
--- a/plugin/tagbar.vim
+++ /dev/null
@@ -1,10 +0,0 @@
1augroup TAGBAR
2 let g:tagbar_autoclose = 0
3 let g:tagbar_autofocus = 1
4 let g:tagbar_autoshowtag = 0
5 let g:tagbar_compact = 1
6 let g:tagbar_indent = 0
7 let g:tagbar_foldlevel = 99
8
9 packadd tagbar
10augroup END
diff --git a/plugin/terminal.vim b/plugin/terminal.vim
deleted file mode 100644
index c8f02fd..0000000
--- a/plugin/terminal.vim
+++ /dev/null
@@ -1,19 +0,0 @@
1augroup TERMINAL
2 " Vim 8 has a terminal command...
3 if has('terminal')
4 " use default ESC key to leave insert mode in the internal terminal emulator
5 tnoremap <Esc> <C-W>N
6 " make terminal windows hidden by default (copied from :help terminal)
7 autocmd BufWinEnter * if &buftype == 'terminal' | setlocal bufhidden=hide | endif
8 endif
9
10 " NEOVIM_incompatible:
11 if has('nvim') " Neovim?
12 autocmd TermOpen term://* set nobuflisted
13 " use default ESC key to leave insert mode in the internal terminal emulator
14 tnoremap <Esc> <C-\><C-n>
15
16 menu &UI.&Open\ in\ Serversession
17 \ :execute ':!nvr --servername /tmp/nvimsocket --remote % +'.line('.')<CR>:stopinsert<CR>:set readonly<CR>
18 endif
19augroup END
diff --git a/plugin/youcompleteme.vim b/plugin/youcompleteme.vim
index d2283fd..9e17ad5 100644
--- a/plugin/youcompleteme.vim
+++ b/plugin/youcompleteme.vim
@@ -11,12 +11,10 @@ augroup YOUCOMPLETEME
11 let g:ycm_key_list_previous_completion = ['Up'] 11 let g:ycm_key_list_previous_completion = ['Up']
12 let g:ycm_key_list_select_completion = ['Down'] 12 let g:ycm_key_list_select_completion = ['Down']
13 13
14 let g:ycm_semantic_triggers = 14 "" let g:ycm_semantic_triggers =
15 \ { 15 "" \ {
16 \ 'c': [ 're!\w{2}' ] 16 "" \ 'c': [ 're!\w{2}' ]
17 \ } " per language configurations 17 "" \ } " per language configurations
18
19
20 " packadd YouCompleteMe 18 " packadd YouCompleteMe
21augroup END 19augroup END
22 20
..