28 files changed, 98 insertions, 64 deletions

diff --git a/.gitmodules b/.gitmodules
index c05f40d..f91af19 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,3 +55,6 @@
 [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
diff --git a/doc/git.txt b/doc/git.txt
new file mode 100644
index 0000000..800210e
--- /dev/null
+++ b/doc/git.txt
@@ -0,0 +1 @@
+GIT_PAGER=less git config --list | awk 'match($0, "submodule.(.*).url=(.*)",q){ system("echo git submodule add " q[2] " " q[1]) }'
diff --git a/pack/_all/opt/jedi-vim b/pack/_all/opt/jedi-vim
new file mode 160000
+Subproject b6dfc5fd49c26d4dbe9f54c814956567a7a9b3a
diff --git a/pack/_all/opt/nerdtree b/pack/_all/opt/nerdtree
new file mode 160000
+Subproject 91e0f2253fbecefa7e14f095950341584877ef1
diff --git a/pack/_all/opt/tagbar b/pack/_all/opt/tagbar
new file mode 160000
+Subproject 387bbadda98e1376ff3871aa461b1f0abd4ece7
diff --git a/pack/_all/opt/ultisnips b/pack/_all/opt/ultisnips
new file mode 160000
+Subproject 6fdc3647f72e0a1f321ea6bd092ecd01f7c187b
diff --git a/pack/_all/opt/vim-signify b/pack/_all/opt/vim-signify
new file mode 160000
+Subproject ce2dd937bf3a394ef2fbeda8ab56d2b4437be3c
diff --git a/pack/_all/opt/vim-snippets b/pack/_all/opt/vim-snippets
new file mode 160000
+Subproject 06161e65cd238d5f462f21e3f549c61860db85d
diff --git a/pack/_all/opt/zeavim.vim b/pack/_all/opt/zeavim.vim
new file mode 160000
+Subproject 6db8d84528d66ce6638db03c2864abfa8afa02a
diff --git a/pack/_all/start/base16-vim b/pack/_all/start/base16-vim
new file mode 160000
+Subproject 7e9af12d680d81cc1277c07ef5acee8c83828f3
diff --git a/pack/_all/start/papercolor-theme b/pack/_all/start/papercolor-theme
new file mode 160000
+Subproject 5bd7d5b3f9dd0650e6bbd1756feebe1651fa6ba
diff --git a/pack/_all/start/tabular b/pack/_all/start/tabular
new file mode 160000
+Subproject 00e1e7fcdbc6d753e0bc8043e0d2546fa81bf36
diff --git a/pack/_all/start/vim-fugitive b/pack/_all/start/vim-fugitive
new file mode 160000
+Subproject 6d497b0e63173f89cfabe12ea27a7a5a8b29ac8
diff --git a/pack/_all/start/vim-operator-user b/pack/_all/start/vim-operator-user
new file mode 160000
+Subproject c3dfd41c1ed516b4b901c97562e644de62c367a
diff --git a/pack/_all/start/vim-remote-menu b/pack/_all/start/vim-remote-menu
new file mode 160000
+Subproject a839af9df2edf20cde7b0717ea5a50bde6a82b8
diff --git a/pack/_all/start/vim-surround b/pack/_all/start/vim-surround
new file mode 160000
+Subproject 597068870b8f093a8b2d11536c62ff31222ee8d
diff --git a/pack/neovim/opt/LanguageClient-neovim b/pack/neovim/opt/LanguageClient-neovim
new file mode 160000
+Subproject dd45e31449511152f2127fe862d955237caa130
diff --git a/pack/neovim/opt/ale b/pack/neovim/opt/ale
new file mode 160000
+Subproject 2846e862178e9a16e078799c28aa9d9d4a2ea50
diff --git a/pack/neovim/opt/deoplete.nvim b/pack/neovim/opt/deoplete.nvim
new file mode 160000
+Subproject aa43a5f03b7b995841b416c40e8bbc8bcbf9b1a
diff --git a/pack/neovim/opt/echodoc.vim b/pack/neovim/opt/echodoc.vim
new file mode 160000
+Subproject 3fa121e0a0abee0762867a01b25f4e891594da6
diff --git a/pack/vim/opt/YouCompleteMe b/pack/vim/opt/YouCompleteMe
new file mode 160000
+Subproject f67e5ff27b048d8c55a10ba6a27c6c5b16d0f6b
diff --git a/pack/vim/opt/syntastic b/pack/vim/opt/syntastic
new file mode 160000
+Subproject 89e485c7f8b1f285b43bb397394f22b79021aac
diff --git a/plugin/KarlMarks.vim b/plugin/KarlMarks.vim
new file mode 100644
index 0000000..effb22b
--- /dev/null
+++ b/plugin/KarlMarks.vim
@@ -0,0 +1,22 @@
+let g:markerbar_additional = '$^"^.`{}[]<>()'
+
+function! KarlMarks()
+    for c in map(split(g:markerbar_additional, '\zs'), "char2nr(v:val)") + 
+                \ range(char2nr('a'), char2nr('z')) +
+                \ range(char2nr('A'), char2nr('Z')) +
+                \ range(char2nr('0'), char2nr('9'))
+
+        let p = getpos("'".nr2char(c)) 
+
+        if (p[0] == 0 || p[0] == winbufnr(0)) && p[1] > 0 
+            exec "sign unplace ".c
+            exec "sign define mark_".c." text=".nr2char(c)." texthl=linenr"
+            exec "sign place ".c." name=mark_".c." line=".p[1]." buffer=".winbufnr(0)
+        endif  
+    endfor 
+endfunction
+
+autocmd CursorHold * call KarlMarks()
+
+" important for distraction free reading while changing windows
+set signcolumn=yes
diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim
index a6fe45e..1c2c674 100644
--- a/plugin/max-fix-colorschemes.vim
+++ b/plugin/max-fix-colorschemes.vim
@@ -2,54 +2,60 @@
 " COLOR SCHEME:
 "=======================================================================================================================
 function! ExtendColorTheme()
-  highlight! Bold           cterm=bold                      gui=bold
-  highlight! Italic         cterm=italic                    gui=italic
-  highlight! Underline      cterm=underline                 gui=underline
-  highlight! BoldUnderline  cterm=bold,underline            gui=bold,underline
-  highlight! BoldItalic     cterm=bold,Italic               gui=Bold,Italic
-  highlight! Todo           cterm=bold                      gui=bold guibg=#ffffaa guifg=#000000
-  highlight! Error          cterm=NONE ctermbg=NONE            gui=NONE guibg=NONE
-  highlight! SpellBad       cterm=NONE                      gui=undercurl guibg=NONE guifg=red
-  highlight! Ignore         cterm=NONE ctermbg=NONE ctermfg=NONE  gui=NONE guibg=NONE guifg=NONE
-  highlight! Folded         cterm=NONE ctermbg=NONE
+    highlight! Bold           cterm=bold                            gui=bold
+    highlight! Italic         cterm=italic                          gui=italic
+    highlight! Underline      cterm=underline                       gui=underline
+    highlight! BoldUnderline  cterm=bold,underline                  gui=bold,underline
+    highlight! BoldItalic     cterm=bold,Italic                     gui=bold,italic
+    highlight! Todo           cterm=bold                            gui=bold            guibg=#ffffaa guifg=#000000
+    highlight! Error          cterm=NONE ctermbg=NONE               gui=NONE            guibg=NONE
+    highlight! SpellBad       cterm=NONE                            gui=undercurl       guibg=NONE guifg=red
+    highlight! Ignore         cterm=NONE ctermbg=NONE ctermfg=NONE  gui=NONE            guibg=NONE guifg=NONE
+    highlight! Folded         cterm=NONE ctermbg=NONE
 
 
 
-  let w:color=synIDattr(hlID("Normal"), "bg#")
-  silent! exec 'highlight invisible gui=NONE guifg='.w:color.'guibg='.w:color.' cterm=NONE ctermfg='.w:color.' ctermbg='.w:color
+    
+    if has("gui_running")
+        highlight invisible gui=NONE guifg=background guibg=background
+    else
+        let w:color=synIDtrans(synIDattr(hlID("Normal"), "bg"))
+        silent! exec 'highlight invisible cterm=NONE ctermfg='.w:color.' ctermbg='.w:color
+    endif
 
-  highlight! link           EndOfBuffer                     Invisible
-  highlight! link           qfSeparator                     Normal                                | " reserve one space
-  highlight! link           qfLineNr                        Normal                                | " informational line numbers should look different
+        highlight! link        EndOfBuffer    Invisible
 
-  highlight! link           SpecialKey                      NonText                               | " makes tab stop (see listchars) less disturbing
-  highlight! link           WildMenu                        Search
-  highlight! link           Convention                      Error
+    highlight! link        qfSeparator    Normal     | " reserve one space
+    highlight! link        qfLineNr       Normal     | " informational line numbers should look different
 
-  highlight! link           VertSplit                       LineNr
-  highlight! link           SignColumn                      LineNr
-  highlight! link           FoldColumn                      LineNr
+    highlight! link        SpecialKey     NonText    | " makes tab stop (see listchars) less disturbing
+    highlight! link        WildMenu       Search
+    highlight! link        Convention     Error
 
-  highlight! link           PmenuSbar                       Pmenu
-  highlight! PmenuThumb     cterm=inverse
-  highlight! MoreMsg        cterm=inverse
+    highlight! link        VertSplit      LineNr
+    highlight! link        SignColumn     LineNr
+    highlight! link        FoldColumn     LineNr
+
+    highlight! link        PmenuSbar      Pmenu
+    highlight! PmenuThumb  cterm=inverse
+    highlight! MoreMsg     cterm=inverse
 
 endfunction
 autocmd ColorScheme * call ExtendColorTheme()
 
 
-set background=light
+set background=dark
 if filereadable(expand("~/.vimrc_background")) && filereadable(expand("~/.config/base16-shell/colortest"))
-  let g:base16_shell_path  =  "~/.config/base16-shell/scripts"
-  let base16colorspace     =  256
-  source ~/.vimrc_background
+    let g:base16_shell_path  =  "~/.config/base16-shell/scripts"
+    let base16colorspace     =  256
+    source ~/.vimrc_background
 else
-  let g:PaperColor_Theme_Options = {
-        \   'theme': {
-        \     'default': {
-        \       'transparent_background': 0
-        \     }
-        \   }
-        \ }
-  colorscheme PaperColor
+    let g:PaperColor_Theme_Options = {
+                \   'theme': {
+                \     'default': {
+                \       'transparent_background': 1
+                \     }
+                \   }
+                \ }
+    colorscheme PaperColor
 endif
diff --git a/plugin/max-splash.vim b/plugin/max-splash.vim
index 5282679..6b5e70d 100644
--- a/plugin/max-splash.vim
+++ b/plugin/max-splash.vim
@@ -21,3 +21,9 @@ if empty(argv())
         \               {_, p->{'filename': fnamemodify(p, ':.')}})
         \ }) | lopen | only | setfiletype qf
 endif
