aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules115
-rw-r--r--CursorHold-example.vim37
-rw-r--r--GetLatest/GetLatestVimScripts.dat10
-rw-r--r--UPDATING3
-rw-r--r--after/ftdetect/log.vim1
-rw-r--r--after/ftplugin/javascript.vim1
-rw-r--r--after/indent/html5.vim (renamed from indent/html5.vim)0
-rw-r--r--after/indent/php.vim (renamed from indent/php.vim)0
-rw-r--r--after/syntax/log.vim24
-rw-r--r--after/syntax/markdown.vim19
-rw-r--r--colors/coderonline.vim181
l---------colors/mac_classic.vim1
-rw-r--r--doc/INSTALL46
-rw-r--r--doc/UPDATE4
-rw-r--r--doc/gitignore50
-rw-r--r--experimental/list-commands.vim6
-rw-r--r--experimental/vimrc-minimal16
-rw-r--r--experimental/vimrc-minimal-statusline30
-rw-r--r--experimental/vimrc-old303
-rw-r--r--ftplugin/c.vim18
-rw-r--r--ftplugin/coffee.vim1
-rw-r--r--ftplugin/doxygen.vim3
-rw-r--r--ftplugin/help.vim3
-rw-r--r--ftplugin/java.vim2
-rw-r--r--ftplugin/nerdtree.vim1
-rw-r--r--ftplugin/python.vim1
-rw-r--r--ftplugin/text.vim21
-rw-r--r--gvimrc30
-rw-r--r--indent/.keep1
-rw-r--r--init.lua176
-rw-r--r--init.vim80
-rwxr-xr-xinstall.sh23
-rw-r--r--pack/.empty1
-rw-r--r--pack/_all/opt/.empty1
m---------pack/_all/opt/ale0
m---------pack/_all/opt/nerdtree0
m---------pack/_all/opt/tagbar0
m---------pack/_all/opt/vim-signify0
m---------pack/_all/opt/zeavim.vim0
-rw-r--r--pack/_all/start/.empty1
m---------pack/_all/start/base16-vim0
m---------pack/_all/start/deoplete-clang0
m---------pack/_all/start/deoplete-jedi0
m---------pack/_all/start/deoplete.nvim0
m---------pack/_all/start/echodoc0
m---------pack/_all/start/jedi-vim0
m---------pack/_all/start/papercolor-theme0
m---------pack/_all/start/tabular0
m---------pack/_all/start/vim-fugitive0
m---------pack/_all/start/vim-mediawiki-editor0
m---------pack/_all/start/vim-operator-user0
m---------pack/_all/start/vim-remote-menu0
m---------pack/_all/start/vim-surround0
m---------pack/all/start/vim-colorscheme-papercolor0
m---------pack/all/start/vim-fancy-line0
m---------pack/all/start/vim-karlmarks (renamed from pack/coderonline/start/vim-karlmarks)0
m---------pack/all/start/vim-mercenary0
m---------pack/all/start/vim-recently-used0
m---------pack/coderonline/start/vim-recently-used0
-rw-r--r--pack/neovim/opt/.empty1
m---------pack/nvim/start/nvim-cmp0
m---------pack/nvim/start/nvim-cmp-nvim-lsp0
m---------pack/nvim/start/nvim-colorizer0
m---------pack/nvim/start/nvim-lspconfig0
m---------pack/nvim/start/nvim-vsnip0
-rw-r--r--pack/vim/opt/.empty1
m---------pack/vim/opt/syntastic0
m---------pack/vim/opt/vim-youcompleteme0
m---------pack/vim/opt/vimtex0
-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
-rw-r--r--spell/.keep1
-rw-r--r--syntax/univention-template.vim31
-rw-r--r--temp/.keep3
-rw-r--r--thesaurus/php.txt2
-rwxr-xr-xupdate.sh2
-rw-r--r--vimpagerrc10
-rw-r--r--vimrc50
-rw-r--r--vimrc-common23
-rw-r--r--ycm_extra_conf.py21
-rw-r--r--ycm_extra_mini-conf.py138
95 files changed, 322 insertions, 1739 deletions
diff --git a/.gitmodules b/.gitmodules
index 857c94c..00d4440 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,75 +1,48 @@
1[submodule "pack/_all/start/vim-remote-menu"] 1[submodule "pack/submodules/vim-recently-used"]
2 path = pack/_all/start/vim-remote-menu 2 path = pack/submodules/start/vim-recently-used
3 url = https://github.com/coderonline/vim-remote-menu.git 3 url = https://git.entwicklerseite.de/vim-recently-used
4[submodule "pack/_all/start/base16-vim"] 4[submodule "pack/submodules/vim-karlmarks"]
5 path = pack/_all/start/base16-vim 5 path = pack/submodules/start/vim-karlmarks
6 url = https://github.com/chriskempson/base16-vim.git 6 url = http://git.entwicklerseite.de/vim-karlmarks
7[submodule "pack/_all/start/papercolor-theme"] 7[submodule "pack/submodules/vim-fancy-line"]
8 path = pack/_all/start/papercolor-theme 8 path = pack/submodules/start/vim-fancy-line
9 url = https://github.com/coderonline/vim-fancy-line
10[submodule "pack/submodules/vim-mercenary"]
11 path = pack/submodules/start/vim-mercenary
12 url = https://github.com/jlfwong/vim-mercenary
13[submodule "pack/submodules/start/vim-colorscheme-papercolor"]
14 path = pack/all/start/vim-colorscheme-papercolor
9 url = https://github.com/NLKNguyen/papercolor-theme.git 15 url = https://github.com/NLKNguyen/papercolor-theme.git
10[submodule "pack/_all/opt/vim-signify"] 16[submodule "pack/submodules/start/vim-YouCompleteMe"]
11 path = pack/_all/opt/vim-signify 17 path = pack/submodules/opt/vim-youcompleteme
12 url = https://github.com/mhinz/vim-signify.git
13[submodule "pack/_all/start/vim-fugitive"]
14 path = pack/_all/start/vim-fugitive
15 url = https://github.com/tpope/vim-fugitive.git
16[submodule "pack/_all/start/tabular"]
17 path = pack/_all/start/tabular
18 url = https://github.com/godlygeek/tabular.git
19[submodule "pack/_all/opt/tagbar"]
20 path = pack/_all/opt/tagbar
21 url = https://github.com/majutsushi/tagbar.git
22[submodule "pack/_all/start/vim-surround"]
23 path = pack/_all/start/vim-surround
24 url = https://github.com/tpope/vim-surround.git
25[submodule "pack/_all/opt/nerdtree"]
26 path = pack/_all/opt/nerdtree
27 url = https://github.com/scrooloose/nerdtree.git
28[submodule "pack/_all/opt/vim-snippets"]
29 path = pack/_all/opt/vim-snippets
30 url = https://github.com/honza/vim-snippets.git
31[submodule "pack/neovim/opt/echodoc.vim"]
32 path = pack/_all/start/echodoc
33 url = https://github.com/Shougo/echodoc.vim.git
34[submodule "pack/neovim/opt/ale"]
35 path = pack/_all/opt/ale
36 url = https://github.com/dense-analysis/ale.git
37[submodule "pack/vim/opt/syntastic"]
38 path = pack/vim/opt/syntastic
39 url = https://github.com/vim-syntastic/syntastic.git
40[submodule "pack/_all/opt/jedi-vim"]
41 path = pack/_all/start/jedi-vim
42 url = https://github.com/davidhalter/jedi-vim.git
43[submodule "pack/_all/start/vim-operator-user"]
44 path = pack/_all/start/vim-operator-user
45 url = https://github.com/kana/vim-operator-user.git
46[submodule "pack/_all/opt/zeavim.vim"]
47 path = pack/_all/opt/zeavim.vim
48 url = https://github.com/KabbAmine/zeavim.vim
49[submodule "pack/vim/opt/YouCompleteMe.git"]
50 path = pack/_all/opt/YouCompleteMe
51 url = https://github.com/Valloric/YouCompleteMe.git 18 url = https://github.com/Valloric/YouCompleteMe.git
52[submodule "pack/vim/opt/vimtex"] 19[submodule "pack/submodules/start/nvim-colorizer"]
53 path = pack/vim/opt/vimtex 20 path = pack/nvim/start/nvim-colorizer
54 url = https://github.com/lervag/vimtex 21 url = https://github.com/norcalli/nvim-colorizer.lua
55[submodule "pack/_all/start/vim-mediawiki-editor"] 22[submodule "pack/submodules/start/nvim-cmp"]
56 path = pack/_all/start/vim-mediawiki-editor 23 path = pack/nvim/start/nvim-cmp
57 url = https://github.com/aquach/vim-mediawiki-editor 24 url = https://github.com/hrsh7th/nvim-cmp
58[submodule "pack/coderonline/start/vim-recently-used"] 25[submodule "pack/submodules/start/nvim-lspconfig"]
59 path = pack/coderonline/start/vim-recently-used 26 path = pack/nvim/start/nvim-lspconfig
27 url = https://github.com/neovim/nvim-lspconfig
28[submodule "pack/submodules/start/nvim-cmp-nvim-lsp"]
29 path = pack/nvim/start/nvim-cmp-nvim-lsp
30 url = https://github.com/hrsh7th/cmp-nvim-lsp
31[submodule "pack/submodules/start/nvim-vsnip"]
32 path = pack/nvim/start/nvim-vsnip
33 url = https://github.com/hrsh7th/vim-vsnip
34[submodule "pack/submodules/start/vim-recently-used"]
35 path = pack/all/start/vim-recently-used
60 url = https://git.entwicklerseite.de/vim-recently-used 36 url = https://git.entwicklerseite.de/vim-recently-used
61[submodule "pack/_all/start/deoplete-jedi"] 37[submodule "pack/submodules/start/vim-karlmarks"]
62 path = pack/_all/start/deoplete-jedi 38 path = pack/all/start/vim-karlmarks
63 url = https://github.com/deoplete-plugins/deoplete-jedi
64[submodule "pack/_all/start/deoplete-clang"]
65 path = pack/_all/start/deoplete-clang
66 url = https://github.com/deoplete-plugins/deoplete-clang
67[submodule "pack/_all/start/deoplete.nvim"]
68 path = pack/_all/start/deoplete.nvim
69 url = https://github.com/Shougo/deoplete.nvim.git
70[submodule "vim-karlmarks"]
71 path = vim-karlmarks
72 url = http://git.entwicklerseite.de/vim-karlmarks
73[submodule "pack/coderonline/start/vim-karlmarks"]
74 path = pack/coderonline/start/vim-karlmarks
75 url = http://git.entwicklerseite.de/vim-karlmarks 39 url = http://git.entwicklerseite.de/vim-karlmarks
40[submodule "pack/submodules/start/vim-fancy-line"]
41 path = pack/all/start/vim-fancy-line
42 url = https://github.com/coderonline/vim-fancy-line
43[submodule "pack/submodules/start/vim-mercenary"]
44 path = pack/all/start/vim-mercenary
45 url = https://github.com/jlfwong/vim-mercenary
46[submodule "pack/submodules/opt/vim-youcompleteme"]
47 path = pack/vim/opt/vim-youcompleteme
48 url = https://github.com/Valloric/YouCompleteMe.git
diff --git a/CursorHold-example.vim b/CursorHold-example.vim
deleted file mode 100644
index ae55396..0000000
--- a/CursorHold-example.vim
+++ /dev/null
@@ -1,37 +0,0 @@
1au! CursorHold *.[ch] nested call PreviewWord()
2func PreviewWord()
3 if &previewwindow " don't do this in the preview window
4 return
5 endif
6 let w = expand("<cword>") " get the word under cursor
7 if w =~ '\a' " if the word contains a letter
8
9 " Delete any existing highlight before showing another tag
10 silent! wincmd P " jump to preview window
11 if &previewwindow " if we really get there...
12 match none " delete existing highlight
13 wincmd p " back to old window
14 endif
15
16 " Try displaying a matching tag for the word under the cursor
17 try
18 exe "ptag " . w
19 catch
20 return
21 endtry
22
23 silent! wincmd P " jump to preview window
24 if &previewwindow " if we really get there...
25 if has("folding")
26 silent! .foldopen " don't want a closed fold
27 endif
28 call search("$", "b") " to end of previous line
29 let w = substitute(w, '\\', '\\\\', "")
30 call search('\<\V' . w . '\>') " position cursor on match
31 " Add a match highlight to the word at this position
32 hi previewWord term=bold ctermbg=green guibg=green
33 exe 'match previewWord "\%' . line(".") . 'l\%' . col(".") . 'c\k*"'
34 wincmd p " back to old window
35 endif
36 endif
37endfun
diff --git a/GetLatest/GetLatestVimScripts.dat b/GetLatest/GetLatestVimScripts.dat
deleted file mode 100644
index aff0816..0000000
--- a/GetLatest/GetLatestVimScripts.dat
+++ /dev/null
@@ -1,10 +0,0 @@
1ScriptID SourceID Filename
2--------------------------
3294 19633 :AutoInstall: Align.vim
4120 9388 Decho.vim
540 21108 DrawIt.tar.gz
6451 9231 EasyAccents.vim
7195 6351 engspchk.vim
8642 15781 GetLatestVimScripts.vim
9489 16670 Manpageview.vim
101066 7618 :AutoInstall: cecutil.vim
diff --git a/UPDATING b/UPDATING
deleted file mode 100644
index 4359a5b..0000000
--- a/UPDATING
+++ /dev/null
@@ -1,3 +0,0 @@
1 git submodule sync --recursive
2 git submodule update --remote
3 vim -c ':UpdateRemotePlugins'
diff --git a/after/ftdetect/log.vim b/after/ftdetect/log.vim
new file mode 100644
index 0000000..8203171
--- /dev/null
+++ b/after/ftdetect/log.vim
@@ -0,0 +1 @@
autocmd BufReadPost *.log setfiletype log
diff --git a/after/ftplugin/javascript.vim b/after/ftplugin/javascript.vim
new file mode 100644
index 0000000..d4c9199
--- /dev/null
+++ b/after/ftplugin/javascript.vim
@@ -0,0 +1 @@
set number
diff --git a/indent/html5.vim b/after/indent/html5.vim
index 94baa87..94baa87 100644
--- a/indent/html5.vim
+++ b/after/indent/html5.vim
diff --git a/indent/php.vim b/after/indent/php.vim
index ef723a6..ef723a6 100644
--- a/indent/php.vim
+++ b/after/indent/php.vim
diff --git a/after/syntax/log.vim b/after/syntax/log.vim
new file mode 100644
index 0000000..44223e6
--- /dev/null
+++ b/after/syntax/log.vim
@@ -0,0 +1,24 @@
1
2
3hi link Info NonText
4hi link Pass DiffAdd
5
6syn match ERROR /TEST-UNEXPECTED-FAIL/
7syn match NonText /^\[[^\]]*\]/
8
9syn match NonText /^ *\d\{1,2\}:\d\{1,2\}[.:]\d\{1,2\}[:0-9]*/
10syn match ErrorMsg / ERROR /
11syn match ErrorMsg / FAIL /
12syn match Error / WARNING /
13syn match Info / INFO / fold
14syn match Pass / PASS / fold
15
16
17silent! lvimgrep /[^ ]* \(ERROR\|WARNING\|FAIL\) / %
18lopen 12
19
20
21
22" setlocal foldexpr=getline(v:lnum)=~'INFO'
23" setlocal foldmethod=expr
24" setlocal foldenable
diff --git a/after/syntax/markdown.vim b/after/syntax/markdown.vim
new file mode 100644
index 0000000..7bdbf46
--- /dev/null
+++ b/after/syntax/markdown.vim
@@ -0,0 +1,19 @@
1" Custom conceal
2" syntax region todolist start="^\s*[\+-\*x ]" end="\s" contained keepend
3
4
5syntax match markdownConceal "\[\ \]" contained conceal cchar=
6syntax match markdownConceal "\[x\]" contained conceal cchar=
7syntax match markdownConceal "*" contained conceal cchar=
8syntax match markdownConceal "-" contained conceal cchar=
9syntax match markdownConceal "+" contained conceal cchar=
10
11syntax region
12 \ markdownItemization
13 \ start="^\s*\(\[ \]\|[\+\-\*x]\)\s"
14 \ end="\s"
15 \ contains=markdownConceal
16
17
18hi def link markdownConceal Todo
19hi! link Conceal Text
diff --git a/colors/coderonline.vim b/colors/coderonline.vim
deleted file mode 100644
index d2ec135..0000000
--- a/colors/coderonline.vim
+++ /dev/null
@@ -1,181 +0,0 @@
1" color theme for vim
2" Maintainer: Max Christian Pohle <max@coderonline.de>
3" Last Change: 07.09.2015
4" Web: http://max.coderonline.de/
5
6set background=light
7hi clear
8if exists("syntax_on")
9 syntax reset
10endif
11let g:colors_name="coderonline"
12
13
14"set guifont=Andale\ Mono\ 12
15set guifont=Liberation\ Mono\ Normal\ 11
16"set guifont=Meslo\ LG\ S\ DZ\ for\ Powerline\ 14
17"set guifont=Monospace\ 11
18"set guifont=DejaVu\ Sans\ Mono\ 11
19"set guifont=Liberation\ Mono\ for\ Powerline\ 11
20"set guifont=Envy\ Code\ R\ 11
21
22set number
23set hls
24
25highlight Menu gui=none cterm=none term=none guibg=white ctermbg=white guifg=black ctermfg=black
26highlight Scrollbar gui=none cterm=none term=none guibg=white ctermbg=white guifg=black ctermfg=black
27highlight Tooltip gui=none cterm=none term=none guibg=yellow ctermbg=yellow guifg=black ctermfg=black
28
29highlight Normal gui=none cterm=none term=none guibg=white ctermbg=white guifg=black ctermfg=black
30highlight! link NonText Normal
31
32highlight Statement gui=bold cterm=bold term=bold guibg=white ctermbg=white guifg=#0000ff ctermfg=21
33highlight! link Boolean Statement
34highlight! link Identifier Statement
35
36highlight Type gui=bold cterm=bold term=bold guibg=white ctermbg=white guifg=DarkBlue ctermfg=darkblue
37
38highlight Constant gui=none cterm=none term=none guibg=white ctermbg=white guifg=brown ctermfg=brown
39highlight! link String Constant
40highlight! link Number Constant
41
42highlight Comment gui=none cterm=none term=none guibg=white ctermbg=white guifg=DarkGreen ctermfg=DarkGreen
43highlight! link PreProc Comment
44
45highlight StatusLine gui=bold cterm=bold term=bold guibg=lightgray ctermbg=lightgray guifg=darkgray ctermfg=darkgrey
46highlight! link StatusLineNC StatusLine
47
48highlight LineNr gui=none cterm=none term=none guibg=lightgray ctermbg=lightgray guifg=black ctermfg=black
49highlight CursorLine gui=none cterm=none term=none guibg=lightgray ctermbg=lightgray
50" highlight! link CursorLine LineNr
51" highlight! link CursorColumn LineNr
52" highlight! link ColorColumn LineNr
53
54" Cursor the character under the cursor
55highlight Cursor gui=inverse cterm=inverse term=inverse guibg=lightgray ctermbg=lightgray guifg=black ctermfg=black
56highlight iCursor gui=underline cterm=underline term=underline
57highlight! link CursorLineNr Cursor
58highlight! link CursorIM Cursor
59highlight! link Visual Cursor
60highlight! link VirualNOS Cursor
61" highlight! link MatchParen LineNr
62highlight MatchParen guibg=yellow ctermbg=yellow
63
64" WildMenu current match in 'wildmenu' completion
65" Pmenu Popup menu: normal item.
66" PmenuSel Popup menu: selected item.
67" PmenuSbar Popup menu: scrollbar.
68" PmenuThumb Popup menu: Thumb of the scrollbar.
69highlight! link WildMenu Todo
70highlight! link Popup LineNr
71highlight! link PMenu Popup
72highlight! link PMenuSel CursorLineNr
73highlight! link PMenuSbar CursorLineNr
74highlight! link PMenuThumb CursorLineNr
75
76
77" Windows
78highlight Title gui=bold cterm=bold term=bold guibg=lightgray ctermbg=lightgray guifg=darkgray ctermfg=darkgray
79highlight! link VertSplit Title
80highlight! link StatusLine Title
81highlight! link StatusLineNC Title
82highlight! link TabLine Title
83highlight! link TabLineFill TabLine
84highlight! link TabLineSel TabLine
85highlight TabLineSel gui=inverse cterm=inverse term=inverse
86
87highlight cParen gui=none cterm=none term=none guibg=white ctermbg=white guifg=orange ctermfg=brown
88highlight cBlock gui=none cterm=none term=none guibg=white ctermbg=cyan guifg=orange ctermfg=brown
89highlight vimParenSep gui=none cterm=none term=none guibg=white ctermbg=white guifg=orange ctermfg=brown
90
91highlight Special gui=bold cterm=bold term=bold guibg=white ctermbg=white guifg=black ctermfg=178
92highlight! link SpecialKey Special
93
94highlight Todo gui=none cterm=none term=none guibg=yellow ctermbg=yellow guifg=black ctermfg=black
95highlight! link ModeMsg Todo
96highlight! link MoreMsg Todo
97highlight! link ErrorMsg Todo
98highlight! link Conceal Todo
99highlight! link Directory Todo
100
101highlight Question gui=bold cterm=bold term=bold guibg=white ctermbg=white guifg=black ctermfg=black
102highlight! link WarningMsg Question
103
104highlight SpellBad gui=underline cterm=underline term=underline ctermbg=white
105highlight! link SpellCap SpellBad
106highlight! link SpellLocal Todo
107highlight! link SpellRare Todo
108highlight! EndOfBuffer guibg=white
109" *hl-Conceal*
110" *hl-DiffAdd*
111" DiffAdd diff mode: Added line |diff.txt|
112" *hl-DiffChange*
113" DiffChange diff mode: Changed line |diff.txt|
114" *hl-DiffDelete*
115" DiffDelete diff mode: Deleted line |diff.txt|
116" *hl-DiffText*
117" DiffText diff mode: Changed text within a changed line |diff.txt|
118" *hl-ErrorMsg*
119" Folded line used for closed folds
120" *hl-FoldColumn*
121" FoldColumn 'foldcolumn'
122" *hl-SignColumn*
123" SignColumn column where |signs| are displayed
124" *hl-IncSearch*
125" IncSearch 'incsearch' highlighting; also used for the text replaced with
126" ":s///c"
127" *hl-LineNr*
128" MatchParen The character under the cursor or just before it, if it
129" is a paired bracket, and its match. |pi_paren.txt|
130"
131" *hl-ModeMsg*
132" *hl-NonText*
133" *hl-Search*
134" Search Last search pattern highlighting (see 'hlsearch').
135" Also used for highlighting the current line in the quickfix
136" window and similar items that need to stand out.
137" *hl-SpecialKey*
138" to show unprintable characters in the text, 'listchars'.
139" Generally: text that is displayed differently from what it
140" really is.
141" *hl-SpellBad*
142
143
144" ====================== Important bits ======================
145"exe 'hi Normal guifg='.s:white .' guibg='.s:darkgrey
146"exe 'hi String guifg='.s:green .' guibg='.s:darkgrey .' gui=bold'
147"exe 'hi Function guifg='.s:violet .' guibg='.s:darkgrey .' gui=none'
148"exe 'hi Operator guifg='.s:light_orange .' guibg='.s:darkgrey .' gui=none'
149"exe 'hi Type guifg='.s:yellow .' guibg='.s:darkgrey .' gui=bold'
150"exe 'hi Number guifg='.s:orange .' guibg='.s:darkgrey .' gui=none'
151"exe 'hi Constant guifg='.s:red .' guibg='.s:darkgrey .' gui=none'
152"exe 'hi Macro guifg='.s:magenta .' guibg='.s:darkgrey .' gui=none'
153"exe 'hi PreProc guifg='.s:grey_blue .' guibg='.s:darkgrey .' gui=none'
154"exe 'hi Keyword guifg='.s:light_orange .' guibg='.s:darkgrey .' gui=none'
155"exe 'hi Comment guifg='.s:white .' guibg='.s:darkgrey .' gui=italic'
156"exe 'hi TODO guifg='.s:grey_blue .' guibg='.s:darkgrey .' gui=italic,bold'
157" Lay out our palette
158let s:grey_blue = '#8a9597'
159let s:light_grey_blue = '#a0a8b0'
160let s:dark_grey_blue = '#34383c'
161let s:mid_grey_blue = '#64686c'
162let s:beige = '#ceb67f'
163let s:light_orange = '#ebc471'
164let s:yellow = '#e3d796'
165let s:violet = '#a982c8'
166let s:magenta = '#a933ac'
167let s:green = '#e0a96f'
168let s:lightgreen = '#c2c98f'
169let s:red = '#d08356'
170let s:cyan = '#74dad9'
171let s:darkgrey = '#1a1a1a'
172let s:grey = '#303030'
173let s:lightgrey = '#605958'
174let s:white = '#fffedc'
175let s:orange = '#d08356'
176
177" ~~~ These are specific to color_coded ~~~
178exe 'hi Member guifg=#0000aa gui=italic'
179exe 'hi Variable guifg=#8800aa gui=none'
180exe 'hi Namespace guifg=#aa0000 gui=none'
181exe 'hi EnumConstant guifg=#00aaaa gui=none'
diff --git a/colors/mac_classic.vim b/colors/mac_classic.vim
deleted file mode 120000
index c1f3dc2..0000000
--- a/colors/mac_classic.vim
+++ /dev/null
@@ -1 +0,0 @@
1nelstrom/colors/mac_classic.vim \ No newline at end of file
diff --git a/doc/INSTALL b/doc/INSTALL
deleted file mode 100644
index 9cab2dd..0000000
--- a/doc/INSTALL
+++ /dev/null
@@ -1,46 +0,0 @@
1# INSTALL
2# this should briefly show you how to install this bundle
3
4
5# [required steps]
6
7# Download the current version using git (probably you already have!)
8git clone http://git.entwicklerseite.de/vim ~/.vim
9
10# Get the required submodule(s)
11git submodule update --init --recursive
12
13# start vim for the first time and use the plugin manager to install required plugins
14vim -c ":PlugInstall"
15
16# build YouCompleteMe
17cd ~/.vim/plugged/YouCompleteMe
18python ./install.py --clang-completer
19
20
21
22
23# [optional steps]
24# create a symbolic link to the downloaded vim.rc in you $HOME-directory
25ln -s ~/.vim/vimrc ~/.vimrc
26
27# gvim: make menu bar more fancy
28ln -s ~/.vim/gtk-3.0.css ~/.config/gtk-3.0/gtk.css
29
30# if you do not have working gvim start menu entries, try:
31ln -s ~/.vim/gvim-tab.desktop ~/.local/share/applications/
32update-desktop-database ~/.local/share/applications/
33
34# Thunar file manager specific: create an entry in the sendto menu...
35mkdir -p ~/.local/share/Thunar/sendto/
36ln -s ~/.vim/gvim-tab.desktop ~/.local/share/Thunar/sendto/
37
38
39
40# [random/unfinished stuff]
41# download plugins and spell file for your language
42# vim -c ":set spell"
43# vim +set\ spell # < maybe that works as well
44# :call spellfile#LoadFile(expand("de"))
45
46# vim: noai:ts=2:sw=2 filetype=csh nolist
diff --git a/doc/UPDATE b/doc/UPDATE
deleted file mode 100644
index 6321b85..0000000
--- a/doc/UPDATE
+++ /dev/null
@@ -1,4 +0,0 @@
1git submodule -q foreach git pull -q origin master
2
3In Vim:
4:VundleUpdate
diff --git a/doc/gitignore b/doc/gitignore
deleted file mode 100644
index 1d8dd28..0000000
--- a/doc/gitignore
+++ /dev/null
@@ -1,50 +0,0 @@
1# Byte-compiled / optimized / DLL files
2__pycache__/
3*.py[cod]
4
5# C extensions
6*.so
7
8# Distribution / packaging
9bin/
10build/
11develop-eggs/
12dist/
13eggs/
14lib/
15lib64/
16parts/
17sdist/
18var/
19*.egg-info/
20.installed.cfg
21*.egg
22
23# Installer logs
24pip-log.txt
25pip-delete-this-directory.txt
26
27# Unit test / coverage reports
28.tox/
29.coverage
30.cache
31nosetests.xml
32coverage.xml
33
34# Translations
35*.mo
36
37# Mr Developer
38.mr.developer.cfg
39.project
40.pydevproject
41
42# Rope
43.ropeproject
44
45# Django stuff:
46*.log
47*.pot
48
49# Sphinx documentation
50docs/_build/
diff --git a/experimental/list-commands.vim b/experimental/list-commands.vim
deleted file mode 100644
index 0dd4bca..0000000
--- a/experimental/list-commands.vim
+++ /dev/null
@@ -1,6 +0,0 @@
1
2
3
4for s in sort(getcompletion('', 'function'))
5 echo getcompletion(s, 'function')
6endfor
diff --git a/experimental/vimrc-minimal b/experimental/vimrc-minimal
deleted file mode 100644
index 96924f0..0000000
--- a/experimental/vimrc-minimal
+++ /dev/null
@@ -1,16 +0,0 @@
1set nocompatible
2
3
4filetype plugin indent on
5
6set omnifunc=syntaxcomplete#Complete
7
8syntax on
9
10
11set ts=2 sw=2 expandtab
12
13set ignorecase smartcase
14
15set hidden
16
diff --git a/experimental/vimrc-minimal-statusline b/experimental/vimrc-minimal-statusline
deleted file mode 100644
index 8a8656e..0000000
--- a/experimental/vimrc-minimal-statusline
+++ /dev/null
@@ -1,30 +0,0 @@
1set nocompatible
2
3
4filetype plugin indent on
5
6set omnifunc=syntaxcomplete#Complete
7
8syntax on
9
10
11set ts=2 sw=2 expandtab
12
13set ignorecase smartcase
14
15set hidden
16
17let g:status_fg="#ffffff"
18let g:status_bg="#000000"
19let g:status_sel='#ffff00'
20
21execute 'highlight! StatusLine'
22 \ .' guibg='.g:status_sel
23 \ .' guifg=NONE'
24
25execute 'highlight! User1 guibg='.g:status_bg
26execute 'highlight! User1 guifg='.g:status_fg
27
28execute 'highlight! User2 guibg='.g:status_sel
29execute 'highlight! User2 guifg='.g:status_bg
30colorscheme coderonline
diff --git a/experimental/vimrc-old b/experimental/vimrc-old
deleted file mode 100644
index c5bd4e6..0000000
--- a/experimental/vimrc-old
+++ /dev/null
@@ -1,303 +0,0 @@
1" vi:columns=160:list:ts=2:sts=2:sw=2
2"================================================================================
3" Vundle: plugin manager...
4set nocompatible | " do not try to be vi, be vim (required by Vundle)
5filetype off | " Vundle needs this
6set rtp+=~/.vim/bundle/Vundle.vim | " set runtimepath (required by Vundle)
7call vundle#begin('~/.vim/bundle/') | " location where Vundle searches&installs plugins
8
9" Plugin dependant configurations...
10Plugin 'tpope/vim-sensible' | " a sane and modern default configuration
11Plugin 'tpope/vim-fugitive' | " the most complete GIT integration plugin
12Plugin 'tpope/vim-surround' | " plugin makes cs"' inside a line replace " with '
13Plugin 'tpope/vim-repeat' | " lets . (dot) repeat plugin macros as well, specifically vim-surround
14Plugin 'tpope/vim-vinegar' | " Improves :Explore
15Plugin 'tpope/vim-characterize' | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values)
16
17Plugin 'tpope/vim-vividchalk' | " dark theme
18Plugin 'nelstrom/vim-mac-classic-theme' | " light theme
19
20Plugin 'Valloric/YouCompleteMe' | " syntax checker and code completion
21Plugin 'cscope_plus.vim' | " run cscope -R -b in project folder then use
22Plugin 'autoload_cscope.vim' | " CTRL+\ s searches word under cursor, CTRL+T back
23Plugin 'jeaye/color_coded' | " semantic highlighting with vim
24Plugin 'terryma/vim-multiple-cursors' | " displays visual block mode as cursors
25Plugin 'taglist-plus' | " quick code navigator
26Plugin 'jdonaldson/vaxe' | " code completion for haxe
27Plugin 'sheerun/vim-polyglot' | " better syntax highlighting/indentation for multiple languages
28Plugin 'loremipsum' | " Sample text generator
29Plugin 'vim-airline/vim-airline' | " beautification of the mode line
30Plugin 'nathanaelkane/vim-indent-guides' | " shows indentation guidelines by pressing <leader>ig
31Plugin 'gregsexton/matchtag' | " highlights closing ML tags like braces
32Plugin 'indenthtml.vim' | " works better with mixed html/css/javascript
33Plugin 'easymotion/vim-easymotion' | " speed up navigation: try \\w or \\f, then one of the highlighted chars
34Plugin 'Shougo/vimproc.vim'
35Plugin 'Shougo/vimshell.vim'
36Plugin 'jeetsukumaran/vim-buffergator' | " switch buffers with \b or <\-Left> <\-Right>
37
38let g:airline_powerline_fonts = 1
39
40let Tlist_Compact_Format = 1 | "
41let Tlist_GainFocus_On_ToggleOpen = 1 | "
42let Tlist_Close_On_Select = 1 | "
43
44Plugin 'VundleVim/Vundle.vim' | " Vundle itself (required)
45let g:ycm_global_ycm_extra_conf = '~/.vim/ycm_extra_conf.py' | " fallback, right one should be in the applications path
46let g:ycm_confirm_extra_conf = 0 | " disable 'do you really want to execute .py?'
47let g:ycm_key_select_completion = '<Tab>' | " key completion key
48let g:ycm_error_symbol = '✖' | " insert this as an error symbol in the gutter bar
49let g:ycm_warning_symbol = '➔' | " insert this as a warning symbol in the gutter bar
50let g:ycm_collect_identifiers_from_tags_files = 1 | "
51let g:ycm_autoclose_preview_window_after_insertion=1 | " close the window when leaving insert mode
52"let g:ycm_semantic_triggers = {'c' : ['(', ',']} | " add additional triggers (not recommend)
53
54let b:html_omni_flavor='xhtml' | " prever xhtml over html because that makes inline php code possible without hassle
55let html_use_css = 1 | " when using :TOhtml no font-tags will be used, but proper css
56let g:vim_markdown_folding_disabled=1 | " disable code folding with vimdiff (also see set nofoldenable)
57
58let g:netrw_liststyle=3 | " Explore mode: 3 shows a complete tree instead of the current directory
59let g:netrw_list_hide='^\..*' | " Explore mode: hide files starting with dot
60
61
62" speed up CTRL-P Menu...
63let g:ctrlp_user_command = 'ag %s -i --nocolor --nogroup --hidden
64 \ --ignore .git
65 \ --ignore .svn
66 \ --ignore .hg
67 \ --ignore .DS_Store
68 \ --ignore "**/*.pyc"
69 \ -g ""'
70
71call vundle#end() | " required by Vundle
72filetype plugin indent on | " required by Vundle
73"================================================================================
74" custom config
75colorscheme mac_classic
76" colorscheme coderonline
77syntax enable
78
79set noswapfile | " noundofile, nobackup, nowritebackup
80set backupdir=~/.vim/temp | " using :set backup will copy current file to this directory
81set directory=~/.vim/temp | "
82set undodir=~/.vim/temp | "
83
84set ts=2 sts=2 sw=2 expandtab | " indentation which i like (abbr: tabstop, softtabstop, shiftwidth)
85set autoindent | " always set autoindenting on
86set autochdir | " change to the current files working dir (might break some plugins!)
87set copyindent | " copy the previous indentation on autoindenting
88set scrolloff=2 | " always keeps at least two lines visible (when seeking)
89" set selectmode=mouse | " avoid using select mode (only with mouse)
90set mousemodel=popup_setpos | " display a default right click menu for the selection (that is c&p is possible)
91set selection=exclusive | " includes last character of the selection into following command (like x or d)
92
93set whichwrap=b,s,<,>,[,] | " beyond beginning/end line causes cusor to wrap
94set backspace=indent,eol,start| " allow backspacing over everything in insert mode, not needed with whichwrap
95set diffopt+=vertical,iwhite,filler | " lets diff ignore white spaces
96set spell spelllang=en,de | " enable spell checker
97set virtualedit=onemore | " one character beyond the line length should be navigatable (options: all,insert,block,onemore)
98set breakindent cpoptions+=n | " when wrapping lines indent wrapped line to align with the previews
99set linebreak | " do not wrap in the middle of words
100set display+=lastline | " do not show the @ symbol in the end of a long line
101set showcmd | " displays status line messages while selecting (matrix size)
102set nofoldenable | " do not fold code automatically
103set tags+=~/.vim/systags | " ctags -R -f ~/.vim/systags /usr/include /usr/local/include
104set wildmenu wildmode=full | " wildmenu code completion
105set guifont="Droid Sans Mono for Powerline 10"
106
107" search...
108set ignorecase smartcase | " if search pattern contains uppercase then search is case sensitive
109set incsearch | " do incremental searching
110set showmatch matchtime=4 | " blinks matching braces
111
112set novisualbell | " don't beep
113set noerrorbells | " don't beep
114set clipboard=unnamedplus | " makes copy and paste work (autoselectplus might work as well)
115set number | " toggle line numbers
116set formatprg=par | " set external formatting program to par, use gwip to format with this
117set laststatus=2 | " this is required for airline
118set cmdheight=1 | " controls how many lines the command line has
119set relativenumber | " displays current lines line no as zero point from where relative numbers are getting counted
120set timeoutlen=500 | " time between keys e.g. 80i=
121set ttimeoutlen=10 | " set esc key timeout in ms
122
123set splitbelow | " open new windows below the current one (i find that more intuitive)
124
125if has("multi_byte")
126 set encoding=utf-8 | " we need default utf-8 encoding to use cool chars as line break and so on (see below)
127 scriptencoding utf-8 | " tell vim that we are using utf-8 here
128 set showbreak+=› | " symbol used in the beginning of a wrapped line
129 set listchars=eol:↲ | " symbols used when using :set list (which displays non-printable chars)
130 set listchars+=trail:· | " symbols used when using :set list (which displays non-printable chars)
131 set listchars+=precedes:« | " symbols used when using :set list (which displays non-printable chars)
132 set listchars+=extends:» | " symbols used when using :set list (which displays non-printable chars)
133 set listchars+=tab:▸\ | " symbols used when using :set list (which displays non-printable chars)
134endif
135
136if has("autocmd")
137 set modeline | " set variables specific to a file, like indentation by adding a comment
138 set modelines=3 | " how many lines in the beginning and end of the file can be mode lines?
139
140 augroup resCur | " make cursor appear in its previous position when reopening a file...
141 autocmd BufReadPost * call setpos(".", getpos("'\""))
142 augroup END
143
144 augroup PreviewOnBottom | " will open new windows below the current (only in insert mode, so that the preview window is drawn below)
145 autocmd InsertEnter * set splitbelow
146 autocmd InsertLeave * set splitbelow!
147 augroup END
148
149 augroup OmniFunc | " this will enable omnicomplete just in case this configuration runs somewhere, where YouCompleteMe is not compiled
150 if exists("+omnifunc")
151 autocmd Filetype *
152 \ if &omnifunc == "" |
153 \ setlocal omnifunc=syntaxcomplete#Complete |
154 \ setlocal completeopt=longest,menuone |
155 \ endif
156 autocmd FileType html set omnifunc=htmlcomplete#CompleteTags
157 endif
158 augroup END
159
160 autocmd FileType text setlocal textwidth=78 | " text files: set 'textwidth' to 78
161 autocmd FileType gitcommit set tw=72 | " longer commit messages without auto line wrapping
162 autocmd FileType LaTeX let g:tex_flavor = "latex"| set conceallevel=1| set concealcursor=
163 autocmd BufNewFile,BufReadPost *.config set filetype=xml | " visual studio config file
164 autocmd BufNewFile,BufReadPost *.csproj set filetype=xml | " visual studio project file
165 autocmd BufNewFile,BufReadPost *.sln set filetype=xml | " visual studio solution file
166endif
167
168"================================================================================
169" gui stuff and appearance
170if &t_Co > 2
171 set hlsearch | " highlight all search matches
172 set cursorline | " highlight currently selected line
173endif
174
175
176if has("gui_running")
177 set mouse=a | " use mouse in gui-mode (which is default)
178 set mouseshape+=n:beam,v:beam | " display a text input cursor even in normal and selection mode
179 set guicursor=n-v-c:ver20-Cursor-blinkon500-blinkoff500 | " how the caret looks like
180 set guitablabel=%t | " do not display full path as tabname
181 set guioptions+=m | " menu bar
182 set guioptions-=T | " toolbar
183 set guioptions+=r | " right-hand scroll bar
184 set guioptions-=c | " use console dialogs instead of popups
185 set guioptions+=a | " autoselect: copy&paste using middleclick
186 set guioptions+=e | " add tab pages
187 set guioptions+=p | " use gui pointer callback for x11
188 set toolbariconsize=large | " make the icon toolbar as big as possible
189 "set columns=80 | " set initial window width (so that it fits the terminals)
190else
191 if &term =~? 'mlterm\|xterm\|screen'
192 set t_Co=256 | " fixes incompatibilities with our color scheme
193 endif
194 set mouse=nh | " limits mouse usage to normal mode and help files, so that middle click text insertion works in insert mode
195 set title | " set the terminal caption
196 set icon | " sets the terminal icon to vim
197 set ttyfast | " modern terminals are all fast in a way
198 "set titleold="vim ended" | " set terminal title after closing vim
199 "set titlestring="VIM-CONSOLE" | " set window title
200 "if has('mouse')
201 "endif
202endif
203
204
205"================================================================================
206" custom commands...
207"
208" assign selection keys (these i missed a lot)
209nmap <S-Left> vh| " shift-left selects to the left
210xmap <S-Left> h| " ^^
211nmap <S-Right> vl| " shift-right selects to the right
212xmap <S-Right> l| " ^^
213nmap <S-Up> vk| " shift-up selects like other text editors
214xmap <S-Up> k| " ^^
215nmap <S-Down> vj| " shift down selects like other text editors
216xmap <S-Down> j| " ^^
217nmap <Home> ^| " default homing in code editors is the first letter of a line
218xmap <Home> 0| " go to the beginning of the line
219xmap <S-Home> 0| " ^^
220xmap <Tab> >gv| " indent lines (and retain selection)
221xmap <S-Tab> <gv| " unindent lines (and retain selection)
222nmap <S-PageUp> VH| " selects predessing paragraph
223nmap <S-PageDown> VL| " selects following paragraph
224nmap <C-S-PageUp> V{| " selects predessing paragraph
225nmap <C-S-PageDown> V}| " selects following paragraph
226
227nmap <C-o> :24vs.<CR>| " means the same as :vsplit. and opens the :Exlore -window with a width of 24
228
229
230
231
232
233map <C-h> <C-w>h|map <C-j> <C-w>j| " window navigation shortcuts
234map <C-k> <C-w>k|map <C-l> <C-w>l| " window navigation shortcuts
235
236cmap w!! w !sudo tee % >/dev/null| " write :w!! to execute :w as root user
237
238" custom hotkeys...
239nnoremap <C-Tab> :tabnext<CR>| " lets one use CTRL+Tab to switch between tabs
240nnoremap <C-S-Tab> :tabprevious<CR>| " use CTRL+Shift+Tab to switch to preview tab
241
242nnoremap j gj|nnoremap k gk| " do not jump over wrapped lines
243
244nnoremap $ g$| " and make the $ key position the cursor after the last char of that line, not before
245nnoremap <End> g$| " and make the <End> key position the cursor after the last char of that line
246" function ExtendedHome()
247" let column = col('.')
248" normal! ^
249" if column == col('.')
250" normal! 0
251" endif
252" endfunction
253" noremap <silent> <Home> :call ExtendedHome()<CR>
254
255nnoremap <C-z> u
256
257
258"map <C-Right> el
259"map <C-left> hgel
260"vnoremap <C-S-Right> e
261"vnoremap <C-S-left> b
262
263
264" plugin hotkeys
265map <C-l> :TlistToggle<CR>| " bind TagList to Hotkey Ctrl+L
266inoremap <buffer> ( <C-X><C-o><C-p>(| " when opening a bracket: call the OmniComplete function, display the menu, but deselect the first entry (C-p)
267
268
269set makeprg=make\ test
270nnoremap <F5> :!make<CR>| " classic key binding: press F5 to compile and execute (if you have a Makefile with make test doing that)
271
272"================================================================================
273" deactivated on-demand commands (just in case one needs them one day)
274"
275" code completion: http://vim.wikia.com/wiki/Make_Vim_completion_popup_menu_work_just_like_in_an_IDE
276" reacts on CTRL+P, CTRL+Space
277"inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
278"inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<CR>"
279"inoremap <expr> <Down> pumvisible() ? "\<C-n>" : "\<Down>"
280"inoremap <expr> <Up> pumvisible() ? "\<C-p>" : "\<Up>"
281"inoremap <expr> <PageDown> pumvisible() ? "\<PageDown>\<C-p>\<C-n>" : "\<PageDown>"
282"inoremap <expr> <PageUp> pumvisible() ? "\<PageUp>\<C-p>\<C-n>" : "\<PageUp>"
283" set guiheadroom=0| " do not fill non-functional area of the empty editor with gtk background
284" map shift-right to visually select and so on
285"nnoremap <C-Right> El
286"nnoremap <S-Right> vl
287"nnoremap <S-Left> vj
288"nnoremap <S-Up> vk
289"nnoremap <S-Down> vj
290" noremap % v% " jump between braces and highlight
291"nnoremap <Home> ^
292"vmap <Home> ^
293"nnoremap <End> $
294"vmap <End> $
295"nnoremap <C-Tab> <C-PageDown>
296"nnoremap <C-S-Tab> <C-PageUp>
297":inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
298"inoremap <expr> <Esc> pumvisible() ? "\<C-e>" : "\<Esc>" " breaks cursor keys!
299" binding ESC can easily break cursor key movement on the console (tricky, because gvim works)
300"inoremap <C-Space> <C-x><C-o>
301"inoremap <C-@> <C-Space>
302"
303"map <Esc>OA k|map <Esc>OB j|map <Esc>OC l|map <Esc>OD h| " allow cursor keys in insert mode
diff --git a/ftplugin/c.vim b/ftplugin/c.vim
deleted file mode 100644
index 6bd8e83..0000000
--- a/ftplugin/c.vim
+++ /dev/null
@@ -1,18 +0,0 @@
1setlocal equalprg=clang-format
2setlocal breakat-=-
3setlocal keywordprg=man\ 3
4
5setlocal makeprg=make\ %:r
6
7setlocal cindent cinoptions+=(0 | " indent at parentheses
8
9" map <buffer> = :pyfile /usr/share/clang/clang-format.py<CR>
10
11
12let c_space_errors=1
13let c_gnu=1
14
15
16hi! cConstant gui=italic
17hi! cConditional gui=italic
18hi! cInclude gui=italic
diff --git a/ftplugin/coffee.vim b/ftplugin/coffee.vim
deleted file mode 100644
index 5d5675c..0000000
--- a/ftplugin/coffee.vim
+++ /dev/null
@@ -1 +0,0 @@
1let coffee_indent_keep_current = 1 " avoid problems with html indentation
diff --git a/ftplugin/doxygen.vim b/ftplugin/doxygen.vim
deleted file mode 100644
index 7dcd7e5..0000000
--- a/ftplugin/doxygen.vim
+++ /dev/null
@@ -1,3 +0,0 @@
1let g:load_doxygen_syntax=1
2
3syntax match Normal /@copydoc/ conceal cchar=↺
diff --git a/ftplugin/help.vim b/ftplugin/help.vim
deleted file mode 100644
index e2eb971..0000000
--- a/ftplugin/help.vim
+++ /dev/null
@@ -1,3 +0,0 @@
1" I will never get used to press CTRL-] to follow a link, never!
2nnoremap <buffer> <CR> <C-]>
3nnoremap <buffer> <BS> <C-T>
diff --git a/ftplugin/java.vim b/ftplugin/java.vim
deleted file mode 100644
index 7da3e00..0000000
--- a/ftplugin/java.vim
+++ /dev/null
@@ -1,2 +0,0 @@
1set makeprg=javac\ -Xdiags:verbose\ %
2set errorformat=%A%f:%l:\ %m,%-Z%p^,%-C%.%#
diff --git a/ftplugin/nerdtree.vim b/ftplugin/nerdtree.vim
deleted file mode 100644
index 62f5e5b..0000000
--- a/ftplugin/nerdtree.vim
+++ /dev/null
@@ -1 +0,0 @@
1 autocmd! WinNew,WinEnter,WinLeave * if exists("t:NERDTreeBufName") && bufwinnr(t:NERDTreeBufName) == bufwinnr('%') | setlocal statusline=NERDTree | endif
diff --git a/ftplugin/python.vim b/ftplugin/python.vim
deleted file mode 100644
index 1268957..0000000
--- a/ftplugin/python.vim
+++ /dev/null
@@ -1 +0,0 @@
1let &path=system('python -c "import sys; print(\",\".join(sys.path))"')
diff --git a/ftplugin/text.vim b/ftplugin/text.vim
deleted file mode 100644
index 9097834..0000000
--- a/ftplugin/text.vim
+++ /dev/null
@@ -1,21 +0,0 @@
1" highlight double words (its unlikely they are right)
2autocmd InsertLeave * syntax match Convention /\v<(\w+)\_s+\1>/ containedin=ALL
3
4
5set autoindent nosmartindent nocindent
6
7set formatoptions+=n " When formatting text, recognize numbered lists.
8set formatoptions+=1 " do not break after a one letter word
9" set formatoptions+=p " Don't break lines at single spaces that follow periods.
10
11set formatoptions+=aw " Automatic formatting of paragraphs (w=only if space in the end)
12
13
14set noexpandtab
15set spell
16set complete+=kspell
17
18inoremap <C-Space> <C-n>
19
20" nnoremap <c-s> :normal <c-n>
21" autocmd CursorHoldI * normal <c-x>s
diff --git a/gvimrc b/gvimrc
deleted file mode 100644
index eda4fc7..0000000
--- a/gvimrc
+++ /dev/null
@@ -1,30 +0,0 @@
1" ======================================================================================================================
2" GUI_DEFAULTS:
3" We want to have a minimal UI
4" ======================================================================================================================
5
6if has("gui_running")
7 set guicursor=a:block-blinkon100
8 set browsedir=buffer
9 set toolbar+=text
10 set guiheadroom=0
11 set guioptions+=eig
12 set guioptions-=T | " toolbar
13 set guioptions+=c | " use console dialogues instead of popups
14 set guioptions+=a | " auto select: copy&paste using middle click
15 set guioptions+=m | " remove menu
16 set guioptions-=e | " do not display tabs
17 set guioptions-=L | " do not show left scrollbar
18 set guioptions-=r | " do not show right scrollbar
19 set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped)
20 " set selectmode=mouse,key,cmd | " enters vim's select mode when pressing shift-left or shift-END
21 " set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text
22
23 set background=light
24 " its possible to define alternative fonts (order matters), but we will
25 " use the systems default font and cofigure that if necessary
26 set guifont=Monospace\ 10
27
28 " like in the terminal: use Ctrl-shift-v for paste in vim's command editor
29 cnoremap <c-s-v> <c-r>*
30endif
diff --git a/indent/.keep b/indent/.keep
deleted file mode 100644
index f8e463a..0000000
--- a/indent/.keep
+++ /dev/null
@@ -1 +0,0 @@
1this directory gets used for custom indentation rules. file naming follows the extension of the files the indentation is for and the extension .vim.
diff --git a/init.lua b/init.lua
new file mode 100644
index 0000000..0184d42
--- /dev/null
+++ b/init.lua
@@ -0,0 +1,176 @@
1vim.cmd('set termguicolors')
2vim.cmd('source ~/.vim/vimrc')
3
4require'man'
5
6require'colorizer'.setup()
7
8-- language servers:
9-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
10
11-- C/C++ | clang
12require'lspconfig'.clangd.setup{}
13
14-- lua
15require'lspconfig'.sumneko_lua.setup{
16 settings = {
17 Lua = {
18 diagnostics = {
19 globals = { 'vim' }
20 }
21 }
22 }
23}
24
25-- bash | bash-language-server
26require'lspconfig'.bashls.setup{}
27
28-- ccs | vscode-css-languageserver
29require'lspconfig'.cssls.setup{}
30
31-- rust | rust-analyzer
32require'lspconfig'.rust_analyzer.setup{}
33
34-- javascript | eslint
35require'lspconfig'.eslint.setup{}
36
37-- javascript | typescript-language-server
38require'lspconfig'.tsserver.setup{}
39
40-- vimscript | vim-language-server
41require'lspconfig'.vimls.setup{}
42
43require'lspconfig'.html.setup{}
44
45require'lspconfig'.jsonls.setup{}
46
47require'lspconfig'.pylsp.setup{
48 settings = {
49 pylsp = {
50 plugins = {
51 pycodestyle = {
52 ignore = {'W391'},
53 maxLineLength = 100
54 }
55 }
56 }
57 }
58}
59
60
61require'cmp_nvim_lsp'.setup{}
62
63require'cmp'.setup {
64 sources = {
65 { name = 'nvim_lsp' }
66 }
67}
68
69-- -- The nvim-cmp almost supports LSP's capabilities so You should advertise it to LSP servers..
70local capabilities = require('cmp_nvim_lsp').default_capabilities()
71--
72-- -- The following example advertise capabilities to `clangd`.
73require'lspconfig'.clangd.setup {
74capabilities = capabilities,
75}
76
77-- Set up nvim-cmp.
78local cmp = require'cmp'
79
80cmp.setup({
81 snippet = {
82 -- REQUIRED - you must specify a snippet engine
83 expand = function(args)
84 vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
85 -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
86 -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
87 -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
88 end,
89 },
90 window = {
91 completion = cmp.config.window.bordered(),
92 documentation = cmp.config.window.bordered(),
93 },
94 mapping = cmp.mapping.preset.insert({
95 ['<C-b>'] = cmp.mapping.scroll_docs(-4),
96 ['<C-f>'] = cmp.mapping.scroll_docs(4),
97 ['<C-Space>'] = cmp.mapping.complete(),
98 ['<C-e>'] = cmp.mapping.abort(),
99 -- ['<CR>'] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
100
101 ["<CR>"] = cmp.mapping.confirm({
102 behavior = cmp.ConfirmBehavior.Replace,
103 select = true,
104 }),
105
106 ['<C-s>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
107 }),
108 sources = cmp.config.sources({
109 { name = 'nvim_lsp' },
110 { name = 'vsnip' }, -- For vsnip users.
111 -- { name = 'luasnip' }, -- For luasnip users.
112 -- { name = 'ultisnips' }, -- For ultisnips users.
113 -- { name = 'snippy' }, -- For snippy users.
114 }, {
115 { name = 'buffer' },
116 })
117})
118
119-- Set configuration for specific filetype.
120cmp.setup.filetype('gitcommit', {
121sources = cmp.config.sources({
122{ name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
123}, {
124{ name = 'buffer' },
125})
126})
127
128-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
129cmp.setup.cmdline({ '/', '?' }, {
130mapping = cmp.mapping.preset.cmdline(),
131sources = {
132{ name = 'buffer' }
133}
134})
135
136-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
137cmp.setup.cmdline(':', {
138mapping = cmp.mapping.preset.cmdline(),
139sources = cmp.config.sources({
140{ name = 'path' }
141}, {
142{ name = 'cmdline' }
143})
144})
145
146-- -- Set up lspconfig.
147-- local capabilities = require('cmp_nvim_lsp').default_capabilities()
148-- -- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
149-- -- require('lspconfig')['<YOUR_LSP_SERVER>'].setup {
150-- -- }
151--
152-- -- C/C++ | clang
153-- require'lspconfig'.clangd.setup{capabilities = capabilities}
154--
155-- -- bash | bash-language-server
156-- require'lspconfig'.bashls.setup{capabilities = capabilities}
157--
158-- -- ccs | vscode-css-languageserver
159-- require'lspconfig'.cssls.setup{capabilities = capabilities}
160--
161-- -- rust | rust-analyzer
162-- require'lspconfig'.rust_analyzer.setup{capabilities = capabilities}
163--
164-- -- javascript | eslint
165-- require'lspconfig'.eslint.setup{capabilities = capabilities}
166--
167-- -- javascript | typescript-language-server
168-- require'lspconfig'.tsserver.setup{capabilities = capabilities}
169--
170-- -- vimscript | vim-language-server
171-- require'lspconfig'.vimls.setup{capabilities = capabilities}
172--
173-- require'lspconfig'.html.setup{capabilities = capabilities}
174--
175-- require'lspconfig'.jsonls.setup{capabilities = capabilities}
176--
diff --git a/init.vim b/init.vim
deleted file mode 100644
index 40894af..0000000
--- a/init.vim
+++ /dev/null
@@ -1,80 +0,0 @@
1exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common'
2set packpath+=pack/neovim
3
4"=======================================================================================================================
5augroup DEOPLETE
6 inoremap <silent><expr> <C-Space> deoplete#mappings#manual_complete()
7
8 let g:deoplete#enable_at_startup = 1
9 let g:echodoc#enable_at_startup = 1
10 let g:LanguageClient_serverCommands = {
11 \ 'cpp': ['clangd'],
12 \ 'c': ['clangd']
13 \ }
14
15
16 let g:LanguageClient_diagnosticsDisplay = {
17 \ 1: {
18 \ "name": "Error",
19 \ "texthl": "ALEError",
20 \ "signText": "✖",
21 \ "signTexthl": "ALEErrorSign",
22 \ },
23 \ 2: {
24 \ "name": "Warning",
25 \ "texthl": "ALEWarning",
26 \ "signText": "⚠",
27 \ "signTexthl": "ALEWarningSign",
28 \ },
29 \ 3: {
30 \ "name": "Information",
31 \ "texthl": "ALEInfo",
32 \ "signText": '🛈',
33 \ "signTexthl": "ALEInfoSign",
34 \ },
35 \ 4: {
36 \ "name": "Hint",
37 \ "texthl": "ALEInfo",
38 \ "signText": "➤",
39 \ "signTexthl": "ALEInfoSign",
40 \ },
41 \ }
42
43 " packadd deoplete.nvim
44 " packadd LanguageClient-neovim
45 " packadd echodoc.vim
46
47 let g:deoplete#sources#clang#include_default_arguments=1
48 " suggestions in alphabetic order
49
50 function! ConfigureDeoplete()
51 call deoplete#custom#source('_', 'sorters', ['sorter_word'])
52 call deoplete#custom#filter('converter_reorder_attr',
53 \ 'attrs_order', {
54 \ '_': {
55 \ 'kind': [
56 \ 'Function',
57 \ 'Property'
58 \ ]
59 \ },
60 \})
61 endfunction
62 autocmd VimEnter * call ConfigureDeoplete()
63augroup END
64
65"=======================================================================================================================
66augroup ALE
67 let g:ale_set_highlights = 0
68
69 let g:ale_sign_error = ''
70 let g:ale_sign_style_error = ''
71 let g:ale_sign_info = '🛈'
72 let g:ale_sign_warning = ''
73
74 highlight link ALEErrorSign LineNr
75 highlight link ALEWarningSign LineNr
76
77 packadd ale
78augroup END
79
80
diff --git a/install.sh b/install.sh
deleted file mode 100755
index bc8a868..0000000
--- a/install.sh
+++ /dev/null
@@ -1,23 +0,0 @@
1#!/bin/env bash
2
3# Welcome to Vimax!
4THIS_DIR=$(dirname $(realpath $0))
5
6pushd .
7
8# Change to this files directory
9cd $THIS_DIR
10
11# Fetch dependencies (git submodules)...
12awk '/path = (.*)/{PATH=$3;next} /url = /{URL=$3;next} URL{system("git submodule add " URL " " PATH)}' .gitmodules
13git submodule update --init --remote --progress --recursive
14
15# compile YouCompleteMe
16# dependencies: python-certifi
17cd $THIS_DIR/pack/vim/opt/YouCompleteMe
18./install.py --clang-completer
19
20
21
22
23popd
diff --git a/pack/.empty b/pack/.empty
deleted file mode 100644
index c381d32..0000000
--- a/pack/.empty
+++ /dev/null
@@ -1 +0,0 @@
1We need this folder to deploy our git submodules.
diff --git a/pack/_all/opt/.empty b/pack/_all/opt/.empty
deleted file mode 100644
index c381d32..0000000
--- a/pack/_all/opt/.empty
+++ /dev/null
@@ -1 +0,0 @@
1We need this folder to deploy our git submodules.
diff --git a/pack/_all/opt/ale b/pack/_all/opt/ale
deleted file mode 160000
Subproject 08295ce17405cb5f6c80d2f726262493bfd2121
diff --git a/pack/_all/opt/nerdtree b/pack/_all/opt/nerdtree
deleted file mode 160000
Subproject 577ddc73f0a1d2fd6166ed3268ab8536111037e
diff --git a/pack/_all/opt/tagbar b/pack/_all/opt/tagbar
deleted file mode 160000
Subproject e1c2c98922ef922070e055a4a55f5b17659a69d
diff --git a/pack/_all/opt/vim-signify b/pack/_all/opt/vim-signify
deleted file mode 160000
Subproject 98c693f7a1a91b73d9232d868765b4d20af892f
diff --git a/pack/_all/opt/zeavim.vim b/pack/_all/opt/zeavim.vim
deleted file mode 160000
Subproject 298e52ad683680b4aa19b53d009cf0e6b919766
diff --git a/pack/_all/start/.empty b/pack/_all/start/.empty
deleted file mode 100644
index c381d32..0000000
--- a/pack/_all/start/.empty
+++ /dev/null
@@ -1 +0,0 @@
1We need this folder to deploy our git submodules.
diff --git a/pack/_all/start/base16-vim b/pack/_all/start/base16-vim
deleted file mode 160000
Subproject 6191622d5806d4448fa2285047936bdcee57a09
diff --git a/pack/_all/start/deoplete-clang b/pack/_all/start/deoplete-clang
deleted file mode 160000
Subproject 2ea262e98edcb66e828f9077fcc844100320eb6
diff --git a/pack/_all/start/deoplete-jedi b/pack/_all/start/deoplete-jedi
deleted file mode 160000
Subproject 2786058b9022ce6e50db7f75088e69e07185e52
diff --git a/pack/_all/start/deoplete.nvim b/pack/_all/start/deoplete.nvim
deleted file mode 160000
Subproject 7ab4c1bde7f9bd8824219594b07e4c1aa0814d4
diff --git a/pack/_all/start/echodoc b/pack/_all/start/echodoc
deleted file mode 160000
Subproject 4719626bfd477f1189dd9992614ff452d3ea3ca
diff --git a/pack/_all/start/jedi-vim b/pack/_all/start/jedi-vim
deleted file mode 160000
Subproject a17b0333031bd3652ad4c6169caaed05ffb7c49
diff --git a/pack/_all/start/papercolor-theme b/pack/_all/start/papercolor-theme
deleted file mode 160000
Subproject c657f5c2d5964bbae633f8a42c16f8316f6d673
diff --git a/pack/_all/start/tabular b/pack/_all/start/tabular
deleted file mode 160000
Subproject 339091ac4dd1f17e225fe7d57b48aff55f99b23
diff --git a/pack/_all/start/vim-fugitive b/pack/_all/start/vim-fugitive
deleted file mode 160000
Subproject 511d3035d4da2453a9cb0188b6020ed7bc8fc18
diff --git a/pack/_all/start/vim-mediawiki-editor b/pack/_all/start/vim-mediawiki-editor
deleted file mode 160000
Subproject f5a8b76639bfe50413f40d021c2f941123eed21
diff --git a/pack/_all/start/vim-operator-user b/pack/_all/start/vim-operator-user
deleted file mode 160000
Subproject c3dfd41c1ed516b4b901c97562e644de62c367a
diff --git a/pack/_all/start/vim-remote-menu b/pack/_all/start/vim-remote-menu
deleted file mode 160000
Subproject a839af9df2edf20cde7b0717ea5a50bde6a82b8
diff --git a/pack/_all/start/vim-surround b/pack/_all/start/vim-surround
deleted file mode 160000
Subproject f51a26d3710629d031806305b6c8727189cd193
diff --git a/pack/all/start/vim-colorscheme-papercolor b/pack/all/start/vim-colorscheme-papercolor
new file mode 160000
Subproject 9051480ad9129ff4ab4fffb38b44779b9081626
diff --git a/pack/all/start/vim-fancy-line b/pack/all/start/vim-fancy-line
new file mode 160000
Subproject bf4fadce4d57396ccbadd0493cac294fe6c69b9
diff --git a/pack/coderonline/start/vim-karlmarks b/pack/all/start/vim-karlmarks
Subproject 9747ae42e4201b0991152d45a604b81c01d3e81 Subproject 9747ae42e4201b0991152d45a604b81c01d3e81
diff --git a/pack/all/start/vim-mercenary b/pack/all/start/vim-mercenary
new file mode 160000
Subproject 7e57581a60aec3bbc6499b4f49b3eca3b71caed
diff --git a/pack/all/start/vim-recently-used b/pack/all/start/vim-recently-used
new file mode 160000
Subproject b0762c939a9c1cd1e8e8d88d3491c28d556e993
diff --git a/pack/coderonline/start/vim-recently-used b/pack/coderonline/start/vim-recently-used
deleted file mode 160000
Subproject 463cab0af26022d8c2cad3760383bcc6f41dd57
diff --git a/pack/neovim/opt/.empty b/pack/neovim/opt/.empty
deleted file mode 100644
index c381d32..0000000
--- a/pack/neovim/opt/.empty
+++ /dev/null
@@ -1 +0,0 @@
1We need this folder to deploy our git submodules.
diff --git a/pack/nvim/start/nvim-cmp b/pack/nvim/start/nvim-cmp
new file mode 160000
Subproject 8bbaeda725d5db6e4e1be2867a64b43bf547cf0
diff --git a/pack/nvim/start/nvim-cmp-nvim-lsp b/pack/nvim/start/nvim-cmp-nvim-lsp
new file mode 160000
Subproject 59224771f91b86d1de12570b4070fe4ad7cd1ee
diff --git a/pack/nvim/start/nvim-colorizer b/pack/nvim/start/nvim-colorizer
new file mode 160000
Subproject 36c610a9717cc9ec426a07c8e6bf3b3abcb139d
diff --git a/pack/nvim/start/nvim-lspconfig b/pack/nvim/start/nvim-lspconfig
new file mode 160000
Subproject 973aa14d0992df82ff82f714d978a3eb8d67660
diff --git a/pack/nvim/start/nvim-vsnip b/pack/nvim/start/nvim-vsnip
new file mode 160000
Subproject e44026b5394fd79aa0f2118aaf41627ef9c354e
diff --git a/pack/vim/opt/.empty b/pack/vim/opt/.empty
deleted file mode 100644
index c381d32..0000000
--- a/pack/vim/opt/.empty
+++ /dev/null
@@ -1 +0,0 @@
1We need this folder to deploy our git submodules.
diff --git a/pack/vim/opt/syntastic b/pack/vim/opt/syntastic
deleted file mode 160000
Subproject 3e31762a26f7c29c0f6344c4215ca9074f4ead8
diff --git a/pack/vim/opt/vim-youcompleteme b/pack/vim/opt/vim-youcompleteme
new file mode 160000
Subproject 88efc6f6035e4c656e8791f3c3a8a4328a1634d
diff --git a/pack/vim/opt/vimtex b/pack/vim/opt/vimtex
deleted file mode 160000
Subproject ec219646136de3040356b00d0dc74520950bd76
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
diff --git a/spell/.keep b/spell/.keep
deleted file mode 100644
index 6d81f6e..0000000
--- a/spell/.keep
+++ /dev/null
@@ -1 +0,0 @@
1vim will automatically download spellchecker dictionaries to this directory
diff --git a/syntax/univention-template.vim b/syntax/univention-template.vim
deleted file mode 100644
index f628762..0000000
--- a/syntax/univention-template.vim
+++ /dev/null
@@ -1,31 +0,0 @@
1" Vim syntax file
2" Language: conf.python
3" Maintainer: Max Christian Pohle <pohle@univention.de>
4" Last Change: Jan 20, 2020
5
6if exists("b:current_syntax")
7 finish
8end
9
10let b:current_syntax = "univention-template"
11
12" embolden normal text to make it a little bit more present than normal python
13highlight! Normal cterm=bold gui=bold
14
15" highlighting for univention config registry
16syntax region Define matchgroup=Statement start=/@%@/ end=/@%@/ oneline
17
18unlet b:current_syntax
19syntax include @PYTHON syntax/python.vim
20syntax region inlinePython
21 \ matchgroup=Statement
22 \ start="@!@" end="@!@.*"
23 \ contains=@PYTHON
24 \ keepend fold extend
25let b:current_syntax = "univention-template"
26
27syntax match Operator '[=;]'
28
29" TODO: further evaluation of:
30" syntax region String start=/"/ end=/"/
31" syntax keyword Statement include
diff --git a/temp/.keep b/temp/.keep
deleted file mode 100644
index 3d99c12..0000000
--- a/temp/.keep
+++ /dev/null
@@ -1,3 +0,0 @@
1this directory is meant to store backups and undo files. it improves the vim
2experience when working with fuse mounted file systems, because they can get
3really slow when doing those things remotely
diff --git a/thesaurus/php.txt b/thesaurus/php.txt
deleted file mode 100644
index 133c9fe..0000000
--- a/thesaurus/php.txt
+++ /dev/null
@@ -1,2 +0,0 @@
1math abs acos acosh asin asinh atan atan2 atanh base_convert bindec ceil cos
2errors debug_backtrace debug_print_backtrace error_get_last error_log error_reporting restore_error_handler
diff --git a/update.sh b/update.sh
deleted file mode 100755
index 00b4e3c..0000000
--- a/update.sh
+++ /dev/null
@@ -1,2 +0,0 @@
1#!/bin/sh
2git submodule update --recursive --remote
diff --git a/vimpagerrc b/vimpagerrc
deleted file mode 100644
index 89cdb4f..0000000
--- a/vimpagerrc
+++ /dev/null
@@ -1,10 +0,0 @@
1let g:vimpager = {}
2let g:less = {}
3let g:less.enabled = 0
4let g:less.number = 1
5let g:less.hlsearch = 0
6let g:vimpager.ansiesc = 0
7let g:less.enabled = 0
8
9set noswapfile
10set viminfo+=% | " restore buffer list
diff --git a/vimrc b/vimrc
index f17d507..a76471b 100644
--- a/vimrc
+++ b/vimrc
@@ -1,29 +1,37 @@
1exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common' 1exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common'
2set packpath+=pack/vim 2set packpath+=pack/submodules
3 3
4set ttymouse=xterm2
5set term=xterm-256color " usually a good choice, install ncurses and use `toe` to see all available choices
6set ttybuiltin | " use internal termcaps, because these are more stable
7set ttyscroll=100 | " improves speed for terminal vim, incompatible with nvim
8set ttyfast | " improves speed for terminal vim (incompatible with nvim)
9set restorescreen | " restores the console after exiting vim (intentionally not in nvim)
10
11" because file names rarely have equal signs, but many different configuration
12" file formats use that, we want to exclude the sign from the pattern
13set isfname-== 4set isfname-==
5set modeline
14 6
15" autocmd VimLeave * call system("echo -n $'" . escape(getreg(), "'") . "' | xsel -ib") 7set signcolumn=yes
16" autocmd VimLeave * call system("xsel -ib", getreg('+')) 8set foldcolumn=1
17autocmd VimLeave * call system('echo ' . shellescape(getreg('+')) . ' | xclip -selection clipboard')
18 9
19 10
20" scripts from the default vim installation, which do not get loaded by default, but are useful. 11if ($XDG_SESSION_TYPE ==# 'wayland' || ! empty($WAYLAND_DISPLAY))
21if filereadable($VIMRUNTIME.'/macros/editexisting.vim') 12 autocmd TextYankPost * call system("wl-copy", get(v:event, 'regcontents'))
22 packadd! editexisting 13 nnoremap p :silent put =system('wl-paste')<CR>
14 nnoremap P :silent put! =system('wl-paste')<CR>
23endif 15endif
24 16
25" load default plugin 'matchit' to allow % to jump between tags 17
26if filereadable($VIMRUNTIME.'/macros/matchit.vim') 18set shadafile="/tmp/shada"
27 packadd! matchit 19
28endif 20" neovide specific
29"======================================================================================================================= 21set guifont=monospace:h11:b
22" :#e-subpixelantialias:#h-full
23let g:neovide_cursor_animation_length=0.03
24let g:neovide_cursor_trail_size=0.8
25let g:neovide_scroll_animation_length = 0.05
26let g:neovide_transparency = 0.9
27
28" scripts from the default vim installation, which do not get loaded by default, but are useful.
29" if filereadable($VIMRUNTIME.'/macros/editexisting.vim')
30" packadd! editexisting
31" endif
32"
33" " load default plugin 'matchit' to allow % to jump between tags
34" if filereadable($VIMRUNTIME.'/macros/matchit.vim')
35" packadd! matchit
36" endif
37"
diff --git a/vimrc-common b/vimrc-common
index 239cc91..6f0d7af 100644
--- a/vimrc-common
+++ b/vimrc-common
@@ -9,7 +9,7 @@ set modeline | " set variables specific to a file, like ind
9set textwidth=0 | " better done with modeline or local exrc and not here 9set textwidth=0 | " better done with modeline or local exrc and not here
10set ts=4 sts=4 sw=4 expandtab | " better done with a modeline or local exrc 10set ts=4 sts=4 sw=4 expandtab | " better done with a modeline or local exrc
11set virtualedit=all | " virtual edit should be default behaviour, because I don't see any reason against 11set virtualedit=all | " virtual edit should be default behaviour, because I don't see any reason against
12set nonumber norelativenumber | " do not show numbers by default, because that causes a performance loss, instead activate them on a file type basis 12set number norelativenumber | " do not show numbers by default, because that causes a performance loss, instead activate them on a file type basis
13set ignorecase smartcase | " search with ignore case by default, but use case sensitive search when one capital char is contained and highlight while typing (even though its slower) 13set ignorecase smartcase | " search with ignore case by default, but use case sensitive search when one capital char is contained and highlight while typing (even though its slower)
14set hlsearch incsearch | " highlight pattern while entering it (performance wise this isn't that good) 14set hlsearch incsearch | " highlight pattern while entering it (performance wise this isn't that good)
15" set cindent cinoptions+=(0 | " indent at parentheses 15" set cindent cinoptions+=(0 | " indent at parentheses
@@ -78,9 +78,9 @@ if has("multi_byte")
78 78
79 set listchars+=tab:▏\ | " 79 set listchars+=tab:▏\ | "
80 set listchars+=trail:· | " symbols used when using :set list (which displays non-printable chars) 80 set listchars+=trail:· | " symbols used when using :set list (which displays non-printable chars)
81 " set listchars+=eol:↲ | " symbols used when using :set list (which displays non-printable chars) 81 " set listchars+=eol:↲ | " symbols used when using :set list (which displays non-printable chars)
82 " set listchars+=space:· | " symbols used when using :set list (which displays non-printable chars) 82 " set listchars+=space:⸳ | " · | " symbols used when using :set list (which displays non-printable chars)
83 "set showbreak+=› | " symbol used in the beginning of a wrapped line 83 set showbreak+=› | " symbol used in the beginning of a wrapped line
84 84
85 " automatically enter list mode when going in insert mode (makes above syntax command temporarily ineffective) 85 " automatically enter list mode when going in insert mode (makes above syntax command temporarily ineffective)
86 set nolist 86 set nolist
@@ -100,7 +100,7 @@ end
100" SETTINGS: 100" SETTINGS:
101" ====================================================================================================================== 101" ======================================================================================================================
102set breakindent | " Every wrapped line will continue visually indented 102set breakindent | " Every wrapped line will continue visually indented
103set clipboard=unnamedplus | " makes copy and paste work (autoselectplus might work as well) 103" set clipboard=unnamedplus | " makes copy and paste work (autoselectplus might work as well)
104set concealcursor=nc | " limits the display of concealed text to normal and command mode 104set concealcursor=nc | " limits the display of concealed text to normal and command mode
105set conceallevel=2 | " replace escaped chars by their UTF-8 representation (useful for LaTeX) 105set conceallevel=2 | " replace escaped chars by their UTF-8 representation (useful for LaTeX)
106set confirm | " asks 'do you want to save?' 106set confirm | " asks 'do you want to save?'
@@ -125,7 +125,7 @@ set shiftround | " indent/un-indent snaps to multiple of shiftwid
125set writedelay=0 125set writedelay=0
126 126
127" display and performance 127" display and performance
128set lazyredraw | " disables redraw during macro execution (improves performance) 128set lazyredraw | " disables redraw during macro execution (improves performance, but causes problems with solid backgrounds)
129set cmdheight=2 | " sets the command line's height 129set cmdheight=2 | " sets the command line's height
130set signcolumn=auto | " auto=auto hide, yes=always, no=never show the column with error indicators 130set signcolumn=auto | " auto=auto hide, yes=always, no=never show the column with error indicators
131set nocursorcolumn | " turn visual cursor column off (improves performance) 131set nocursorcolumn | " turn visual cursor column off (improves performance)
@@ -156,7 +156,7 @@ set tags+=../tags
156" code folding... 156" code folding...
157set nofoldenable | " disable folding, because we have zi to toggle foldenable :) 157set nofoldenable | " disable folding, because we have zi to toggle foldenable :)
158set foldclose=all | " automatically fold, when the cursor leaves the folded area 158set foldclose=all | " automatically fold, when the cursor leaves the folded area
159set foldcolumn=2 | " I think I don't need this second indicator 159set foldcolumn=0 | " I think I don't need this second indicator
160" set numberwidth=5 160" set numberwidth=5
161" set foldmethod=syntax | " foldlevel: syntax, indent, manual / foldmethod=syntax makes Vim incredible slow 161" set foldmethod=syntax | " foldlevel: syntax, indent, manual / foldmethod=syntax makes Vim incredible slow
162set foldnestmax=1 | " top level folding only 162set foldnestmax=1 | " top level folding only
@@ -199,7 +199,6 @@ set nocursorline | " turn visual cursor line off (improves performa
199"======================================================================================================================= 199"=======================================================================================================================
200if has("autocmd") 200if has("autocmd")
201 " use the shada/viminfo file to return the cursor to where it was... 201 " use the shada/viminfo file to return the cursor to where it was...
202 autocmd BufReadPost * call setpos(".", getpos("'\""))
203 autocmd BufWinEnter * if &previewwindow | setlocal nonumber nolist signcolumn=no filetype=c nobuflisted | endif 202 autocmd BufWinEnter * if &previewwindow | setlocal nonumber nolist signcolumn=no filetype=c nobuflisted | endif
204 203
205 " Workaround: Allows Vim to yank text within wayland 204 " Workaround: Allows Vim to yank text within wayland
@@ -343,10 +342,10 @@ augroup KEYBOARD_MAPPING
343 342
344 " if the wildmenu is configured to to display suggestions vertically, then 343 " if the wildmenu is configured to to display suggestions vertically, then
345 " reconfigure the cursor keys to work in that direction 344 " reconfigure the cursor keys to work in that direction
346 if &wildoptions =~# 'pum' 345 " if &wildoptions =~# 'pum'
347 cnoremap <expr> <up> pumvisible() ? "<C-p>" : "\<up>" 346 " cnoremap <expr> <up> pumvisible() ? "<C-p>" : "\<up>"
348 cnoremap <expr> <down> pumvisible() ? "<C-n>" : "\<down>" 347 " cnoremap <expr> <down> pumvisible() ? "<C-n>" : "\<down>"
349 endif 348 " endif
350 349
351 350
352 " INSERT_MODE_MAPPINGS: 351 " INSERT_MODE_MAPPINGS:
diff --git a/ycm_extra_conf.py b/ycm_extra_conf.py
deleted file mode 100644
index 7a1828f..0000000
--- a/ycm_extra_conf.py
+++ /dev/null
@@ -1,21 +0,0 @@
1def FlagsForFile(filename, **kwargs):
2 return {
3 'flags': [
4 '-Wall',
5 '-Wextra',
6 '-Werror',
7 '-Wno-long-long',
8 '-Wno-variadic-macros',
9 '-fexceptions',
10 '-ferror-limit=10000',
11 '-DNDEBUG',
12 '-std=c99',
13 '-x', 'c',
14 '-D_GNU_SOURCE',
15 '-I.',
16 '-I', '/usr/include/'
17 ],
18 'do_cache': True,
19 }
20
21# vim:set et sw=4 ts=4 tw=120:
diff --git a/ycm_extra_mini-conf.py b/ycm_extra_mini-conf.py
deleted file mode 100644
index 0583c73..0000000
--- a/ycm_extra_mini-conf.py
+++ /dev/null
@@ -1,138 +0,0 @@
1# Generated by YCM Generator at 2017-02-03 00:22:04.774052
2
3# This file is NOT licensed under the GPLv3, which is the license for the rest
4# of YouCompleteMe.
5#
6# Here's the license text for this file:
7#
8# This is free and unencumbered software released into the public domain.
9#
10# Anyone is free to copy, modify, publish, use, compile, sell, or
11# distribute this software, either in source code form or as a compiled
12# binary, for any purpose, commercial or non-commercial, and by any
13# means.
14#
15# In jurisdictions that recognize copyright laws, the author or authors
16# of this software dedicate any and all copyright interest in the
17# software to the public domain. We make this dedication for the benefit
18# of the public at large and to the detriment of our heirs and
19# successors. We intend this dedication to be an overt act of
20# relinquishment in perpetuity of all present and future rights to this
21# software under copyright law.
22#
23# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
24# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
25# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
26# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
27# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
28# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
29# OTHER DEALINGS IN THE SOFTWARE.
30#
31# For more information, please refer to <http://unlicense.org/>
32
33import os
34import ycm_core
35
36flags = [
37 '-x',
38 'c',
39 '-Wall',
40]
41
42
43# Set this to the absolute path to the folder (NOT the file!) containing the
44# compile_commands.json file to use that instead of 'flags'. See here for
45# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html
46#
47# You can get CMake to generate this file for you by adding:
48# set( CMAKE_EXPORT_COMPILE_COMMANDS 1 )
49# to your CMakeLists.txt file.
50#
51# Most projects will NOT need to set this to anything; you can just change the
52# 'flags' list of compilation flags. Notice that YCM itself uses that approach.
53compilation_database_folder = ''
54
55if os.path.exists( compilation_database_folder ):
56 database = ycm_core.CompilationDatabase( compilation_database_folder )
57else:
58 database = None
59
60SOURCE_EXTENSIONS = [ '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ]
61
62def DirectoryOfThisScript():
63 return os.path.dirname( os.path.abspath( __file__ ) )
64
65
66def MakeRelativePathsInFlagsAbsolute( flags, working_directory ):
67 if not working_directory:
68 return list( flags )
69 new_flags = []
70 make_next_absolute = False
71 path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ]
72 for flag in flags:
73 new_flag = flag
74
75 if make_next_absolute:
76 make_next_absolute = False
77 if not flag.startswith( '/' ):
78 new_flag = os.path.join( working_directory, flag )
79
80 for path_flag in path_flags:
81 if flag == path_flag:
82 make_next_absolute = True
83 break
84
85 if flag.startswith( path_flag ):
86 path = flag[ len( path_flag ): ]
87 new_flag = path_flag + os.path.join( working_directory, path )
88 break
89
90 if new_flag:
91 new_flags.append( new_flag )
92 return new_flags
93
94
95def IsHeaderFile( filename ):
96 extension = os.path.splitext( filename )[ 1 ]
97 return extension in [ '.h', '.hxx', '.hpp', '.hh' ]
98
99
100def GetCompilationInfoForFile( filename ):
101 # The compilation_commands.json file generated by CMake does not have entries
102 # for header files. So we do our best by asking the db for flags for a
103 # corresponding source file, if any. If one exists, the flags for that file
104 # should be good enough.
105 if IsHeaderFile( filename ):
106 basename = os.path.splitext( filename )[ 0 ]
107 for extension in SOURCE_EXTENSIONS:
108 replacement_file = basename + extension
109 if os.path.exists( replacement_file ):
110 compilation_info = database.GetCompilationInfoForFile(
111 replacement_file )
112 if compilation_info.compiler_flags_:
113 return compilation_info
114 return None
115 return database.GetCompilationInfoForFile( filename )
116
117
118def FlagsForFile( filename, **kwargs ):
119 if database:
120 # Bear in mind that compilation_info.compiler_flags_ does NOT return a
121 # python list, but a "list-like" StringVec object
122 compilation_info = GetCompilationInfoForFile( filename )
123 if not compilation_info:
124 return None
125
126 final_flags = MakeRelativePathsInFlagsAbsolute(
127 compilation_info.compiler_flags_,
128 compilation_info.compiler_working_dir_ )
129
130 else:
131 relative_to = DirectoryOfThisScript()
132 final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )
133
134 return {
135 'flags': final_flags,
136 'do_cache': True
137 }
138
..