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 @@
-[submodule "pack/_all/start/vim-remote-menu"]
+[submodule "pack/submodules/vim-recently-used"]
-        path = pack/_all/start/vim-remote-menu
+        path = pack/submodules/start/vim-recently-used
-        url = https://github.com/coderonline/vim-remote-menu.git
+        url = https://git.entwicklerseite.de/vim-recently-used
-[submodule "pack/_all/start/base16-vim"]
+[submodule "pack/submodules/vim-karlmarks"]
-        path = pack/_all/start/base16-vim
+        path = pack/submodules/start/vim-karlmarks
-        url = https://github.com/chriskempson/base16-vim.git
+        url = http://git.entwicklerseite.de/vim-karlmarks
-[submodule "pack/_all/start/papercolor-theme"]
+[submodule "pack/submodules/vim-fancy-line"]
-        path = pack/_all/start/papercolor-theme
+        path = pack/submodules/start/vim-fancy-line
+        url = https://github.com/coderonline/vim-fancy-line
+[submodule "pack/submodules/vim-mercenary"]
+        path = pack/submodules/start/vim-mercenary
+        url = https://github.com/jlfwong/vim-mercenary
+[submodule "pack/submodules/start/vim-colorscheme-papercolor"]
+        path = pack/all/start/vim-colorscheme-papercolor
        url = https://github.com/NLKNguyen/papercolor-theme.git
-[submodule "pack/_all/opt/vim-signify"]
+[submodule "pack/submodules/start/vim-YouCompleteMe"]
-        path = pack/_all/opt/vim-signify
+        path = pack/submodules/opt/vim-youcompleteme
-        url = https://github.com/mhinz/vim-signify.git
-[submodule "pack/_all/start/vim-fugitive"]
-        path = pack/_all/start/vim-fugitive
-        url = https://github.com/tpope/vim-fugitive.git
-[submodule "pack/_all/start/tabular"]
-        path = pack/_all/start/tabular
-        url = https://github.com/godlygeek/tabular.git
-[submodule "pack/_all/opt/tagbar"]
-        path = pack/_all/opt/tagbar
-        url = https://github.com/majutsushi/tagbar.git
-[submodule "pack/_all/start/vim-surround"]
-        path = pack/_all/start/vim-surround
-        url = https://github.com/tpope/vim-surround.git
-[submodule "pack/_all/opt/nerdtree"]
-        path = pack/_all/opt/nerdtree
-        url = https://github.com/scrooloose/nerdtree.git
-[submodule "pack/_all/opt/vim-snippets"]
-        path = pack/_all/opt/vim-snippets
-        url = https://github.com/honza/vim-snippets.git
-[submodule "pack/neovim/opt/echodoc.vim"]
-        path = pack/_all/start/echodoc
-        url = https://github.com/Shougo/echodoc.vim.git
-[submodule "pack/neovim/opt/ale"]
-        path = pack/_all/opt/ale
-    url = https://github.com/dense-analysis/ale.git
-[submodule "pack/vim/opt/syntastic"]
-        path = pack/vim/opt/syntastic
-        url = https://github.com/vim-syntastic/syntastic.git
-[submodule "pack/_all/opt/jedi-vim"]
-        path = pack/_all/start/jedi-vim
-        url = https://github.com/davidhalter/jedi-vim.git
-[submodule "pack/_all/start/vim-operator-user"]
-        path = pack/_all/start/vim-operator-user
-        url = https://github.com/kana/vim-operator-user.git
-[submodule "pack/_all/opt/zeavim.vim"]
-        path = pack/_all/opt/zeavim.vim
-        url = https://github.com/KabbAmine/zeavim.vim
-[submodule "pack/vim/opt/YouCompleteMe.git"]
-        path = pack/_all/opt/YouCompleteMe
        url = https://github.com/Valloric/YouCompleteMe.git
-[submodule "pack/vim/opt/vimtex"]
+[submodule "pack/submodules/start/nvim-colorizer"]
-        path = pack/vim/opt/vimtex
+        path = pack/nvim/start/nvim-colorizer
-    url = https://github.com/lervag/vimtex
+        url = https://github.com/norcalli/nvim-colorizer.lua
-[submodule "pack/_all/start/vim-mediawiki-editor"]
+[submodule "pack/submodules/start/nvim-cmp"]
-        path = pack/_all/start/vim-mediawiki-editor
+        path = pack/nvim/start/nvim-cmp
-        url = https://github.com/aquach/vim-mediawiki-editor
+        url = https://github.com/hrsh7th/nvim-cmp
-[submodule "pack/coderonline/start/vim-recently-used"]
+[submodule "pack/submodules/start/nvim-lspconfig"]
-        path = pack/coderonline/start/vim-recently-used
+        path = pack/nvim/start/nvim-lspconfig
+        url = https://github.com/neovim/nvim-lspconfig
+[submodule "pack/submodules/start/nvim-cmp-nvim-lsp"]
+        path = pack/nvim/start/nvim-cmp-nvim-lsp
+        url = https://github.com/hrsh7th/cmp-nvim-lsp
+[submodule "pack/submodules/start/nvim-vsnip"]
+        path = pack/nvim/start/nvim-vsnip
+        url = https://github.com/hrsh7th/vim-vsnip
+[submodule "pack/submodules/start/vim-recently-used"]
+        path = pack/all/start/vim-recently-used
        url = https://git.entwicklerseite.de/vim-recently-used
-[submodule "pack/_all/start/deoplete-jedi"]
+[submodule "pack/submodules/start/vim-karlmarks"]
-        path = pack/_all/start/deoplete-jedi
+        path = pack/all/start/vim-karlmarks
-        url = https://github.com/deoplete-plugins/deoplete-jedi
-[submodule "pack/_all/start/deoplete-clang"]
-        path = pack/_all/start/deoplete-clang
-        url = https://github.com/deoplete-plugins/deoplete-clang
-[submodule "pack/_all/start/deoplete.nvim"]
-        path = pack/_all/start/deoplete.nvim
-        url = https://github.com/Shougo/deoplete.nvim.git
-[submodule "vim-karlmarks"]
-        path = vim-karlmarks
-        url = http://git.entwicklerseite.de/vim-karlmarks
-[submodule "pack/coderonline/start/vim-karlmarks"]
-        path = pack/coderonline/start/vim-karlmarks
        url = http://git.entwicklerseite.de/vim-karlmarks