+
+" http://vimdoc.sourceforge.net/htmldoc/quickfix.html#:caddexpr
+" for c in range(char2nr('a'), char2nr('z')) + range(char2nr('A'), char2nr('Z')) +  range(0,9) | let p = getpos("'".nr2char(c)) | if (p[1] > 0) | exec "sign define mark_".nr2char(c)." text=".nr2char(c)." linehl=linenr" | exec "sign place ".c." name=mark_".nr2char(c)." line=".p[1] | endif  | endfor
+" for c in range(char2nr('a'), char2nr('z')) + range(char2nr('A'), char2nr('Z')) +  range(0,9) | let p = line("'".nr2char(c)) | if (p > 0) | exec "sign define mark_".nr2char(c)." text=".nr2char(c)." linehl=linenr" | exec "sign place ".c." name=mark_".nr2char(c)." line=".p | endif  | endfor 
+" call sign_unplace('marks') | for c in range(char2nr('a'), char2nr('z')) + range(char2nr('A'), char2nr('Z')) +  range(0,9) | let p = line("'".nr2char(c)) | if (p > 0) | call sign_define("mark_".nr2char(c), { "text" : nr2char(c), "linehl": "linenr"}) | call sign_place(c, 'marks', "mark_".nr2char(c), '', {'lnum': p}) | endif  | endfor 
+" call sign_unplace('marks') | for c in range(char2nr('a'), char2nr('z')) + range(char2nr('A'), char2nr('Z')) +  range(char2nr('0'), char2nr('9')) | let p = line("'".nr2char(c)) | if (p > 0) | call sign_define("mark_".nr2char(c), { "text" : nr2char(c), "texthl": "linenr"}) | call sign_place(c, 'marks', "mark_".nr2char(c), '', {'lnum': p}) | endif  | endfor 
diff --git a/plugin/statusline.vim b/plugin/statusline.vim
index 7bcc963..0dc1040 100644
--- a/plugin/statusline.vim
+++ b/plugin/statusline.vim
@@ -42,6 +42,8 @@ augroup MAX_FANCYLINE
     endfunction
 
     function! UpdateStatus(highlight_group)
