Hotfixes to improve compatibility with python

29 files changed, 61 insertions, 47 deletions

diff --git a/.gitmodules b/.gitmodules
index 95820b4..eeca4e1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,7 +43,7 @@
         branch = next
 [submodule "pack/neovim/opt/ale"]
         path = pack/neovim/opt/ale
-        url = https://github.com/w0rp/ale.git
+    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
@@ -61,4 +61,4 @@
         url = https://github.com/Valloric/YouCompleteMe.git
 [submodule "pack/vim/opt/vimtex"]
         path = pack/vim/opt/vimtex
-        url = https://github.com/lervag/vimtex
+    url = https://github.com/lervag/vimtex
diff --git a/UPDATING b/UPDATING
new file mode 100644
index 0000000..4359a5b
--- /dev/null
+++ b/UPDATING
@@ -0,0 +1,3 @@
+    git submodule sync --recursive
+    git submodule update --remote
+    vim -c ':UpdateRemotePlugins'
diff --git a/ftdetect/univention-template.vim b/ftdetect/univention-template.vim
deleted file mode 100644
index add6348..0000000
--- a/ftdetect/univention-template.vim
+++ /dev/null
@@ -1,11 +0,0 @@
-au BufRead,BufNewFile */base/univention* set ft=univention-template
-au BufRead,BufNewFile */services/univention* set ft=univention-template
-au BufRead,BufNewFile */container/univention* set ft=univention-template
-au BufRead,BufNewFile */virtualization/univention* set ft=univention-template
-au BufRead,BufNewFile */management/univention* set ft=univention-template
-au BufRead,BufNewFile */packaging/univention* set ft=univention-template
-au BufRead,BufNewFile */mail/univention* set ft=univention-template
-au BufRead,BufNewFile */saml/univention* set ft=univention-template
-au BufRead,BufNewFile */nagios/univention* set ft=univention-template
-au BufRead,BufNewFile /etc/univention/* set ft=univention-template
-
diff --git a/ftplugin/univention-template.vim b/ftplugin/univention-template.vim
deleted file mode 100644
index 9071bcd..0000000
--- a/ftplugin/univention-template.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-setlocal foldtext=getline(v:foldstart).printf('\ [%d\ lines]\ \ \ \',\ v:foldend-v:foldstart) 
-setlocal foldmethod=syntax
-setlocal foldenable
-
diff --git a/pack/_all/opt/nerdtree b/pack/_all/opt/nerdtree
-Subproject e67324fdea7a192c7ce1b4c6b3c3b9f82f11eee
+Subproject 6571452857fd1b14f15a3886f9fffc113c36bba
diff --git a/pack/_all/opt/tagbar b/pack/_all/opt/tagbar
-Subproject 679a9d9ac9579bd18225409d85ed4870fb6c9c6
+Subproject d7063c7484f0f99bfa182b02defef7f412a9289
diff --git a/pack/_all/opt/ultisnips b/pack/_all/opt/ultisnips
-Subproject e910b4fb9e276d18ed140fc492f30967ef9ace5
+Subproject e83c82099d9bd43dc7895e3cb5b114ee5a2a07c
diff --git a/pack/_all/opt/vim-signify b/pack/_all/opt/vim-signify
-Subproject 56db16f8d3825c4d066c2faf05315c2b208cd5f
+Subproject c3d450eb5f5e76d99d23b10493d4e08c5bb1ae7
diff --git a/pack/_all/opt/vim-snippets b/pack/_all/opt/vim-snippets
-Subproject 28ad6344e1ce59d11c095405e1e76c0183142de
+Subproject 900bf93c6680e38ce568dba26c3f48b4365ac73
diff --git a/pack/_all/start/papercolor-theme b/pack/_all/start/papercolor-theme
-Subproject ddd09867ed4e020b3ba2eb47dc3ef365da5b0fe
+Subproject c657f5c2d5964bbae633f8a42c16f8316f6d673
diff --git a/pack/_all/start/vim-fugitive b/pack/_all/start/vim-fugitive
-Subproject e06005a742714a4293f1928bca0aca7c9e38338
+Subproject 27a5c3abd211c2784513dab4db082fa414ad096
diff --git a/pack/neovim/opt/LanguageClient-neovim b/pack/neovim/opt/LanguageClient-neovim
-Subproject 222e2503666e463a5c55edc52f140fde2bb76a9
+Subproject 4b35f5d6859ab3d42546192cbede9add59a7435
diff --git a/pack/neovim/opt/ale b/pack/neovim/opt/ale
-Subproject 8f7ccdc5e95302223c516a0113f5af7e075dc04
+Subproject 834d6f9c48ce349a4c3d72e98bd0de81aaa8404
diff --git a/pack/neovim/opt/deoplete.nvim b/pack/neovim/opt/deoplete.nvim
-Subproject e5a7e3bc029505176c58fd7d8bf4efeeb8fb458
+Subproject e7f4c206287e867fe4991f6de76a12107fa1459
diff --git a/pack/neovim/opt/echodoc.vim b/pack/neovim/opt/echodoc.vim
-Subproject cd9beff92b52990d991a0b6a0f4d20aa600e570
+Subproject 4719626bfd477f1189dd9992614ff452d3ea3ca
diff --git a/pack/vim/opt/YouCompleteMe b/pack/vim/opt/YouCompleteMe
-Subproject 94cfacd11ff97643a32409671fed072e3b1412d
+Subproject f9906f804b02e6b7e70a7f1a6f949e905784b5b
diff --git a/pack/vim/opt/syntastic b/pack/vim/opt/syntastic
-Subproject f3766538720116f099a8b1517f76ae2f094afd2
+Subproject 140f516eaeae855b3d57068e6e66c8f40fd4529
diff --git a/pack/vim/opt/vimtex b/pack/vim/opt/vimtex
-Subproject 3ccc17480c7b887ed9dcc0c223e250bdd784fd0
+Subproject 49bc335fffa40a7b7b84b6110b57ebcbaaf019e
diff --git a/plugin/KarlMarks.vim b/plugin/KarlMarks.vim
index 3340dad..f0699e1 100644
--- a/plugin/KarlMarks.vim
+++ b/plugin/KarlMarks.vim
@@ -8,19 +8,19 @@ let g:markerbar_additional .=  "^"   " insert mode stopped
 let g:markerbar_additional .=  "'`"
 
 function! KarlMarks()
-    for c in map(split(g:markerbar_additional, '\zs'), "char2nr(v:val)") + 
+    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)) 
+        let p = getpos("'".nr2char(c))
 
-        if (p[0] == 0 || p[0] == winbufnr(0)) && p[1] > 0 
+        if (p[0] == 0 || p[0] == winbufnr(0)) && p[1] > 0
             exec "sign unplace ".c
             exec "sign define mark_".c." text=".nr2char(c)." texthl=SignColumn"
             exec "sign place ".c." name=mark_".c." line=".p[1]." buffer=".winbufnr(0)
-        endif  
-    endfor 
+        endif
+    endfor
 endfunction
 
 autocmd CursorHold * call KarlMarks()
diff --git a/plugin/ale.vim b/plugin/ale.vim
new file mode 100644
index 0000000..ba07343
--- /dev/null
+++ b/plugin/ale.vim
@@ -0,0 +1,8 @@
+let g:ale_pattern_options = {'\.py$': {'ale_enabled': 1}}
+let g:ale_linters = {'python': ['flake8', 'pylint'] }
+let g:ale_fixers =
+    \ {
+    \   'python': ['black', 'isort', 'remove_trailing_lines', 'trim_whitespace'],
+    \   'bash': ['remove_trailing_lines', 'trim_whitespace']
+    \ }
+
diff --git a/plugin/fix-pumvisible-no-newline.vim b/plugin/fix-pumvisible-no-newline.vim
new file mode 100644
index 0000000..ad27182
--- /dev/null
+++ b/plugin/fix-pumvisible-no-newline.vim
@@ -0,0 +1 @@
+imap <expr> <CR> pumvisible() ? "\<C-y>" : "\<CR>"
diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim
index b9c7657..c0f091d 100644
--- a/plugin/max-fix-colorschemes.vim
+++ b/plugin/max-fix-colorschemes.vim
@@ -21,12 +21,11 @@ function! ExtendColorTheme()
     highlight! link  WildMenu     Search
     highlight! link  Convention   Error
     highlight! link  PmenuSbar    Pmenu
-    highlight! link  Tabline      StatusLine
     highlight! link  VertSplit    LineNr
     highlight! link  SignColumn   LineNr
     highlight! link  FoldColumn   VertSplit
     " highlight! link  Folded       LineNr
-    highlight! link  EndOfBuffer  LineNr
+    highlight! link  EndOfBuffer  NonText
 endfunction
 autocmd ColorScheme * call ExtendColorTheme()
 
@@ -36,8 +35,8 @@ else
     set termguicolors
 endif
 
-if filereadable(expand('~/.vimrc_background')) && filereadable(expand('~/.config/base16-shell/colortest'))
-    let g:base16_shell_path  =  '~/.config/base16-shell/scripts'
+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 base16colorspace     =  256
     source ~/.vimrc_background
 else
@@ -52,6 +51,7 @@ else
                 \   }
                 \ }
     colorscheme PaperColor
+    set background=dark
 endif
 
 
diff --git a/plugin/max-function-menu.vim b/plugin/max-function-menu.vim
index 6c7308a..b981997 100644
--- a/plugin/max-function-menu.vim
+++ b/plugin/max-function-menu.vim
@@ -81,7 +81,7 @@ augroup MAX_FUNCTION_MENU
         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'}<CR>:SignifyRefresh<CR>
+                    \ :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
diff --git a/plugin/signify.vim b/plugin/signify.vim
index 5eeb2b0..9edc3c5 100644
--- a/plugin/signify.vim
+++ b/plugin/signify.vim
@@ -29,7 +29,7 @@ augroup SIGNIFY
     highlight! link            SignifySignDeleteFirstLine  SignColumn
   endfunction
 
-  packadd vim-signify
+  " packadd vim-signify
 
   autocmd VimEnter,ColorScheme * call SignifyColorScheme()
 augroup END
diff --git a/plugin/statusline.vim b/plugin/statusline.vim
index e6f175d..57fbfa4 100644
--- a/plugin/statusline.vim
+++ b/plugin/statusline.vim
@@ -14,18 +14,17 @@ augroup MAX_FANCYLINE
     if &term ==? 'linux'
         let g:group_active         = 'StatusLineTerm'
         let g:group_inactive       = 'StatusLineTermNC'
-        let g:group_tabline        = 'StatusLineTerm'
+        let g:group_tabline        = 'TabLine'
     else
         let g:group_active         = 'StatusLine'
         let g:group_inactive       = 'StatusLineNC'
-        " let g:group_tabline        = 'TabLine'
-        let g:group_tabline        = 'StatusLine'
+        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(hlID(a:highlight_group), 'reverse')==1)
+        if(synIDattr(synIDtrans(hlID(a:highlight_group)), 'reverse', 'cterm')==1)
             let w:color=synIDattr(hlID(a:highlight_group), 'fg#')
         else
             let w:color=synIDattr(hlID(a:highlight_group), 'bg#')
@@ -124,6 +123,12 @@ augroup MAX_FANCYLINE
                     \ .'%##'
     endfunction
 
+
+    if $USER ==? 'root'
+        let invert_group = CreateInvertGroup("ErrorMsg")
+        let g:group_tabline = invert_group
+    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=
diff --git a/plugin/vimdiff.vim b/plugin/vimdiff.vim
new file mode 100644
index 0000000..ffd9f46
--- /dev/null
+++ b/plugin/vimdiff.vim
@@ -0,0 +1,4 @@
+if &diff                             " only for diff mode/vimdiff
+  set diffopt=filler,context:1000000 " filler is default and inserts empty lines for sync
+  set foldmethod=syntax
+endif
diff --git a/utils/Xresources b/utils/Xresources
index 5723999..08969ac 100644
--- a/utils/Xresources
+++ b/utils/Xresources
@@ -1,6 +1,5 @@
-! #include "/home/max/.config/base16-xresources/xresources/base16-tomorrow-night.Xresources"
-! #include "/home/max/.config/base16-xresources/xresources/base16-google-light.Xresources"
-#include "/home/max/.local/share/base16/base16-xresources/xresources/base16-tomorrow.Xresources"
+#include "/home/max/.local/share/base16/base16-xresources/xresources/base16-tomorrow-night.Xresources"
+! #include "/home/max/.local/share/base16/base16-xresources/xresources/base16-tomorrow.Xresources"
 
 urxvt.scrollBar: false
 urxvt.background: base00
diff --git a/utils/default-font.conf b/utils/default-font.conf
index cf01d6d..d7b43e2 100644
--- a/utils/default-font.conf
+++ b/utils/default-font.conf
@@ -1,24 +1,31 @@
 <?xml version="1.0"?>
-<!-- this is a configuration file for fontconfig and should be copied or linked to ~/.config/fontconfig/conf.d/ -->
+<!-- this is a configuration file for fontconfig and should be copied or linked to ~/.config/fontconfig/fonts.conf -->
 <!DOCTYPE fontconfig SYSTEM "/etc/fonts/fonts.dtd">
 <fontconfig>
     <match target="pattern">
-        <test qual="any" name="family"><string>monospace</string></test>
-        <edit mode="prepend" name="family"><string>Hack Nerd Font Mono</string></edit>
-        <edit mode="prepend" name="family"><string>Hack</string></edit>
-        <edit mode="prepend" name="family"><string>emoji</string></edit>
-        <edit mode="prepend" name="family"><string>emojione</string></edit>
-        <edit mode="prepend" name="family"><string>FuraCode Nerd Font Mono Medium</string></edit>
+        <test name="family"><string>monospace</string></test>
+        <edit name="family" mode="prepend">
+            <string>Hack Nerd Font Mono</string>
+            <string>Hack</string>
+            <string>emoji</string>
+            <string>emojione</string>
+            <string>FuraCode Nerd Font Mono Medium</string>
+            <string>FiraCode Retina Retina</string>
+        </edit>
         <test name="slant" compare="not_eq"><const>italic</const></test>
         <edit mode="assign" name="style"><string>bold</string></edit>
     </match>
     <match target="pattern">
-        <test qual="any" name="family"><string>serif</string></test>
-        <edit name="family" mode="prepend" binding="same"><string>Noto Serif</string></edit>
+        <test name="family"><string>serif</string></test>
+        <edit name="family" mode="prepend">
+            <string>Noto Serif</string>
+        </edit>
     </match>
     <match target="pattern">
-        <test qual="any" name="family"><string>sans-serif</string></test>
-        <edit name="family" mode="prepend" binding="same"><string>Noto Sans</string></edit>
+        <test name="family"><string>sans-serif</string></test>
+        <edit name="family" mode="prepend">
+            <string>Noto Sans</string>
+        </edit>
     </match>
     <match target="pattern">
         <edit name="dpi" mode="assign"><double>102</double></edit>
diff --git a/vimrc-common b/vimrc-common
index 6415842..30752fb 100644
--- a/vimrc-common
+++ b/vimrc-common
@@ -203,7 +203,9 @@ if has("autocmd")
   autocmd BufWinEnter        *  if &previewwindow | setlocal nonumber nolist signcolumn=no filetype=c nobuflisted | endif
 
   " Workaround: Allows Vim to yank text within wayland
-  if $XDG_SESSION_TYPE ==# 'wayland' && !has('nvim')
+  " XDG_SESSION_TYPE is only set if a login manager was used
+  " WAYLAND_DISPLAY should always work
+  if ($XDG_SESSION_TYPE ==# 'wayland' || ! empty($WAYLAND_DISPLAY)) && !has('nvim')
     autocmd TextYankPost       * call system("wl-copy", getreg('+'))
   endif