+[submodule "pack/submodules/start/vim-fancy-line"]
+        path = pack/all/start/vim-fancy-line
+        url = https://github.com/coderonline/vim-fancy-line
+[submodule "pack/submodules/start/vim-mercenary"]
+        path = pack/all/start/vim-mercenary
+        url = https://github.com/jlfwong/vim-mercenary
+[submodule "pack/submodules/opt/vim-youcompleteme"]
+        path = pack/vim/opt/vim-youcompleteme
+        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 @@
-au! CursorHold *.[ch] nested call PreviewWord()
-func PreviewWord()
-  if &previewwindow                     " don't do this in the preview window
-    return
-  endif
-  let w = expand("<cword>")             " get the word under cursor
-  if w =~ '\a'                  " if the word contains a letter
-    " Delete any existing highlight before showing another tag
-    silent! wincmd P                    " jump to preview window
-    if &previewwindow                   " if we really get there...
-      match none                        " delete existing highlight
-      wincmd p                  " back to old window
-    endif
-    " Try displaying a matching tag for the word under the cursor
-    try
-       exe "ptag " . w
-    catch
-      return
-    endtry
-    silent! wincmd P                    " jump to preview window
-    if &previewwindow           " if we really get there...
-         if has("folding")
-           silent! .foldopen            " don't want a closed fold
-         endif
-         call search("$", "b")          " to end of previous line
-         let w = substitute(w, '\\', '\\\\', "")
-         call search('\<\V' . w . '\>') " position cursor on match
-         " Add a match highlight to the word at this position
-      hi previewWord term=bold ctermbg=green guibg=green
-         exe 'match previewWord "\%' . line(".") . 'l\%' . col(".") . 'c\k*"'
-      wincmd p                  " back to old window
-    endif
-  endif
-endfun
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 @@
-ScriptID SourceID Filename
--------------------------
-294 19633 :AutoInstall: Align.vim
-120 9388 Decho.vim
-40 21108 DrawIt.tar.gz
-451 9231 EasyAccents.vim
-195 6351 engspchk.vim
-642 15781 GetLatestVimScripts.vim
-489 16670 Manpageview.vim
-1066 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 @@
-    git submodule sync --recursive
-    git submodule update --remote
-    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 @@
+hi link Info NonText
+hi link Pass DiffAdd
+syn match ERROR   /TEST-UNEXPECTED-FAIL/
+syn match NonText /^\[[^\]]*\]/
+syn match NonText  /^ *\d\{1,2\}:\d\{1,2\}[.:]\d\{1,2\}[:0-9]*/
+syn match ErrorMsg / ERROR /
+syn match ErrorMsg / FAIL /
+syn match Error    / WARNING /
+syn match Info     / INFO / fold
+syn match Pass     / PASS / fold
+silent! lvimgrep /[^ ]* \(ERROR\|WARNING\|FAIL\) / %
+lopen 12
+" setlocal foldexpr=getline(v:lnum)=~'INFO'
+" setlocal foldmethod=expr
+" 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 @@
+" Custom conceal
+" syntax region todolist  start="^\s*[\+-\*x ]" end="\s" contained keepend
+syntax match markdownConceal "\[\ \]" contained conceal cchar= 
+syntax match markdownConceal "\[x\]"  contained conceal cchar=
+syntax match markdownConceal "*"      contained conceal cchar=
+syntax match markdownConceal "-"      contained conceal cchar=
+syntax match markdownConceal "+"      contained conceal cchar=
+syntax region 
+       \ markdownItemization
+       \ start="^\s*\(\[ \]\|[\+\-\*x]\)\s"
+       \ end="\s"
+       \ contains=markdownConceal
+hi def link markdownConceal Todo
+hi! 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 @@
-" color theme for vim
-" Maintainer:  Max Christian Pohle <max@coderonline.de>
-" Last Change: 07.09.2015
-" Web:         http://max.coderonline.de/
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="coderonline"
-"set guifont=Andale\ Mono\ 12
-set guifont=Liberation\ Mono\ Normal\ 11
-"set guifont=Meslo\ LG\ S\ DZ\ for\ Powerline\ 14
-"set guifont=Monospace\ 11
-"set guifont=DejaVu\ Sans\ Mono\ 11
-"set guifont=Liberation\ Mono\ for\ Powerline\ 11
-"set guifont=Envy\ Code\ R\ 11
-set number
-set hls
-highlight Menu         gui=none    cterm=none    term=none    guibg=white     ctermbg=white     guifg=black     ctermfg=black
-highlight Scrollbar    gui=none    cterm=none    term=none    guibg=white     ctermbg=white     guifg=black     ctermfg=black
-highlight Tooltip      gui=none    cterm=none    term=none    guibg=yellow    ctermbg=yellow    guifg=black     ctermfg=black
-highlight Normal       gui=none    cterm=none    term=none    guibg=white     ctermbg=white     guifg=black     ctermfg=black
-highlight! link NonText Normal
-highlight Statement    gui=bold    cterm=bold    term=bold    guibg=white     ctermbg=white     guifg=#0000ff   ctermfg=21
-highlight! link Boolean Statement
-highlight! link Identifier Statement
-highlight Type         gui=bold    cterm=bold    term=bold    guibg=white     ctermbg=white     guifg=DarkBlue  ctermfg=darkblue
-highlight Constant     gui=none    cterm=none    term=none    guibg=white     ctermbg=white     guifg=brown     ctermfg=brown
-highlight! link String Constant
-highlight! link Number Constant
-highlight Comment      gui=none    cterm=none    term=none    guibg=white     ctermbg=white     guifg=DarkGreen ctermfg=DarkGreen
-highlight! link PreProc Comment
-highlight StatusLine   gui=bold    cterm=bold    term=bold    guibg=lightgray ctermbg=lightgray guifg=darkgray ctermfg=darkgrey
-highlight! link StatusLineNC StatusLine
-highlight LineNr       gui=none    cterm=none    term=none    guibg=lightgray ctermbg=lightgray guifg=black ctermfg=black
-highlight CursorLine gui=none    cterm=none    term=none    guibg=lightgray ctermbg=lightgray 
-" highlight! link CursorLine LineNr
-" highlight! link CursorColumn LineNr
-" highlight! link ColorColumn LineNr 
-" Cursor                the character under the cursor
-highlight Cursor       gui=inverse cterm=inverse term=inverse guibg=lightgray ctermbg=lightgray guifg=black ctermfg=black
-highlight iCursor      gui=underline cterm=underline term=underline
-highlight! link CursorLineNr Cursor
-highlight! link CursorIM     Cursor
-highlight! link Visual       Cursor
-highlight! link VirualNOS    Cursor
-" highlight! link MatchParen   LineNr
-highlight MatchParen      guibg=yellow ctermbg=yellow
-" WildMenu      current match in 'wildmenu' completion
-" Pmenu         Popup menu: normal item.
-" PmenuSel      Popup menu: selected item.
-" PmenuSbar     Popup menu: scrollbar.
-" PmenuThumb    Popup menu: Thumb of the scrollbar.
-highlight! link WildMenu Todo
-highlight! link Popup LineNr
-highlight! link PMenu Popup
-highlight! link PMenuSel CursorLineNr
-highlight! link PMenuSbar CursorLineNr
-highlight! link PMenuThumb CursorLineNr
-" Windows
-highlight Title gui=bold cterm=bold term=bold guibg=lightgray ctermbg=lightgray guifg=darkgray ctermfg=darkgray
-highlight! link VertSplit Title
-highlight! link StatusLine Title 
-highlight! link StatusLineNC Title 
-highlight! link TabLine Title
-highlight! link TabLineFill TabLine
-highlight! link TabLineSel TabLine
-highlight TabLineSel gui=inverse cterm=inverse term=inverse
-highlight cParen      gui=none    cterm=none    term=none    guibg=white     ctermbg=white      guifg=orange    ctermfg=brown
-highlight cBlock      gui=none    cterm=none    term=none    guibg=white     ctermbg=cyan      guifg=orange    ctermfg=brown
-highlight vimParenSep gui=none    cterm=none    term=none    guibg=white     ctermbg=white      guifg=orange    ctermfg=brown
-highlight Special      gui=bold    cterm=bold    term=bold    guibg=white    ctermbg=white    guifg=black     ctermfg=178
-highlight! link SpecialKey Special
-highlight Todo        gui=none    cterm=none    term=none    guibg=yellow    ctermbg=yellow    guifg=black     ctermfg=black
-highlight! link ModeMsg Todo
-highlight! link MoreMsg Todo
-highlight! link ErrorMsg Todo
-highlight! link Conceal Todo
-highlight! link Directory Todo
-highlight Question    gui=bold    cterm=bold    term=bold    guibg=white      ctermbg=white      guifg=black     ctermfg=black
-highlight! link WarningMsg Question
-highlight SpellBad   gui=underline cterm=underline term=underline ctermbg=white
-highlight! link SpellCap SpellBad
-highlight! link SpellLocal Todo
-highlight! link SpellRare Todo 
-highlight!  EndOfBuffer  guibg=white
-"                                                         *hl-Conceal*
-"                                                         *hl-DiffAdd*
-" DiffAdd               diff mode: Added line |diff.txt|
-"                                                         *hl-DiffChange*
-" DiffChange    diff mode: Changed line |diff.txt|
-"                                                         *hl-DiffDelete*
-" DiffDelete    diff mode: Deleted line |diff.txt|
-"                                                         *hl-DiffText*
-" DiffText      diff mode: Changed text within a changed line |diff.txt|
-"                                                         *hl-ErrorMsg*
-" Folded                line used for closed folds
-"                                                         *hl-FoldColumn*
-" FoldColumn    'foldcolumn'
-"                                                         *hl-SignColumn*
-" SignColumn    column where |signs| are displayed
-"                                                         *hl-IncSearch*
-" IncSearch     'incsearch' highlighting; also used for the text replaced with
-"                 ":s///c"
-"                                                         *hl-LineNr*
-" MatchParen    The character under the cursor or just before it, if it
-"                 is a paired bracket, and its match. |pi_paren.txt|
-"
-"                                                         *hl-ModeMsg*
-"                                                         *hl-NonText*
-"                                                         *hl-Search*
-" Search                Last search pattern highlighting (see 'hlsearch').
-"                 Also used for highlighting the current line in the quickfix
-"                 window and similar items that need to stand out.
-"                                                         *hl-SpecialKey*
-"                 to show unprintable characters in the text, 'listchars'.
-"                 Generally: text that is displayed differently from what it
-"                 really is.
-"                                                         *hl-SpellBad*
-" ====================== Important bits ======================
-"exe 'hi Normal guifg='.s:white .' guibg='.s:darkgrey
-"exe 'hi String guifg='.s:green .' guibg='.s:darkgrey .' gui=bold'
-"exe 'hi Function guifg='.s:violet .' guibg='.s:darkgrey .' gui=none'
-"exe 'hi Operator guifg='.s:light_orange .' guibg='.s:darkgrey .' gui=none'
-"exe 'hi Type guifg='.s:yellow .' guibg='.s:darkgrey .' gui=bold'
-"exe 'hi Number guifg='.s:orange .' guibg='.s:darkgrey .' gui=none'
-"exe 'hi Constant guifg='.s:red .' guibg='.s:darkgrey .' gui=none'
-"exe 'hi Macro guifg='.s:magenta .' guibg='.s:darkgrey .' gui=none'
-"exe 'hi PreProc guifg='.s:grey_blue .' guibg='.s:darkgrey .' gui=none'
-"exe 'hi Keyword guifg='.s:light_orange .' guibg='.s:darkgrey .' gui=none'
-"exe 'hi Comment guifg='.s:white .' guibg='.s:darkgrey .' gui=italic'
-"exe 'hi TODO guifg='.s:grey_blue .' guibg='.s:darkgrey .' gui=italic,bold'
-" Lay out our palette
-let s:grey_blue = '#8a9597'
-let s:light_grey_blue = '#a0a8b0'
-let s:dark_grey_blue = '#34383c'
-let s:mid_grey_blue = '#64686c'
-let s:beige = '#ceb67f'
-let s:light_orange = '#ebc471'
-let s:yellow = '#e3d796'
-let s:violet = '#a982c8'
-let s:magenta = '#a933ac'
-let s:green = '#e0a96f'
-let s:lightgreen = '#c2c98f'
-let s:red = '#d08356'
-let s:cyan = '#74dad9'
-let s:darkgrey = '#1a1a1a'
-let s:grey = '#303030'
-let s:lightgrey = '#605958'
-let s:white = '#fffedc'
-let s:orange = '#d08356'
-" ~~~ These are specific to color_coded ~~~
-exe 'hi Member       guifg=#0000aa gui=italic'
-exe 'hi Variable     guifg=#8800aa gui=none'
-exe 'hi Namespace    guifg=#aa0000 gui=none'
-exe '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 @@
-nelstrom/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 @@
-# INSTALL
-# this should briefly show you how to install this bundle
-# [required steps]
-# Download the current version using git (probably you already have!)
-git clone http://git.entwicklerseite.de/vim ~/.vim
-# Get the required submodule(s)
-git submodule update --init --recursive
-# start vim for the first time and use the plugin manager to install required plugins
-vim -c ":PlugInstall"
-# build YouCompleteMe
-cd ~/.vim/plugged/YouCompleteMe
-python ./install.py --clang-completer
-# [optional steps]
-# create a symbolic link to the downloaded vim.rc in you $HOME-directory
-ln -s ~/.vim/vimrc ~/.vimrc
-# gvim: make menu bar more fancy
-ln -s ~/.vim/gtk-3.0.css ~/.config/gtk-3.0/gtk.css
-# if you do not have working gvim start menu entries, try:
-ln -s ~/.vim/gvim-tab.desktop ~/.local/share/applications/
-update-desktop-database       ~/.local/share/applications/
-# Thunar file manager specific: create an entry in the sendto menu...
-mkdir -p                      ~/.local/share/Thunar/sendto/
-ln -s ~/.vim/gvim-tab.desktop ~/.local/share/Thunar/sendto/
-# [random/unfinished stuff]
-# download plugins and spell file for your language
-# vim -c ":set spell"
-# vim +set\ spell # < maybe that works as well
-# :call spellfile#LoadFile(expand("de"))
-# 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 @@
-git submodule -q foreach git pull -q origin master
-In Vim:
-: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 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-# C extensions
-*.so
-# Distribution / packaging
-bin/
-build/
-develop-eggs/
-dist/
-eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-# Unit test / coverage reports
-.tox/
-.coverage
-.cache
-nosetests.xml
-coverage.xml
-# Translations
-*.mo
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-# Rope
-.ropeproject
-# Django stuff:
-*.log
-*.pot
-# Sphinx documentation
-docs/_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 @@
-for s in sort(getcompletion('', 'function'))
-    echo getcompletion(s, 'function')
-endfor
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 @@
-set nocompatible
-filetype plugin indent on
-set omnifunc=syntaxcomplete#Complete
-syntax on
-set ts=2 sw=2 expandtab
-set ignorecase smartcase
-set hidden
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 @@
-set nocompatible
-filetype plugin indent on
-set omnifunc=syntaxcomplete#Complete
-syntax on
-set ts=2 sw=2 expandtab
-set ignorecase smartcase
-set hidden
-let g:status_fg="#ffffff"
-let g:status_bg="#000000"
-let g:status_sel='#ffff00'
-execute 'highlight! StatusLine'
-      \ .' guibg='.g:status_sel
-      \ .' guifg=NONE'
-execute 'highlight! User1 guibg='.g:status_bg
-execute 'highlight! User1 guifg='.g:status_fg
-execute 'highlight! User2 guibg='.g:status_sel
-execute 'highlight! User2 guifg='.g:status_bg
-colorscheme 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 @@
-" vi:columns=160:list:ts=2:sts=2:sw=2
-"================================================================================
-" Vundle: plugin manager...
-set nocompatible                                      | " do not try to be vi, be vim (required by Vundle)
-filetype off                                          | " Vundle needs this
-set rtp+=~/.vim/bundle/Vundle.vim                    | " set runtimepath (required by Vundle)
-call vundle#begin('~/.vim/bundle/')                  | " location where Vundle searches&installs plugins
-" Plugin dependant configurations...
-Plugin 'tpope/vim-sensible'                           | " a sane and modern default configuration 
-Plugin 'tpope/vim-fugitive'                           | " the most complete GIT integration plugin
-Plugin 'tpope/vim-surround'                           | " plugin makes cs"' inside a line replace " with '
-Plugin 'tpope/vim-repeat'                             | " lets . (dot) repeat plugin macros as well, specifically vim-surround
-Plugin 'tpope/vim-vinegar'                            | " Improves :Explore
-Plugin 'tpope/vim-characterize'                       | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values)
-Plugin 'tpope/vim-vividchalk'                         | " dark theme
-Plugin 'nelstrom/vim-mac-classic-theme'               | " light theme
-Plugin 'Valloric/YouCompleteMe'                       | " syntax checker and code completion
-Plugin 'cscope_plus.vim'                              | " run cscope -R -b in project folder then use
-Plugin 'autoload_cscope.vim'                          | " CTRL+\ s searches word under cursor, CTRL+T back
-Plugin 'jeaye/color_coded'                            | " semantic highlighting with vim
-Plugin 'terryma/vim-multiple-cursors'                 | " displays visual block mode as cursors
-Plugin 'taglist-plus'                                 | " quick code navigator
-Plugin 'jdonaldson/vaxe'                              | " code completion for haxe
-Plugin 'sheerun/vim-polyglot'                         | " better syntax highlighting/indentation for multiple languages
-Plugin 'loremipsum'                                   | " Sample text generator
-Plugin 'vim-airline/vim-airline'                      | " beautification of the mode line
-Plugin 'nathanaelkane/vim-indent-guides'              | " shows indentation guidelines by pressing <leader>ig 
-Plugin 'gregsexton/matchtag'                          | " highlights closing ML tags like braces 
-Plugin 'indenthtml.vim'                               | " works better with mixed html/css/javascript
-Plugin 'easymotion/vim-easymotion'                    | " speed up navigation: try \\w or \\f, then one of the highlighted chars
-Plugin 'Shougo/vimproc.vim'
-Plugin 'Shougo/vimshell.vim'
-Plugin 'jeetsukumaran/vim-buffergator'                | " switch buffers with \b or <\-Left> <\-Right>
-let g:airline_powerline_fonts = 1
-let Tlist_Compact_Format = 1                          | "
-let Tlist_GainFocus_On_ToggleOpen = 1                 | "
-let Tlist_Close_On_Select = 1                         | "
-Plugin 'VundleVim/Vundle.vim'                         | " Vundle itself (required)
-let g:ycm_global_ycm_extra_conf = '~/.vim/ycm_extra_conf.py' | " fallback, right one should be in the applications path
-let g:ycm_confirm_extra_conf = 0                      | " disable 'do you really want to execute .py?'
-let g:ycm_key_select_completion = '<Tab>'             | " key completion key
-let g:ycm_error_symbol = '✖'                          | " insert this as an error symbol in the gutter bar
-let g:ycm_warning_symbol = '➔'                        | " insert this as a warning symbol in the gutter bar
-let g:ycm_collect_identifiers_from_tags_files = 1     | "
-let g:ycm_autoclose_preview_window_after_insertion=1  | " close the window when leaving insert mode
-"let g:ycm_semantic_triggers = {'c' : ['(', ',']}     | " add additional triggers (not recommend)
-let b:html_omni_flavor='xhtml'                        | " prever xhtml over html because that makes inline php code possible without hassle
-let html_use_css = 1                                  | " when using :TOhtml no font-tags will be used, but proper css
-let g:vim_markdown_folding_disabled=1                 | " disable code folding with vimdiff (also see set nofoldenable)
-let g:netrw_liststyle=3                               | " Explore mode: 3 shows a complete tree instead of the current directory
-let g:netrw_list_hide='^\..*'                         | " Explore mode: hide files starting with dot
-" speed up CTRL-P Menu...
-let g:ctrlp_user_command = 'ag %s -i --nocolor --nogroup --hidden
-      \ --ignore .git
-      \ --ignore .svn
-      \ --ignore .hg
-      \ --ignore .DS_Store
-      \ --ignore "**/*.pyc"
-      \ -g ""'
-call vundle#end()             | " required by Vundle
-filetype plugin indent on     | " required by Vundle
-"================================================================================ 
-" custom config
-colorscheme mac_classic
-" colorscheme coderonline
-syntax enable
-set noswapfile                | " noundofile, nobackup, nowritebackup
-set backupdir=~/.vim/temp     | " using :set backup will copy current file to this directory
-set directory=~/.vim/temp     | " 
-set undodir=~/.vim/temp       | " 
-set ts=2 sts=2 sw=2 expandtab | " indentation which i like (abbr: tabstop, softtabstop, shiftwidth)
-set autoindent                | " always set autoindenting on
-set autochdir                 | " change to the current files working dir (might break some plugins!)
-set copyindent                | " copy the previous indentation on autoindenting
-set scrolloff=2               | " always keeps at least two lines visible (when seeking)
-" set selectmode=mouse          | " avoid using select mode (only with mouse)
-set mousemodel=popup_setpos   | " display a default right click menu for the selection (that is c&p is possible)
-set selection=exclusive       | " includes last character of the selection into following command (like x or d)
-set whichwrap=b,s,<,>,[,]     | " beyond beginning/end line causes cusor to wrap
-set backspace=indent,eol,start| " allow backspacing over everything in insert mode, not needed with whichwrap
-set diffopt+=vertical,iwhite,filler    | " lets diff ignore white spaces
-set spell spelllang=en,de     | " enable spell checker
-set virtualedit=onemore       | " one character beyond the line length should be navigatable (options: all,insert,block,onemore)
-set breakindent cpoptions+=n  | " when wrapping lines indent wrapped line to align with the previews
-set linebreak                 | " do not wrap in the middle of words
-set display+=lastline         | " do not show the @ symbol in the end of a long line
-set showcmd                   | " displays status line messages while selecting (matrix size)
-set nofoldenable              | " do not fold code automatically
-set tags+=~/.vim/systags      | " ctags -R -f ~/.vim/systags /usr/include /usr/local/include
-set wildmenu wildmode=full    | " wildmenu code completion
-set guifont="Droid Sans Mono for Powerline 10"
-" search...
-set ignorecase smartcase      | " if search pattern contains uppercase then search is case sensitive
-set incsearch                 | " do incremental searching
-set showmatch matchtime=4     | " blinks matching braces
-set novisualbell              | " don't beep
-set noerrorbells              | " don't beep
-set clipboard=unnamedplus     | " makes copy and paste work (autoselectplus might work as well)
-set number                    | " toggle line numbers
-set formatprg=par             | " set external formatting program to par, use gwip to format with this
-set laststatus=2              | " this is required for airline
-set cmdheight=1               | " controls how many lines the command line has
-set relativenumber            | " displays current lines line no as zero point from where relative numbers are getting counted
-set timeoutlen=500            | " time between keys e.g. 80i=
-set ttimeoutlen=10            | " set esc key timeout in ms 
-set splitbelow                | " open new windows below the current one (i find that more intuitive)
-if has("multi_byte")
-  set encoding=utf-8          | " we need default utf-8 encoding to use cool chars as line break and so on (see below)
-  scriptencoding utf-8        | " tell vim that we are using utf-8 here
-  set showbreak+=›            | " symbol used in the beginning of a wrapped line
-  set listchars=eol:↲         | " symbols used when using :set list (which displays non-printable chars)
-  set listchars+=trail:·      | " symbols used when using :set list (which displays non-printable chars)
-  set listchars+=precedes:«   | " symbols used when using :set list (which displays non-printable chars)
-  set listchars+=extends:»    | " symbols used when using :set list (which displays non-printable chars)
-  set listchars+=tab:▸\       | " symbols used when using :set list (which displays non-printable chars)
-endif
-if has("autocmd")
-  set modeline                | " set variables specific to a file, like indentation by adding a comment
-  set modelines=3             | " how many lines in the beginning and end of the file can be mode lines?
-  augroup resCur              | " make cursor appear in its previous position when reopening a file...
-    autocmd BufReadPost * call setpos(".", getpos("'\""))
-  augroup END
-  augroup PreviewOnBottom     | " will open new windows below the current (only in insert mode, so that the preview window is drawn below)
-    autocmd InsertEnter * set splitbelow
-    autocmd InsertLeave * set splitbelow!
-  augroup END
-  augroup OmniFunc            | " this will enable omnicomplete just in case this configuration runs somewhere, where YouCompleteMe is not compiled
-    if exists("+omnifunc")
-      autocmd Filetype *
-            \   if &omnifunc == "" |
-            \   setlocal omnifunc=syntaxcomplete#Complete |
-            \   setlocal completeopt=longest,menuone |
-            \   endif
-      autocmd FileType html set omnifunc=htmlcomplete#CompleteTags
-    endif
-  augroup END
-  autocmd FileType text setlocal textwidth=78  | " text files: set 'textwidth' to 78
-  autocmd FileType gitcommit set tw=72         | " longer commit messages without auto line wrapping
-  autocmd FileType LaTeX let g:tex_flavor = "latex"| set conceallevel=1| set concealcursor=
-  autocmd BufNewFile,BufReadPost *.config set filetype=xml | " visual studio config file
-  autocmd BufNewFile,BufReadPost *.csproj set filetype=xml | " visual studio project file
-  autocmd BufNewFile,BufReadPost *.sln set filetype=xml    | " visual studio solution file
-endif
-"================================================================================ 
-" gui stuff and appearance
-if &t_Co > 2
-  set hlsearch               | " highlight all search matches
-  set cursorline             | " highlight currently selected line
-endif
-if has("gui_running")
-  set mouse=a                   | " use mouse in gui-mode (which is default)
-  set mouseshape+=n:beam,v:beam | " display a text input cursor even in normal and selection mode
-  set guicursor=n-v-c:ver20-Cursor-blinkon500-blinkoff500  | " how the caret looks like
-  set guitablabel=%t            | " do not display full path as tabname
-  set guioptions+=m             | " menu bar
-  set guioptions-=T             | " toolbar
-  set guioptions+=r             | " right-hand scroll bar
-  set guioptions-=c             | " use console dialogs instead of popups
-  set guioptions+=a             | " autoselect: copy&paste using middleclick
-  set guioptions+=e             | " add tab pages
-  set guioptions+=p             | " use gui pointer callback for x11 
-  set toolbariconsize=large     | " make the icon toolbar as big as possible
-  "set columns=80               | " set initial window width (so that it fits the terminals)
-else
-  if &term =~? 'mlterm\|xterm\|screen'
-    set t_Co=256                | " fixes incompatibilities with our color scheme
-  endif
-  set mouse=nh                  | " limits mouse usage to normal mode and help files, so that middle click text insertion works in insert mode
-  set title                     | " set the terminal caption
-  set icon                      | " sets the terminal icon to vim
-  set ttyfast                   | " modern terminals are all fast in a way
-  "set titleold="vim ended"      | " set terminal title after closing vim
-  "set titlestring="VIM-CONSOLE" | " set window title
-  "if has('mouse')
-  "endif
-endif
-"================================================================================ 
-" custom commands...
-"
-" assign selection keys (these i missed a lot)
-nmap <S-Left> vh|                      " shift-left selects to the left
-xmap <S-Left> h|                       " ^^
-nmap <S-Right> vl|                     " shift-right selects to the right
-xmap <S-Right> l|                      " ^^
-nmap <S-Up> vk|                        " shift-up selects like other text editors
-xmap <S-Up> k|                         " ^^
-nmap <S-Down> vj|                      " shift down selects like other text editors
-xmap <S-Down> j|                       " ^^
-nmap <Home> ^|                         " default homing in code editors is the first letter of a line
-xmap <Home> 0|                         " go to the beginning of the line
-xmap <S-Home> 0|                       " ^^
-xmap <Tab> >gv|                        " indent lines (and retain selection)
-xmap <S-Tab> <gv|                      " unindent lines (and retain selection)
-nmap <S-PageUp> VH|                    " selects predessing paragraph 
-nmap <S-PageDown> VL|                  " selects following paragraph
-nmap <C-S-PageUp> V{|                  " selects predessing paragraph 
-nmap <C-S-PageDown> V}|                " selects following paragraph
-nmap <C-o> :24vs.<CR>|                 " means the same as :vsplit. and opens the :Exlore -window with a width of 24
-map <C-h> <C-w>h|map <C-j> <C-w>j|     " window navigation shortcuts
-map <C-k> <C-w>k|map <C-l> <C-w>l|     " window navigation shortcuts
-cmap w!! w !sudo tee % >/dev/null|     " write :w!! to execute :w as root user
-" custom hotkeys... 
-nnoremap <C-Tab> :tabnext<CR>|         " lets one use CTRL+Tab to switch between tabs
-nnoremap <C-S-Tab> :tabprevious<CR>|   " use CTRL+Shift+Tab to switch to preview tab
-nnoremap j gj|nnoremap k gk|           " do not jump over wrapped lines
-nnoremap $ g$|                         " and make the $ key position the cursor after the last char of that line, not before
-nnoremap <End> g$|                     " and make the <End> key position the cursor after the last char of that line
-" function ExtendedHome()
-"     let column = col('.')
-"     normal! ^
-"     if column == col('.')
-"         normal! 0
-"     endif
-" endfunction
-" noremap <silent> <Home> :call ExtendedHome()<CR>
-nnoremap <C-z> u
-"map <C-Right>        el
-"map <C-left>         hgel
-"vnoremap <C-S-Right> e
-"vnoremap <C-S-left>  b
-" plugin hotkeys
-map <C-l> :TlistToggle<CR>|       " bind TagList to Hotkey Ctrl+L
-inoremap <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)
-set makeprg=make\ test
-nnoremap <F5> :!make<CR>|              " classic key binding: press F5 to compile and execute (if you have a Makefile with make test doing that)
-"================================================================================
-" deactivated on-demand commands (just in case one needs them one day)
-"
-" code completion: http://vim.wikia.com/wiki/Make_Vim_completion_popup_menu_work_just_like_in_an_IDE
-" reacts on CTRL+P, CTRL+Space
-"inoremap <expr> <CR>       pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
-"inoremap <expr> <CR>       pumvisible() ? "\<C-y>" : "\<CR>"
-"inoremap <expr> <Down>     pumvisible() ? "\<C-n>" : "\<Down>"
-"inoremap <expr> <Up>       pumvisible() ? "\<C-p>" : "\<Up>"
-"inoremap <expr> <PageDown> pumvisible() ? "\<PageDown>\<C-p>\<C-n>" : "\<PageDown>"
-"inoremap <expr> <PageUp>   pumvisible() ? "\<PageUp>\<C-p>\<C-n>" : "\<PageUp>"
-" set guiheadroom=0| " do not fill non-functional area of the empty editor with gtk background
-" map shift-right to visually select and so on
-"nnoremap <C-Right> El
-"nnoremap <S-Right> vl
-"nnoremap <S-Left> vj
-"nnoremap <S-Up> vk
-"nnoremap <S-Down> vj
-" noremap % v% " jump between braces and highlight
-"nnoremap <Home> ^
-"vmap <Home> ^
-"nnoremap <End> $
-"vmap <End> $
-"nnoremap <C-Tab> <C-PageDown>
-"nnoremap <C-S-Tab> <C-PageUp>
-":inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
-"inoremap <expr> <Esc>      pumvisible() ? "\<C-e>" : "\<Esc>" " breaks cursor keys!
-" binding ESC can easily break cursor key movement on the console (tricky, because gvim works)
-"inoremap <C-Space> <C-x><C-o>
-"inoremap <C-@> <C-Space>
-"
-"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 @@
-setlocal equalprg=clang-format
-setlocal breakat-=-
-setlocal keywordprg=man\ 3
-setlocal makeprg=make\ %:r
-setlocal cindent cinoptions+=(0        | " indent at parentheses
-" map <buffer> = :pyfile /usr/share/clang/clang-format.py<CR>
-let c_space_errors=1
-let c_gnu=1
-hi! cConstant gui=italic
-hi! cConditional gui=italic
-hi! 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 @@
-let 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 @@
-let g:load_doxygen_syntax=1
-syntax 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 @@
-" I will never get used to press CTRL-] to follow a link, never!
-nnoremap <buffer> <CR> <C-]>
-nnoremap <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 @@
-set makeprg=javac\ -Xdiags:verbose\ %
-set 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 @@
- 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 @@
-let &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 @@
-" highlight double words (its unlikely they are right)
-autocmd InsertLeave * syntax match Convention /\v<(\w+)\_s+\1>/ containedin=ALL
-set autoindent nosmartindent nocindent
-set formatoptions+=n " When formatting text, recognize numbered lists.
-set formatoptions+=1 " do not break after a one letter word
-" set formatoptions+=p " Don't break lines at single spaces that follow periods.
-set formatoptions+=aw " Automatic formatting of paragraphs (w=only if space in the end)
-set noexpandtab
-set spell
-set complete+=kspell
-inoremap <C-Space> <C-n>
-" nnoremap <c-s> :normal <c-n>
-" 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 @@
-" ======================================================================================================================
-" GUI_DEFAULTS:
-" We want to have a minimal UI
-" ======================================================================================================================
-if has("gui_running")
-  set guicursor=a:block-blinkon100
-  set browsedir=buffer
-  set toolbar+=text
-  set guiheadroom=0
-  set guioptions+=eig
-  set guioptions-=T   | " toolbar
-  set guioptions+=c   | " use console dialogues instead of popups
-  set guioptions+=a   | " auto select: copy&paste using middle click
-  set guioptions+=m   | " remove menu
-  set guioptions-=e   | " do not display tabs
-  set guioptions-=L   | " do not show left scrollbar
-  set guioptions-=r   | " do not show right scrollbar
-  set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped)
-  " set selectmode=mouse,key,cmd  | " enters vim's select mode when pressing shift-left or shift-END
-  " set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text
-  set background=light
-  " its possible to define alternative fonts (order matters), but we will
-  " use the systems default font and cofigure that if necessary
-  set guifont=Monospace\ 10
-  " like in the terminal: use Ctrl-shift-v for paste in vim's command editor
-  cnoremap <c-s-v> <c-r>*
-endif
diff --git a/indent/.keep b/indent/.keep
deleted file mode 100644
index f8e463a..0000000
--- a/indent/.keep
+++ /dev/null
@@ -1 +0,0 @@
-this 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 @@
+vim.cmd('set termguicolors')
+vim.cmd('source ~/.vim/vimrc')
+require'man'
+require'colorizer'.setup()
+-- language servers:
+--   https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
+-- C/C++ | clang
+require'lspconfig'.clangd.setup{}
+-- lua
+require'lspconfig'.sumneko_lua.setup{
+    settings = {
+        Lua = {
+            diagnostics = {
+                globals = { 'vim' }
+            }
+        }
+    }
+}
+-- bash | bash-language-server
+require'lspconfig'.bashls.setup{}
+-- ccs | vscode-css-languageserver
+require'lspconfig'.cssls.setup{}
+-- rust | rust-analyzer
+require'lspconfig'.rust_analyzer.setup{}
+-- javascript | eslint
+require'lspconfig'.eslint.setup{}
+-- javascript | typescript-language-server
+require'lspconfig'.tsserver.setup{}
+-- vimscript | vim-language-server
+require'lspconfig'.vimls.setup{}
+require'lspconfig'.html.setup{}
+require'lspconfig'.jsonls.setup{}
+require'lspconfig'.pylsp.setup{
+  settings = {
+    pylsp = {
+      plugins = {
+        pycodestyle = {
+          ignore = {'W391'},
+          maxLineLength = 100
+        }
+      }
+    }
+  }
+}
+require'cmp_nvim_lsp'.setup{}
+require'cmp'.setup {
+  sources = {
+    { name = 'nvim_lsp' }
+  }
+}
+-- -- The nvim-cmp almost supports LSP's capabilities so You should advertise it to LSP servers..
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+-- 
+-- -- The following example advertise capabilities to `clangd`.
+require'lspconfig'.clangd.setup {
+capabilities = capabilities,
+}
+-- Set up nvim-cmp.
+local cmp = require'cmp'
+cmp.setup({
+  snippet = {
+  -- REQUIRED - you must specify a snippet engine
+  expand = function(args)
+  vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+  -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+  -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
+  -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+  end,
+  },
+  window = {
+    completion = cmp.config.window.bordered(),
+    documentation = cmp.config.window.bordered(),
+  },
+  mapping = cmp.mapping.preset.insert({
+  ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+  ['<C-f>'] = cmp.mapping.scroll_docs(4),
+  ['<C-Space>'] = cmp.mapping.complete(),
+  ['<C-e>'] = cmp.mapping.abort(),
+  -- ['<CR>'] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+  ["<CR>"] = cmp.mapping.confirm({
+    behavior = cmp.ConfirmBehavior.Replace,
+    select = true,
+  }),
+  ['<C-s>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+  }),
+  sources = cmp.config.sources({
+  { name = 'nvim_lsp' },
+  { name = 'vsnip' }, -- For vsnip users.
+  -- { name = 'luasnip' }, -- For luasnip users.
+  -- { name = 'ultisnips' }, -- For ultisnips users.
+  -- { name = 'snippy' }, -- For snippy users.
+  }, {
+  { name = 'buffer' },
+  })
+})
+-- Set configuration for specific filetype.
+cmp.setup.filetype('gitcommit', {
+sources = cmp.config.sources({
+{ name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
+}, {
+{ name = 'buffer' },
+})
+})
+-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline({ '/', '?' }, {
+mapping = cmp.mapping.preset.cmdline(),
+sources = {
+{ name = 'buffer' }
+}
+})
+-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline(':', {
+mapping = cmp.mapping.preset.cmdline(),
+sources = cmp.config.sources({
+{ name = 'path' }
+}, {
+{ name = 'cmdline' }
+})
+})
+-- -- Set up lspconfig.
+-- local capabilities = require('cmp_nvim_lsp').default_capabilities()
+-- -- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
+-- -- require('lspconfig')['<YOUR_LSP_SERVER>'].setup {
+-- -- }
+-- 
+-- -- C/C++ | clang
+-- require'lspconfig'.clangd.setup{capabilities = capabilities}
+-- 
+-- -- bash | bash-language-server
+-- require'lspconfig'.bashls.setup{capabilities = capabilities}
+-- 
+-- -- ccs | vscode-css-languageserver
+-- require'lspconfig'.cssls.setup{capabilities = capabilities}
+-- 
+-- -- rust | rust-analyzer
+-- require'lspconfig'.rust_analyzer.setup{capabilities = capabilities}
+-- 
+-- -- javascript | eslint
+-- require'lspconfig'.eslint.setup{capabilities = capabilities}
+-- 
+-- -- javascript | typescript-language-server
+-- require'lspconfig'.tsserver.setup{capabilities = capabilities}
+-- 
+-- -- vimscript | vim-language-server
+-- require'lspconfig'.vimls.setup{capabilities = capabilities}
+-- 
+-- require'lspconfig'.html.setup{capabilities = capabilities}
+-- 
+-- require'lspconfig'.jsonls.setup{capabilities = capabilities}
+-- 
diff --git a/init.vim b/init.vim
deleted file mode 100644
index 40894af..0000000
--- a/init.vim
+++ /dev/null
@@ -1,80 +0,0 @@
-exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common'
-set packpath+=pack/neovim
-"=======================================================================================================================
-augroup DEOPLETE
-    inoremap <silent><expr> <C-Space>    deoplete#mappings#manual_complete()
-    let g:deoplete#enable_at_startup     = 1
-    let g:echodoc#enable_at_startup      = 1
-    let g:LanguageClient_serverCommands  = {
-                \ 'cpp': ['clangd'],
-                \ 'c': ['clangd']
-                \ }
-    let g:LanguageClient_diagnosticsDisplay = {
-                \     1: {
-                \         "name": "Error",
-                \         "texthl": "ALEError",
-                \         "signText": "✖",
-                \         "signTexthl": "ALEErrorSign",
-                \     },
-                \     2: {
-                \         "name": "Warning",
-                \         "texthl": "ALEWarning",
-                \         "signText": "⚠",
-                \         "signTexthl": "ALEWarningSign",
-                \     },
-                \     3: {
-                \         "name": "Information",
-                \         "texthl": "ALEInfo",
-                \         "signText": '🛈',
-                \         "signTexthl": "ALEInfoSign",
-                \     },
-                \     4: {
-                \         "name": "Hint",
-                \         "texthl": "ALEInfo",
-                \         "signText": "➤",
-                \         "signTexthl": "ALEInfoSign",
-                \     },
-                \ }
-    " packadd deoplete.nvim
-    " packadd LanguageClient-neovim
-    " packadd echodoc.vim
-    let g:deoplete#sources#clang#include_default_arguments=1
-    " suggestions in alphabetic order
-    function! ConfigureDeoplete()
-        call deoplete#custom#source('_', 'sorters', ['sorter_word'])
-        call deoplete#custom#filter('converter_reorder_attr',
-                                   \  'attrs_order', {
-                                   \    '_': {
-                                   \      'kind': [
-                                   \        'Function',
-                                   \        'Property'
-                                   \      ]
-                                   \   },
-                                   \})   
-    endfunction
-    autocmd VimEnter * call ConfigureDeoplete() 
-augroup END
-"=======================================================================================================================
-augroup ALE
-    let g:ale_set_highlights    = 0
-    let g:ale_sign_error        = ''
-    let g:ale_sign_style_error  = ''
-    let g:ale_sign_info         = '🛈'
-    let g:ale_sign_warning      = ''
-    highlight link ALEErrorSign    LineNr
-    highlight link ALEWarningSign  LineNr
-    packadd ale
-augroup END
diff --git a/install.sh b/install.sh
deleted file mode 100755
index bc8a868..0000000
--- a/install.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/env bash
-# Welcome to Vimax!
-THIS_DIR=$(dirname $(realpath $0))
-pushd .
-# Change to this files directory
-cd $THIS_DIR
-# Fetch dependencies (git submodules)...
-awk '/path = (.*)/{PATH=$3;next} /url = /{URL=$3;next} URL{system("git submodule add " URL " " PATH)}' .gitmodules
-git submodule update --init --remote --progress --recursive
-# compile YouCompleteMe
-# dependencies: python-certifi
-cd $THIS_DIR/pack/vim/opt/YouCompleteMe
-./install.py --clang-completer
-popd
diff --git a/pack/.empty b/pack/.empty
deleted file mode 100644
index c381d32..0000000
--- a/pack/.empty
+++ /dev/null
@@ -1 +0,0 @@
-We 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 @@
-We 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 @@
-We 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 @@
-We 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 @@
-We 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 @@
-let g:ale_pattern_options = {'\.py$': {'ale_enabled': 1}}
-let g:ale_linters = {'python': ['pycodestyle'] }
-let g:ale_fixers =
-    \ {
-    \   'python': ['black', 'isort', 'remove_trailing_lines', 'trim_whitespace'],
-    \   'bash': ['remove_trailing_lines', 'trim_whitespace']
-    \ }
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 @@
-"=======================================================================================================================
-" CSCOPE: http://vim.wikia.com/wiki/Cscope
-"=======================================================================================================================
-augroup MAX_CSCOPE
-    if has('cscope') " compiled with cscope support?
-        set cscopetag  " CTRL-] uses cscope first, then ctags
-        set cscopeverbose
-        if has('quickfix')
-            set cscopequickfix=s+,c+,d+,i+,t+,e+
-        endif
-        if has('menu')
-            1001menu &Cscope.find.c\ symbol
-                        \<tab>s
-                        \ :cscope find s <cword><:cR>
-            1001menu &Cscope.find.definition
-                        \<tab>g
-                        \ :cscope find g <cword><:cR>
-            1001menu &Cscope.find.functions\ called\ by\ this
-                        \<tab>d
-                        \ :cscope find d <cword><:cR>
-            1001menu &Cscope.find.functions\ calling\ this
-                        \<tab>c
-                        \ :cscope find c <cword><:cR>
-            1001menu &Cscope.find.text\ string
-                        \<tab>t
-                        \ :cscope find t <cword><:cR>
-            1001menu &Cscope.find.egrep\ pattern
-                        \<tab>e
-                        \ :cscope find e <cword><:cR>
-            1001menu &Cscope.find.this\ file
-                        \<tab>f
-                        \ :cscope find f <cword><:cR>
-            1001menu &Cscope.find.files\ including\ this\ file
-                        \<tab>i
-                        \ :cscope find i <cword><:cR>
-            1001menu &Cscope.find.places\ where\ this\ symbol\ is\ assigned\ a\ value
-                        \<tab>a
-                        \ :cscope find a <cword><:cR>
-            1001menu &Cscope.-Sep1-
-                        \ :
-            1001menu &Cscope.create\ and\ add\ database
-                        \ :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>
-            1001menu &Cscope.-Sep2-
-                        \ :
-            1001menu &Cscope.add\ \.
-                        \ :cscope add .<CR>
-            1001menu &Cscope.show
-                        \ :cscope show<CR>
-            1001menu &Cscope.reset
-                        \ :cscope reset<CR>
-        endif
-    endif
-augroup END " MAX_CSCOPE
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 @@
-imap <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 @@
-" JEDI: ==============================================================================================================
-augroup JEDI
-    if has("python") || has('python3')
-        let g:jedi#completions_enabled        = 0 " we do not need completions, because we have YouCompleteMe
-        let g:jedi#show_call_signatures       = 1 " which sadly does not support signatures like jedi
-        let g:jedi#show_call_signatures_delay = 0
-        let g:jedi#auto_vim_configure         = 0
-        let g:pymode_rope                     = 0 " https://github.com/davidhalter/jedi-vim/issues/163
-        " autocmd FileType python jedi.preload_module('os', 'sys', 'math')
-        " let g:pymode_options_max_line_length          = 120
-        " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301'
-        packadd jedi-vim
-    endif " has("python")
-augroup 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 @@
-let g:karlmarks  =   '"'  " position in buffer when left
-let g:karlmarks .=  '{}'  " start/end paragraph
-let g:karlmarks .=  '()'  " start/end sentence
-let g:karlmarks .=  '[]'  " start/end sentence
-let g:karlmarks .=  '.'   " last change
-let g:karlmarks .=  "^"   " insert mode stopped
-let 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 @@
-augroup ChangeIcon
-    "if filereadable("/usr/bin/xseticon")
-    "if filereadable("~/.vim/nvim.png")
-    " autocmd VimEnter * silent :execute "!xseticon -id $WINDOWID ~/.vim/nvim.png"
-    " autocmd VimLeave * silent :execute "!xseticon -id $WINDOWID /usr/share/icons/gnome/32x32/apps/xfce-terminal.png"
-    "endif
-    "endif
-augroup 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()
    highlight! link  PmenuSbar    Pmenu
    highlight! link  VertSplit    LineNr
    highlight! link  SignColumn   LineNr
+    highlight! link  ALEErrorSign LineNr
    highlight! link  FoldColumn   VertSplit
    " highlight! link  Folded       LineNr
    highlight! link  EndOfBuffer  NonText
@@ -39,23 +40,17 @@ else
    set termguicolors
 endif
-if filereadable(expand('~/.vimrc_background')) && filereadable(expand('~/.local/share/base16/base16-shell/colortest'))
-    let g:base16_shell_path  =  '~/.local/share/base16/base16-shell/scripts'
+let g:PaperColor_Theme_Options = {
-    let base16colorspace     =  256
+                        \   'theme': {
-    source ~/.vimrc_background
+                        \     'default.dark': {
-else
+                        \       'transparent_background': 1
-    let g:PaperColor_Theme_Options = {
+                        \     },
-                \   'theme': {
+                        \     'default.light': {
-                \     'default.dark': {
+                        \       'transparent_background': 1
-                \       'transparent_background': 1
+                        \     }
-                \     },
+                        \   }
-                \     'default.light': {
+                        \ }
-                \       'transparent_background': 1
-                \     }
-                \   }
-                \ }
-    colorscheme PaperColor
-    set background=dark
-endif
+colorscheme 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 @@
-augroup MAX_FUNCTION_MENU
-    if has('menu')
-        source $VIMRUNTIME/menu.vim
-        set wildmenu
-        set cpo-=<
-        set wcm=<C-Z>
-        01menu &Functions.toggle\ file\ browser
-                    \<Tab><leader><leader>
-                    \ <leader><leader>
-        01menu &Functions.-Sep0- :
-        01menu &Functions.help
-                    \<Tab><F1>
-                    \ <F1>
-        01menu &Functions.bp:\ previous\ buffer
-                    \<Tab><F2>
-                    \ <F2>
-        01menu &Functions.bn:\ next\ buffer
-                    \<Tab><F3>
-                    \ <F3>
-        01menu &Functions.^wc\:\ close\ window
-                    \<Tab><F4>
-                    \ <F4>
-        01menu &Functions.-Sep1- :
-        01menu &Functions.make
-                    \<Tab><F5>
-                    \ <F5>
-        01menu &Functions.clear\ matches,\ update\ viewport
-                    \<Tab><F6>
-                    \ <F6>
-        01menu &Functions.copen\:\ show\ quickfix\ list
-                    \<Tab><F7>
-                    \ <F7>
-        01menu &Functions.lopen\:\ show\ location\ list
-                    \<Tab><F8>
-                    \ <F8>
-        01menu &Functions.-Sep2- :
-        01menu &Functions.toggle\ tagbar
-                    \<Tab><F9>
-                    \ <F9>
-        if has("gui_running") == 0
-            " in the gui F10 already triggers the menu, not in a terminal vim, so upgrade that...
-            map <F10> :emenu <C-Z>
-        endif
-        01menu &Functions.activate\ menu\ (:emenu)
-                    \<Tab><F10>
-                    \ <F10>
-        01menu &Functions.undef11
-                    \<Tab><F11>
-                    \ <F11>
-        01menu &Functions.undef12
-                    \<Tab><F12>
-                    \ <F12>
-        01menu &Functions.-Sep2- :
-        09menu &Directory.print\ current\ directory
-                    \<Tab>:pwd
-                    \ :pwd<CR>
-        09menu &Directory.-Sep- :
-        09menu &Directory.Change\ to\ GIT\ root
-                    \<Tab>:Gcd
-                    \ :Gcd<CR>:pwd<CR>
-        09menu &Directory.Change\ to\ current\ buffers\ directory\ (global)
-                    \<tab>:cd\ %:p:h
-                    \ :cd %:h<CR>:pwd<CR>
-        09menu &Directory.Change\ to\ current\ buffers\ directory\ (local\ window)<tab>:lcd\ %:p:h
-                    \ :lcd %:p:h<CR>:pwd<CR>
-        menu &Git.&Display\ uncommited\ files\ in\ location\ list
-                    \ :call setloclist(0, map(systemlist("git diff --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR>
-        menu &Git.&Display\ recently\ changed\ files\ in\ quickfix\ list
-                    \ :call setqflist([], 'r', {'title': 'Recently changed in GIT', 'items':map(systemlist("git show --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}) })<CR>:copen<CR>
-        menu &Git.&Display\ last\ changes
-                    \ :let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f', 'svn': '', 'cvs': ''}<CR>:SignifyRefresh<CR>
-        menu &Git.&Display\ unmerged\ files\ in\ location\ list
-                    \ :call setloclist(0, map(systemlist("git diff --name-only --diff-filter=U \| uniq"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR>
-        menu &Git.&Display\ significance\ of\ changes
-                    \ :!git diff --stat HEAD~1..HEAD
-        menu &Git.&Display\ Changed\ files\ compared\ to\ master
-                    \ :!git diff --name-status ..master
-        menu &Match.Clear\ All\ Matches
-                    \<Tab><F6>
-                    \ :call clearmatches()<CR>
-        menu &Match.-Sep- :
-        menu &Match.&dispensable\ white\ spaces
-                    \ :call matchadd("Convention", '\s\+$', 0)<CR>
-        menu &Match.&long\ lines\ (exeeding\ textwidth)
-                    \ :call matchadd("Convention", '\%>'.&textwidth.'v.', 0)<CR>
-        menu &Match.Highlight\ current\ file\ name
-                    \ :call matchadd("Search", escape(expand('%:t'), '.'))<CR>
-        " :execute ':match SpellBad /'.escape(expand('%:t'), '.').'/'<CR>
-        menu &Window.-Sep- :
-        menu &Window.Scratch
-                    \ :Scratch<CR>
-        menu &Find.file\ under\ the\ cursor
-                    \<Tab>gf
-                    \ gf
-        menu &Find.Open\ search\ results\ in\ location\ list
-                    \<Tab>:gf
-                    \ :execute ':vimgrep /'.escape(getreg('/'), '.').'/g %'<CR>
-                    \ :copen<CR>
-        menu &Changes.list
-                    \<Tab>:changes
-                    \ :changes<CR>
-        menu &Changes.-Sep- :
-        menu &Changes.previous
-                    \<Tab>g;
-                    \ g;
-        menu &Changes.next
-                    \<Tab>g,
-                    \ g,
-        menu &List.location.signs\ to\ list
-                    \<Tab>CMD
-                    \ :execute ":call setloclist(0, map(get(getbufinfo('%')[0], 'signs'), {_, p->extend(p, {'bufnr':buffer_number('.'), 'text':get(p, 'name')})}))"<CR>
-        menu &List.location.list\ to\ signs
-                    \<Tab>CMD
-                    \ :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>
-        menu &Jump.list
-                    \<Tab>:jumps
-                    \ :jumps<CR>
-        menu &Jump.-Sep1- :
-        menu &Jump.previous\ position
-                    \<Tab>CTRL-O
-                    \ <C-O>
-        menu &Jump.next\ position
-                    \<Tab>CTRL-I
-                    \ <C-I>
-        menu &Jump.-Sep2- :
-        menu &Jump.clear\ list
-                    \<Tab>:clearjumps
-                    \ :clearjumps
-        1000menu &Tag.list
-                    \<Tab>:tags
-                    \ :tags<CR>
-        1000menu &Tag.selection\ list
-                    \<Tab>:ts
-                    \ :ts<CR>
-        1000menu &Tag.-Sep1- :
-        1000menu &Tag.stack.jump\ older
-                    \<Tab><C-T>
-                    \ :po
-        1000menu &Tag.stack.jump\
-                    \<Tab>:ta
-                    \ :ta
-    endif
-augroup END " MAX_FUNCTION_MENU
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 @@
-augroup NERDTREE
-    " NERDTree: replaces NetRW, as long as it has so many bugs
-    let NERDTreeIgnore                = ['\.aux$', '\.o$']
-    let NERDTreeCascadeSingleChildDir = 0 | " I don't get how one can use <m> to create files in that included directory
-    let NERDTreeChDirMode             = 0
-    let NERDTreeHiddenFirst           = 1
-    let NERDTreeMinimalUI             = 1
-    let NERDTreeShowBookmarks         = 1 | " show bookmarks by default (when opening for the first time)
-    let NERDTreeWinSize               = 40
-    let NERDTreeQuitOnOpen            = 1
-    " depending on if NERDTree has the focus:
-    nnoremap <expr>
-                \ <leader><leader>
-                \ bufwinnr("%")==g:NERDTree.GetWinNum() ? ':NERDTreeClose<CR>' : ':NERDTreeFind<CR>'
-    nnoremap <expr>
-                \ <F2>
-                \ bufwinnr("%")==g:NERDTree.GetWinNum() ? '<C-W><C-W>' : ':N<CR>'
-    nnoremap <expr>
-                \ <F3>
-                \ bufwinnr("%")==g:NERDTree.GetWinNum() ? '<C-W><C-W>' : ':n<CR>'
-    packadd nerdtree
-augroup 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 @@
-let default_expr=&printexpr
-" if filereadable("/usr/bin/a2ps")
-"     let &printexpr = "system('a2ps -1gEmail --borders=no --strip=3')"
-" endif
-"
-set printoptions=portrait:y,number:n,syntax:n,left:25mm,right:20mm,top:27mm,bottom:25mm
-let &printfont    = "monospace 11"
-let &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 @@
-augroup SIGNIFY
-  " displays file changes in sign column
-  let @l = ":let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f'}|:SignifyRefresh"
-  " use signify only with git (improves speed when loading buffers, see :h signify) 
-  let g:signify_vcs_list               = [ 'git' ]
-  let g:signify_cursorhold_insert      = 0
-  let g:signify_cursorhold_normal      = 0
-  let g:signify_update_on_bufenter     = 0
-  let g:signify_update_on_focusgained  = 0
-  let g:signify_sign_show_count        = 0
-  if has("multi_byte") && (&enc == 'utf-8' || &enc == 'utf-16' || &enc == 'ucs-4')
-    let g:signify_sign_add               = '⊕.'
-    let g:signify_sign_delete            = '⊖.'
-    let g:signify_sign_delete_first_line = '⊖.'
-    let g:signify_sign_change            = '⊗.'
-    let g:signify_sign_changedelete      = '⊗.'
-  endif
-  function! SignifyColorScheme()
-    highlight! SignifySignAdd  ctermbg=NONE
-    highlight! link            SignifySignAdd              SignColumn
-    highlight! link            SignifySignChange           SignColumn
-    highlight! link            SignifySignDelete           SignColumn
-    highlight! link            SignifySignChangeDelete     SignColumn
-    highlight! link            SignifySignDeleteFirstLine  SignColumn
-  endfunction
-  " packadd vim-signify
-  autocmd VimEnter,ColorScheme * call SignifyColorScheme()
-augroup 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 @@
-" vv if we ever want snippets, that seems to be the best choice right now
-" packadd neosnippet-snippets
-" 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 @@
-scriptencoding utf-8
-augroup MAX_FANCYLINE
-    set noshowmode    | " mode would otherwise be shown twice- in lightline and below. We want to deactivate one.
-    set laststatus=2  | " required by AirLine and Lightline, without status line does not appear until a window split
-    let g:status_sym_start         = ''
-    let g:status_sym_end           = ''
-    let g:status_sym_sep_start     = '│'
-    let g:status_sym_sep_end       = '│'
-    let g:symbol_branch            = ''
-    let g:symbol_screen_edge       = '░'
-    if &term ==? 'linux'
-        let g:group_active         = 'StatusLineTerm'
-        let g:group_inactive       = 'StatusLineTermNC'
-        let g:group_tabline        = 'TabLine'
-    else
-        let g:group_active         = 'StatusLine'
-        let g:group_inactive       = 'StatusLineNC'
-        let g:group_tabline        = 'TabLine'
-    endif
-    " this function reverts foreground color and background color of a given
-    " highlight group and returns the name of a newly created _invert group
-    function! CreateInvertGroup(highlight_group)
-        if(synIDattr(synIDtrans(hlID(a:highlight_group)), 'reverse', 'gui')==1)
-            let w:color=synIDattr(hlID(a:highlight_group), 'fg#')
-        else
-            let w:color=synIDattr(hlID(a:highlight_group), 'bg#')
-        endif
-        let l:retval=a:highlight_group.'_invert'
-        if(exists('w:color') && w:color ==# '')
-            let w:color = 'NONE'
-        endif
-        silent! exec 'highlight '.l:retval.' guifg='.w:color.' ctermfg='.w:color
-        return l:retval
-    endfunction
-    function! UpdateStatus(highlight_group)
-        let l:invert_group = CreateInvertGroup(a:highlight_group)
-        let l:mode = get({
-                    \  'n'      : 'normal',
-                    \  'i'      : 'insert',
-                    \  'R'      : 'replace',
-                    \  'v'      : 'visual',
-                    \  'V'      : 'visual line',
-                    \  "\<C-V>" : 'visual block',
-                    \  'c'      : 'command',
-                    \  's'      : 'select',
-                    \  'S'      : 'select line',
-                    \  "\<C-s>" : 'select block',
-                    \  't'      : 'terminal'
-                    \ }, mode(), mode())
-        return ''
-                    \ .'%#StatusLineHighlight#'
-                    \ .'%#'.a:highlight_group.'#'
-                    \ .g:symbol_screen_edge
-                    \ .'%{&buftype != "" ? " ".&buftype : ""}'
-                    \ .' '.l:mode.g:status_sym_sep_start
-                    \ .'%{argc() > 1 ? " ".(argidx() + 1).":".argc()." ".g:status_sym_sep_start : ""}'
-                    \ .'%{haslocaldir() ? fnamemodify(getcwd(), ":.:~")." " :""}'
-                    \ .'%{&readonly ? " 🔒" : ""}'
-                    \ .'%{&modified ? " 💾 " : ""}'
-                    \ .'%{" [".winbufnr(0)."] "}'
-                    \ .'%{bufname("%") == "" ? "" : fnamemodify(expand("%"), ":~:.")}'
-                    \ .'%{&titlestring ? has("nvim") ? b:term_title:expand(&titlestring) : "" }'
-                    \ .'%{exists("w:quickfix_title") ? w:quickfix_title : ""}'
-                    \ .' '
-                    \ .'%#'.l:invert_group.'#'
-                    \ .g:status_sym_end
-                    \ .'%<'
-                    \ .''
-                    \ .'%='
-                    \ .''
-                    \ .'%#'.l:invert_group.'#'
-                    \ .g:status_sym_start
-                    \ .'%#'.a:highlight_group.'#'.' '
-                    \ .'%{&buftype == "" ? "" : &buftype." ".g:status_sym_sep_end." "}'
-                    \ .'%{&filetype == "" ?  "" :&filetype." ".g:status_sym_sep_end." "}'
-                    \ .'%{&spell ? &spelllang." ".g:status_sym_sep_end : ""}'
-                    \ .'%{&fileencoding =~ "^$\\|^utf\-8$" ? "" : &fileencoding." ".g:status_sym_sep_end." "}'
-                    \ .'%{&fileformat =~ "^$\\|^unix$" ? "" : &fileformat." ".g:status_sym_sep_end}'
-                    \ .' '
-                    \ .'%cx%-l: '
-                    \ .g:status_sym_sep_end
-                    \ .' '
-                    \ .'%p%% '
-                    \ .g:symbol_screen_edge
-    endfunction
-    function! UpdateTabline(highlight_group)
-        let l:invert_group = CreateInvertGroup(a:highlight_group)
-        let l:git_branch   = FugitiveHead()
-        return ''
-                    \ .'%#'.a:highlight_group.'#'
-                    \ .g:symbol_screen_edge
-                    \ .' '
-                    \ .'%#'.a:highlight_group.'#'
-                    \ .'%-2( %)'
-                    \ .'%{fnamemodify(getcwd(-1), ":~")}'
-                    \ .' '
-                    \ .'%{FugitiveHead() == "" ? "" : g:status_sym_sep_start." ".g:symbol_branch." ".FugitiveHead()}'
-                    \ .' '
-                    \ .'%#'.l:invert_group.'#'
-                    \ .g:status_sym_end
-                    \ .'%<'
-                    \ .'%='
-                    \ .'%#'.l:invert_group.'#'
-                    \ .g:status_sym_start
-                    \ .'%(%#'.a:highlight_group.'#%)'
-                    \ .' '
-                    \ .'%-2(%)'
-                    \ .'%(%#'.a:highlight_group.'#%)'
-                    \ .'%(%{v:servername} %{v:this_session}%)'
-                    \ .g:status_sym_sep_end.' '
-                    \ .'%-3(%)'
-                    \ .'%#'.a:highlight_group.'#'
-                    \ .'%{tabpagenr()}/%{tabpagenr()}'
-                    \ .' '
-                    \ .g:symbol_screen_edge
-                    \ .'%##'
-    endfunction
-    if $USER ==? 'root'
-        let highlight_group_root = "ErrorMsg"
-        let invert_group = CreateInvertGroup(highlight_group_root)
-        let g:group_tabline = highlight_group_root
-    endif
-    function! ApplyColorScheme()
-        " set termguicolors | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) incompatible with nvim
-        " set t_ut=
-        " set up statusline, global and current window individually
-        set statusline=%!UpdateStatus(g:group_inactive)
-        setlocal statusline=%!UpdateStatus(g:group_active)
-        " set up the tabline (match colors)
-        set tabline=%!UpdateTabline(g:group_tabline)
-        " otherwise 'bold' can mess up icon sizes and I do not know why
-        highlight! StatusLine cterm=reverse
-        " exec 'highlight! User3 guifg=#D2A032 guibg='.l:fgcolor
-    endfunction
-    call ApplyColorScheme()
-    " apply colors from the loaded colorscheme...
-    " when changing the colorscheme also apply new colors to the statusbar...
-    autocmd ColorScheme  * call ApplyColorScheme()
-    autocmd WinEnter    * setlocal statusline=%!UpdateStatus(g:group_active)
-    autocmd WinLeave    * setlocal statusline<
-augroup 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 @@
-augroup TAGBAR
-    let g:tagbar_autoclose   = 0
-    let g:tagbar_autofocus   = 1
-    let g:tagbar_autoshowtag = 0
-    let g:tagbar_compact     = 1
-    let g:tagbar_indent      = 0
-    let g:tagbar_foldlevel   = 99
-    packadd tagbar
-augroup 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 @@
-augroup TERMINAL
-    " Vim 8 has a terminal command...
-    if has('terminal')
-        " use default ESC key to leave insert mode in the internal terminal emulator
-        tnoremap <Esc> <C-W>N
-        " make terminal windows hidden by default (copied from :help terminal)
-        autocmd BufWinEnter * if &buftype == 'terminal' | setlocal bufhidden=hide | endif
-    endif
-    " NEOVIM_incompatible:
-    if has('nvim') " Neovim?
-        autocmd TermOpen term://* set nobuflisted
-        " use default ESC key to leave insert mode in the internal terminal emulator
-        tnoremap <Esc> <C-\><C-n>
-        menu &UI.&Open\ in\ Serversession
-                    \ :execute ':!nvr --servername /tmp/nvimsocket --remote % +'.line('.')<CR>:stopinsert<CR>:set readonly<CR>
-    endif
-augroup 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
        let g:ycm_key_list_previous_completion             = ['Up']
        let g:ycm_key_list_select_completion               = ['Down']
-        let g:ycm_semantic_triggers                        =
+        "" let g:ycm_semantic_triggers                        =
-                                \ {
+        ""                      \ {
-                                \   'c': [ 're!\w{2}' ]
+        ""                      \   'c': [ 're!\w{2}' ]
-                                \ } " per language configurations
+        ""                      \ } " per language configurations
    " packadd YouCompleteMe
 augroup END
diff --git a/spell/.keep b/spell/.keep
deleted file mode 100644
index 6d81f6e..0000000
--- a/spell/.keep
+++ /dev/null
@@ -1 +0,0 @@
-vim 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 @@
-" Vim syntax file
-" Language: conf.python
-" Maintainer: Max Christian Pohle <pohle@univention.de>
-" Last Change: Jan 20, 2020
-if exists("b:current_syntax")
-  finish
-end
-let b:current_syntax = "univention-template"
-" embolden normal text to make it a little bit more present than normal python
-highlight! Normal cterm=bold gui=bold 
-" highlighting for univention config registry
-syntax region Define matchgroup=Statement start=/@%@/ end=/@%@/ oneline
-unlet b:current_syntax
-syntax include @PYTHON syntax/python.vim
-syntax region inlinePython
-            \ matchgroup=Statement 
-            \ start="@!@" end="@!@.*"
-            \ contains=@PYTHON 
-            \ keepend fold extend
-let b:current_syntax = "univention-template"
-syntax match Operator '[=;]'
-" TODO: further evaluation of:
-"       syntax region String  start=/"/ end=/"/
-"       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 @@
-this directory is meant to store backups and undo files. it improves the vim
-experience when working with fuse mounted file systems, because they can get
-really 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 @@
-math abs acos acosh asin asinh atan atan2 atanh base_convert bindec ceil cos
-errors 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 @@
-#!/bin/sh
-git 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 @@
-let g:vimpager         = {}
-let g:less             = {}
-let g:less.enabled     = 0
-let g:less.number      = 1
-let g:less.hlsearch    = 0
-let g:vimpager.ansiesc = 0
-let g:less.enabled     = 0
-set noswapfile
-set viminfo+=%                | " restore buffer list
diff --git a/vimrc b/vimrc
index f17d507..a76471b 100644
--- a/vimrc
+++ b/vimrc
@@ -1,29 +1,37 @@
 exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common' 
-set packpath+=pack/vim
+set packpath+=pack/submodules
-set ttymouse=xterm2
-set term=xterm-256color  " usually a good choice, install ncurses and use `toe` to see all available choices
-set ttybuiltin      | " use internal termcaps, because these are more stable
-set ttyscroll=100   | " improves speed for terminal vim, incompatible with nvim
-set ttyfast         | " improves speed for terminal vim (incompatible with nvim)
-set restorescreen   | " restores the console after exiting vim (intentionally not in nvim)
-" because file names rarely have equal signs, but many different configuration
-" file formats use that, we want to exclude the sign from the pattern
 set isfname-==
+set modeline
-" autocmd VimLeave * call system("echo -n $'" . escape(getreg(), "'") . "' | xsel -ib")
+set signcolumn=yes
-" autocmd VimLeave * call system("xsel -ib", getreg('+'))
+set foldcolumn=1
-autocmd VimLeave * call system('echo ' . shellescape(getreg('+')) . ' | xclip -selection clipboard')
-" scripts from the default vim installation, which do not get loaded by default, but are useful.
+if ($XDG_SESSION_TYPE ==# 'wayland' || ! empty($WAYLAND_DISPLAY))
-if filereadable($VIMRUNTIME.'/macros/editexisting.vim')
+  autocmd TextYankPost  *  call system("wl-copy", get(v:event, 'regcontents'))
-    packadd! editexisting
+  nnoremap p   :silent  put    =system('wl-paste')<CR>
+  nnoremap P   :silent  put!   =system('wl-paste')<CR>
 endif
-" load default plugin 'matchit' to allow % to jump between tags
-if filereadable($VIMRUNTIME.'/macros/matchit.vim')
+set shadafile="/tmp/shada"
-    packadd! matchit
-endif
+" neovide specific
-"=======================================================================================================================
+set guifont=monospace:h11:b
+" :#e-subpixelantialias:#h-full
+let g:neovide_cursor_animation_length=0.03
+let g:neovide_cursor_trail_size=0.8
+let g:neovide_scroll_animation_length = 0.05
+let g:neovide_transparency = 0.9
+" scripts from the default vim installation, which do not get loaded by default, but are useful.
+" if filereadable($VIMRUNTIME.'/macros/editexisting.vim')
+"     packadd! editexisting
+" endif
+" 
+" " load default plugin 'matchit' to allow % to jump between tags
+" if filereadable($VIMRUNTIME.'/macros/matchit.vim')
+"     packadd! matchit
+" endif
+" 
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
 set textwidth=0                   | " better done with modeline or local exrc and not here
 set ts=4 sts=4 sw=4 expandtab     | " better done with a modeline or local exrc
 set virtualedit=all               | " virtual edit should be default behaviour, because I don't see any reason against
-set nonumber norelativenumber     | " do not show numbers by default, because that causes a performance loss, instead activate them on a file type basis
+set number norelativenumber     | " do not show numbers by default, because that causes a performance loss, instead activate them on a file type basis
 set 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)
 set hlsearch incsearch            | " highlight pattern while entering it (performance wise this isn't that good)
 " set cindent cinoptions+=(0        | " indent at parentheses
@@ -78,9 +78,9 @@ if has("multi_byte")
  set listchars+=tab:▏\       | "
  set listchars+=trail:·      | " symbols used when using :set list (which displays non-printable chars)
-  " set listchars+=eol:↲      | " symbols used when using :set list (which displays non-printable chars)
+  " set listchars+=eol:↲        | " symbols used when using :set list (which displays non-printable chars)
-  " set listchars+=space:·    | " symbols used when using :set list (which displays non-printable chars)
+  " set listchars+=space:⸳ | " ·      | " symbols used when using :set list (which displays non-printable chars)
-  "set showbreak+=›            | " symbol used in the beginning of a wrapped line
+  set showbreak+=›            | " symbol used in the beginning of a wrapped line
  " automatically enter list mode when going in insert mode (makes above syntax command temporarily ineffective)
  set nolist  
@@ -100,7 +100,7 @@ end
 "  SETTINGS:
 " ======================================================================================================================
 set breakindent               | " Every wrapped line will continue visually indented
-set clipboard=unnamedplus     | " makes copy and paste work (autoselectplus might work as well)
+" set clipboard=unnamedplus     | " makes copy and paste work (autoselectplus might work as well)
 set concealcursor=nc          | " limits the display of concealed text to normal and command mode
 set conceallevel=2            | " replace escaped chars by their UTF-8 representation (useful for LaTeX)
 set confirm                   | " asks 'do you want to save?'
@@ -125,7 +125,7 @@ set shiftround                | " indent/un-indent snaps to multiple of shiftwid
 set writedelay=0
 " display and performance
-set lazyredraw                | " disables redraw during macro execution (improves performance)
+set lazyredraw                | " disables redraw during macro execution (improves performance, but causes problems with solid backgrounds)
 set cmdheight=2               | " sets the command line's height
 set signcolumn=auto           | " auto=auto hide, yes=always, no=never show the column with error indicators
 set nocursorcolumn            | " turn visual cursor column off (improves performance)
@@ -156,7 +156,7 @@ set tags+=../tags
 " code folding...
 set nofoldenable              | " disable folding, because we have zi to toggle foldenable :)
 set foldclose=all             | " automatically fold, when the cursor leaves the folded area
-set foldcolumn=2              | " I think I don't need this second indicator
+set foldcolumn=0              | " I think I don't need this second indicator
 " set numberwidth=5
 " set foldmethod=syntax         | " foldlevel: syntax, indent, manual / foldmethod=syntax makes Vim incredible slow
 set foldnestmax=1             | " top level folding only
@@ -199,7 +199,6 @@ set nocursorline              | " turn visual cursor line off (improves performa
 "=======================================================================================================================
 if has("autocmd")
  " use the shada/viminfo file to return the cursor to where it was...
-  autocmd BufReadPost        *  call setpos(".", getpos("'\""))
  autocmd BufWinEnter        *  if &previewwindow | setlocal nonumber nolist signcolumn=no filetype=c nobuflisted | endif
  " Workaround: Allows Vim to yank text within wayland
@@ -343,10 +342,10 @@ augroup KEYBOARD_MAPPING
  " if the wildmenu is configured to to display suggestions vertically, then
  " reconfigure the cursor keys to work in that direction
-  if &wildoptions =~# 'pum'
+  " if &wildoptions =~# 'pum'
-    cnoremap <expr> <up>   pumvisible() ? "<C-p>" : "\<up>"
+  "   cnoremap <expr> <up>   pumvisible() ? "<C-p>" : "\<up>"
-    cnoremap <expr> <down> pumvisible() ? "<C-n>" : "\<down>"
+  "   cnoremap <expr> <down> pumvisible() ? "<C-n>" : "\<down>"
-  endif
+  " endif
  " 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 @@
-def FlagsForFile(filename, **kwargs):
-    return {
-        'flags': [
-            '-Wall',
-            '-Wextra',
-            '-Werror',
-            '-Wno-long-long',
-            '-Wno-variadic-macros',
-            '-fexceptions',
-            '-ferror-limit=10000',
-            '-DNDEBUG',
-            '-std=c99',
-            '-x', 'c',
-            '-D_GNU_SOURCE',
-            '-I.',
-            '-I', '/usr/include/'
-        ],
-        'do_cache': True,
-    }
-# 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 @@
-# Generated by YCM Generator at 2017-02-03 00:22:04.774052
-# This file is NOT licensed under the GPLv3, which is the license for the rest
-# of YouCompleteMe.
-#
-# Here's the license text for this file:
-#
-# This is free and unencumbered software released into the public domain.
-#
-# Anyone is free to copy, modify, publish, use, compile, sell, or
-# distribute this software, either in source code form or as a compiled
-# binary, for any purpose, commercial or non-commercial, and by any
-# means.
-#
-# In jurisdictions that recognize copyright laws, the author or authors
-# of this software dedicate any and all copyright interest in the
-# software to the public domain. We make this dedication for the benefit
-# of the public at large and to the detriment of our heirs and
-# successors. We intend this dedication to be an overt act of
-# relinquishment in perpetuity of all present and future rights to this
-# software under copyright law.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# For more information, please refer to <http://unlicense.org/>
-import os
-import ycm_core
-flags = [
-    '-x',
-    'c',
-    '-Wall',
-]
-# Set this to the absolute path to the folder (NOT the file!) containing the
-# compile_commands.json file to use that instead of 'flags'. See here for
-# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html
-#
-# You can get CMake to generate this file for you by adding:
-#   set( CMAKE_EXPORT_COMPILE_COMMANDS 1 )
-# to your CMakeLists.txt file.
-#
-# Most projects will NOT need to set this to anything; you can just change the
-# 'flags' list of compilation flags. Notice that YCM itself uses that approach.
-compilation_database_folder = ''
-if os.path.exists( compilation_database_folder ):
-  database = ycm_core.CompilationDatabase( compilation_database_folder )
-else:
-  database = None
-SOURCE_EXTENSIONS = [ '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ]
-def DirectoryOfThisScript():
-  return os.path.dirname( os.path.abspath( __file__ ) )
-def MakeRelativePathsInFlagsAbsolute( flags, working_directory ):
-  if not working_directory:
-    return list( flags )
-  new_flags = []
-  make_next_absolute = False
-  path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ]
-  for flag in flags:
-    new_flag = flag
-    if make_next_absolute:
-      make_next_absolute = False
-      if not flag.startswith( '/' ):
-        new_flag = os.path.join( working_directory, flag )
-    for path_flag in path_flags:
-      if flag == path_flag:
-        make_next_absolute = True
-        break
-      if flag.startswith( path_flag ):
-        path = flag[ len( path_flag ): ]
-        new_flag = path_flag + os.path.join( working_directory, path )
-        break
-    if new_flag:
-      new_flags.append( new_flag )
-  return new_flags
-def IsHeaderFile( filename ):
-  extension = os.path.splitext( filename )[ 1 ]
-  return extension in [ '.h', '.hxx', '.hpp', '.hh' ]
-def GetCompilationInfoForFile( filename ):
-  # The compilation_commands.json file generated by CMake does not have entries
-  # for header files. So we do our best by asking the db for flags for a
-  # corresponding source file, if any. If one exists, the flags for that file
-  # should be good enough.
-  if IsHeaderFile( filename ):
-    basename = os.path.splitext( filename )[ 0 ]
-    for extension in SOURCE_EXTENSIONS:
-      replacement_file = basename + extension
-      if os.path.exists( replacement_file ):
-        compilation_info = database.GetCompilationInfoForFile(
-          replacement_file )
-        if compilation_info.compiler_flags_:
-          return compilation_info
-    return None
-  return database.GetCompilationInfoForFile( filename )
-def FlagsForFile( filename, **kwargs ):
-  if database:
-    # Bear in mind that compilation_info.compiler_flags_ does NOT return a
-    # python list, but a "list-like" StringVec object
-    compilation_info = GetCompilationInfoForFile( filename )
-    if not compilation_info:
-      return None
-    final_flags = MakeRelativePathsInFlagsAbsolute(
-      compilation_info.compiler_flags_,
-      compilation_info.compiler_working_dir_ )
-  else:
-    relative_to = DirectoryOfThisScript()
-    final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )
-  return {
-    'flags': final_flags,
-    'do_cache': True
-  }