+        " TODO: make conditional (if devicons plugin is missing)
+        let l:webdev_ft_icon = WebDevIconsGetFileTypeSymbol('*.'.&filetype)
         let l:invert_group = CreateInvertGroup(a:highlight_group)
         let l:mode = get({
                     \  'n'      : 'normal',
@@ -76,7 +78,7 @@ augroup MAX_FANCYLINE
                     \ .g:status_sym_start
                     \ ."%#".a:highlight_group."#"
                     \ ."%{&buftype==''?'':' '.&buftype.' '.g:status_sym_sep_start.' '}"
-                    \ ."%{&filetype==''?'':' '.&filetype.' '.g:status_sym_sep_start.' '}"
+                    \ .l:webdev_ft_icon." %{&filetype==''?'':&filetype.' '.g:status_sym_sep_start.' '}"
                     \ ."%{(&spell\ ?\ &spelllang.' '.g:status_sym_sep_end\ :\ '')}"
                     \ ."%{(&fileencoding=~'^$\\|^utf\-8$'?'':&fileencoding.' '.g:status_sym_sep_end.' ')}"
                     \ ."%{(&fileformat=~'^$\\|^unix$'?'':&fileformat.' '.g:status_sym_sep_end)}"
diff --git a/utils/default-font.conf b/utils/default-font.conf
index da115d4..32f2f0d 100644
--- a/utils/default-font.conf
+++ b/utils/default-font.conf
@@ -2,9 +2,10 @@
 <!-- this is a configuration file for fontconfig and should be copied or linked to ~/.config/fontconfig/conf.d/ -->
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-    <match>
-        <edit mode="prepend" name="family"><string>NotoSans-Regular</string></edit>
-    </match>
+    <alias>
+        <family>Hack</family>
+                <prefer><family>PowerlineSymbols</family></prefer>
+    </alias>
     <match target="pattern">
         <test qual="any" name="family"><string>serif</string></test>
         <edit name="family" mode="assign" binding="same"><string>Noto Serif</string></edit>
@@ -14,30 +15,9 @@
         <edit name="family" mode="assign" binding="same"><string>Noto Sans</string></edit>
     </match>
     <match target="pattern">
-        <test name="family" qual="any">
-            <string>monospace</string>
-        </test>
-        <edit binding="strong" mode="assign" name="family">
-            <string>FuraCode Nerd Font</string>
-        </edit>
-        <edit binding="strong" mode="assign" name="style">
-            <string>Retina</string>
-        </edit>
-        <edit binding="strong" name="weight" mode="assign">
-            <int>120</int>
-        </edit>
-        <edit binding="strong" name="embolden" mode="assign">
-            <bool>true</bool>
-        </edit>
-        <edit mode="assign" name="hinting">
-            <bool>false</bool>
-        </edit>
-        <edit name="autohint" mode="assign">
-            <bool>true</bool>
-        </edit>
-        <edit mode="assign" name="hintstyle">
-            <const>hintmedium</const>
-        </edit>
+        <test qual="any" name="family"><string>monospace</string></test>
+        <edit mode="assign" name="family"><string>Hack</string></edit>
+        <edit mode="assign" name="style"><string>Bold</string></edit>
     </match>
 </fontconfig>
 
diff --git a/utils/locale.conf b/utils/locale.conf
new file mode 100644
index 0000000..cd2bb00
--- /dev/null
+++ b/utils/locale.conf
@@ -0,0 +1,14 @@
+LANG=de_DE.utf8
+LC_CTYPE=de_DE.utf8
+LC_NUMERIC=de_DE.utf8
+LC_TIME=de_DE.utf8
+LC_COLLATE=C
+LC_MONETARY=de_DE.utf8
+LC_MESSAGES=de_DE.utf8
+LC_PAPER=de_DE.utf8
+LC_NAME=de_DE.utf8
+LC_ADDRESS=de_DE.utf8
+LC_TELEPHONE=de_DE.utf8
+LC_MEASUREMENT=de_DE.utf8
+LC_IDENTIFICATION=de_DE.utf8
+LC_ALL=de_DE.utf8