aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitmodules4
-rw-r--r--UPDATING3
-rw-r--r--ftdetect/univention-template.vim11
-rw-r--r--ftplugin/univention-template.vim4
m---------pack/_all/opt/nerdtree0
m---------pack/_all/opt/tagbar0
m---------pack/_all/opt/ultisnips0
m---------pack/_all/opt/vim-signify0
m---------pack/_all/opt/vim-snippets0
m---------pack/_all/start/papercolor-theme0
m---------pack/_all/start/vim-fugitive0
m---------pack/neovim/opt/LanguageClient-neovim0
m---------pack/neovim/opt/ale0
m---------pack/neovim/opt/deoplete.nvim0
m---------pack/neovim/opt/echodoc.vim0
m---------pack/vim/opt/YouCompleteMe0
m---------pack/vim/opt/syntastic0
m---------pack/vim/opt/vimtex0
-rw-r--r--plugin/KarlMarks.vim10
-rw-r--r--plugin/ale.vim8
-rw-r--r--plugin/fix-pumvisible-no-newline.vim1
-rw-r--r--plugin/max-fix-colorschemes.vim8
-rw-r--r--plugin/max-function-menu.vim2
-rw-r--r--plugin/signify.vim2
-rw-r--r--plugin/statusline.vim13
-rw-r--r--plugin/vimdiff.vim4
-rw-r--r--utils/Xresources5
-rw-r--r--utils/default-font.conf29
-rw-r--r--vimrc-common4
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 @@
43 branch = next 43 branch = next
44[submodule "pack/neovim/opt/ale"] 44[submodule "pack/neovim/opt/ale"]
45 path = pack/neovim/opt/ale 45 path = pack/neovim/opt/ale
46 url = https://github.com/w0rp/ale.git 46 url = https://github.com/dense-analysis/ale.git
47[submodule "pack/vim/opt/syntastic"] 47[submodule "pack/vim/opt/syntastic"]
48 path = pack/vim/opt/syntastic 48 path = pack/vim/opt/syntastic
49 url = https://github.com/vim-syntastic/syntastic.git 49 url = https://github.com/vim-syntastic/syntastic.git
@@ -61,4 +61,4 @@
61 url = https://github.com/Valloric/YouCompleteMe.git 61 url = https://github.com/Valloric/YouCompleteMe.git
62[submodule "pack/vim/opt/vimtex"] 62[submodule "pack/vim/opt/vimtex"]
63 path = pack/vim/opt/vimtex 63 path = pack/vim/opt/vimtex
64 url = https://github.com/lervag/vimtex 64 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 @@
1 git submodule sync --recursive
2 git submodule update --remote
3 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 @@
1au BufRead,BufNewFile */base/univention* set ft=univention-template
2au BufRead,BufNewFile */services/univention* set ft=univention-template
3au BufRead,BufNewFile */container/univention* set ft=univention-template
4au BufRead,BufNewFile */virtualization/univention* set ft=univention-template
5au BufRead,BufNewFile */management/univention* set ft=univention-template
6au BufRead,BufNewFile */packaging/univention* set ft=univention-template
7au BufRead,BufNewFile */mail/univention* set ft=univention-template
8au BufRead,BufNewFile */saml/univention* set ft=univention-template
9au BufRead,BufNewFile */nagios/univention* set ft=univention-template
10au BufRead,BufNewFile /etc/univention/* set ft=univention-template
11
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 @@
1setlocal foldtext=getline(v:foldstart).printf('\ [%d\ lines]\ \ \ \',\ v:foldend-v:foldstart)
2setlocal foldmethod=syntax
3setlocal foldenable
4
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
8let g:markerbar_additional .= "'`" 8let g:markerbar_additional .= "'`"
9 9
10function! KarlMarks() 10function! KarlMarks()
11 for c in map(split(g:markerbar_additional, '\zs'), "char2nr(v:val)") + 11 for c in map(split(g:markerbar_additional, '\zs'), "char2nr(v:val)") +
12 \ range(char2nr('a'), char2nr('z')) + 12 \ range(char2nr('a'), char2nr('z')) +
13 \ range(char2nr('A'), char2nr('Z')) + 13 \ range(char2nr('A'), char2nr('Z')) +
14 \ range(char2nr('0'), char2nr('9')) 14 \ range(char2nr('0'), char2nr('9'))
15 15
16 let p = getpos("'".nr2char(c)) 16 let p = getpos("'".nr2char(c))
17 17
18 if (p[0] == 0 || p[0] == winbufnr(0)) && p[1] > 0 18 if (p[0] == 0 || p[0] == winbufnr(0)) && p[1] > 0
19 exec "sign unplace ".c 19 exec "sign unplace ".c
20 exec "sign define mark_".c." text=".nr2char(c)." texthl=SignColumn" 20 exec "sign define mark_".c." text=".nr2char(c)." texthl=SignColumn"
21 exec "sign place ".c." name=mark_".c." line=".p[1]." buffer=".winbufnr(0) 21 exec "sign place ".c." name=mark_".c." line=".p[1]." buffer=".winbufnr(0)
22 endif 22 endif
23 endfor 23 endfor
24endfunction 24endfunction
25 25
26autocmd CursorHold * call KarlMarks() 26autocmd 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 @@
1let g:ale_pattern_options = {'\.py$': {'ale_enabled': 1}}
2let g:ale_linters = {'python': ['flake8', 'pylint'] }
3let g:ale_fixers =
4 \ {
5 \ 'python': ['black', 'isort', 'remove_trailing_lines', 'trim_whitespace'],
6 \ 'bash': ['remove_trailing_lines', 'trim_whitespace']
7 \ }
8
diff --git a/plugin/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()
21 highlight! link WildMenu Search 21 highlight! link WildMenu Search
22 highlight! link Convention Error 22 highlight! link Convention Error
23 highlight! link PmenuSbar Pmenu 23 highlight! link PmenuSbar Pmenu
24 highlight! link Tabline StatusLine
25 highlight! link VertSplit LineNr 24 highlight! link VertSplit LineNr
26 highlight! link SignColumn LineNr 25 highlight! link SignColumn LineNr
27 highlight! link FoldColumn VertSplit 26 highlight! link FoldColumn VertSplit
28 " highlight! link Folded LineNr 27 " highlight! link Folded LineNr
29 highlight! link EndOfBuffer LineNr 28 highlight! link EndOfBuffer NonText
30endfunction 29endfunction
31autocmd ColorScheme * call ExtendColorTheme() 30autocmd ColorScheme * call ExtendColorTheme()
32 31
@@ -36,8 +35,8 @@ else
36 set termguicolors 35 set termguicolors
37endif 36endif
38 37
39if filereadable(expand('~/.vimrc_background')) && filereadable(expand('~/.config/base16-shell/colortest')) 38if filereadable(expand('~/.vimrc_background')) && filereadable(expand('~/.local/share/base16/base16-shell/colortest'))
40 let g:base16_shell_path = '~/.config/base16-shell/scripts' 39 let g:base16_shell_path = '~/.local/share/base16/base16-shell/scripts'
41 let base16colorspace = 256 40 let base16colorspace = 256
42 source ~/.vimrc_background 41 source ~/.vimrc_background
43else 42else
@@ -52,6 +51,7 @@ else
52 \ } 51 \ }
53 \ } 52 \ }
54 colorscheme PaperColor 53 colorscheme PaperColor
54 set background=dark
55endif 55endif
56 56
57 57
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
81 menu &Git.&Display\ recently\ changed\ files\ in\ quickfix\ list 81 menu &Git.&Display\ recently\ changed\ files\ in\ quickfix\ list
82 \ :call setqflist([], 'r', {'title': 'Recently changed in GIT', 'items':map(systemlist("git show --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}) })<CR>:copen<CR> 82 \ :call setqflist([], 'r', {'title': 'Recently changed in GIT', 'items':map(systemlist("git show --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}) })<CR>:copen<CR>
83 menu &Git.&Display\ last\ changes 83 menu &Git.&Display\ last\ changes
84 \ :let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f'}<CR>:SignifyRefresh<CR> 84 \ :let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f', 'svn': '', 'cvs': ''}<CR>:SignifyRefresh<CR>
85 menu &Git.&Display\ unmerged\ files\ in\ location\ list 85 menu &Git.&Display\ unmerged\ files\ in\ location\ list
86 \ :call setloclist(0, map(systemlist("git diff --name-only --diff-filter=U \| uniq"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR> 86 \ :call setloclist(0, map(systemlist("git diff --name-only --diff-filter=U \| uniq"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR>
87 menu &Git.&Display\ significance\ of\ changes 87 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
29 highlight! link SignifySignDeleteFirstLine SignColumn 29 highlight! link SignifySignDeleteFirstLine SignColumn
30 endfunction 30 endfunction
31 31
32 packadd vim-signify 32 " packadd vim-signify
33 33
34 autocmd VimEnter,ColorScheme * call SignifyColorScheme() 34 autocmd VimEnter,ColorScheme * call SignifyColorScheme()
35augroup END 35augroup 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
14 if &term ==? 'linux' 14 if &term ==? 'linux'
15 let g:group_active = 'StatusLineTerm' 15 let g:group_active = 'StatusLineTerm'
16 let g:group_inactive = 'StatusLineTermNC' 16 let g:group_inactive = 'StatusLineTermNC'
17 let g:group_tabline = 'StatusLineTerm' 17 let g:group_tabline = 'TabLine'
18 else 18 else
19 let g:group_active = 'StatusLine' 19 let g:group_active = 'StatusLine'
20 let g:group_inactive = 'StatusLineNC' 20 let g:group_inactive = 'StatusLineNC'
21 " let g:group_tabline = 'TabLine' 21 let g:group_tabline = 'TabLine'
22 let g:group_tabline = 'StatusLine'
23 endif 22 endif
24 23
25 " this function reverts foreground color and background color of a given 24 " this function reverts foreground color and background color of a given
26 " highlight group and returns the name of a newly created _invert group 25 " highlight group and returns the name of a newly created _invert group
27 function! CreateInvertGroup(highlight_group) 26 function! CreateInvertGroup(highlight_group)
28 if(synIDattr(hlID(a:highlight_group), 'reverse')==1) 27 if(synIDattr(synIDtrans(hlID(a:highlight_group)), 'reverse', 'cterm')==1)
29 let w:color=synIDattr(hlID(a:highlight_group), 'fg#') 28 let w:color=synIDattr(hlID(a:highlight_group), 'fg#')
30 else 29 else
31 let w:color=synIDattr(hlID(a:highlight_group), 'bg#') 30 let w:color=synIDattr(hlID(a:highlight_group), 'bg#')
@@ -124,6 +123,12 @@ augroup MAX_FANCYLINE
124 \ .'%##' 123 \ .'%##'
125 endfunction 124 endfunction
126 125
126
127 if $USER ==? 'root'
128 let invert_group = CreateInvertGroup("ErrorMsg")
129 let g:group_tabline = invert_group
130 endif
131
127 function! ApplyColorScheme() 132 function! ApplyColorScheme()
128 " set termguicolors | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) incompatible with nvim 133 " set termguicolors | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) incompatible with nvim
129 " set t_ut= 134 " 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 @@
1if &diff " only for diff mode/vimdiff
2 set diffopt=filler,context:1000000 " filler is default and inserts empty lines for sync
3 set foldmethod=syntax
4endif
diff --git a/utils/Xresources b/utils/Xresources
index 5723999..08969ac 100644
--- a/utils/Xresources
+++ b/utils/Xresources
@@ -1,6 +1,5 @@
1! #include "/home/max/.config/base16-xresources/xresources/base16-tomorrow-night.Xresources" 1#include "/home/max/.local/share/base16/base16-xresources/xresources/base16-tomorrow-night.Xresources"
2! #include "/home/max/.config/base16-xresources/xresources/base16-google-light.Xresources" 2! #include "/home/max/.local/share/base16/base16-xresources/xresources/base16-tomorrow.Xresources"
3#include "/home/max/.local/share/base16/base16-xresources/xresources/base16-tomorrow.Xresources"
4 3
5urxvt.scrollBar: false 4urxvt.scrollBar: false
6urxvt.background: base00 5urxvt.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 @@
1<?xml version="1.0"?> 1<?xml version="1.0"?>
2<!-- this is a configuration file for fontconfig and should be copied or linked to ~/.config/fontconfig/conf.d/ --> 2<!-- this is a configuration file for fontconfig and should be copied or linked to ~/.config/fontconfig/fonts.conf -->
3<!DOCTYPE fontconfig SYSTEM "/etc/fonts/fonts.dtd"> 3<!DOCTYPE fontconfig SYSTEM "/etc/fonts/fonts.dtd">
4<fontconfig> 4<fontconfig>
5 <match target="pattern"> 5 <match target="pattern">
6 <test qual="any" name="family"><string>monospace</string></test> 6 <test name="family"><string>monospace</string></test>
7 <edit mode="prepend" name="family"><string>Hack Nerd Font Mono</string></edit> 7 <edit name="family" mode="prepend">
8 <edit mode="prepend" name="family"><string>Hack</string></edit> 8 <string>Hack Nerd Font Mono</string>
9 <edit mode="prepend" name="family"><string>emoji</string></edit> 9 <string>Hack</string>
10 <edit mode="prepend" name="family"><string>emojione</string></edit> 10 <string>emoji</string>
11 <edit mode="prepend" name="family"><string>FuraCode Nerd Font Mono Medium</string></edit> 11 <string>emojione</string>
12 <string>FuraCode Nerd Font Mono Medium</string>
13 <string>FiraCode Retina Retina</string>
14 </edit>
12 <test name="slant" compare="not_eq"><const>italic</const></test> 15 <test name="slant" compare="not_eq"><const>italic</const></test>
13 <edit mode="assign" name="style"><string>bold</string></edit> 16 <edit mode="assign" name="style"><string>bold</string></edit>
14 </match> 17 </match>
15 <match target="pattern"> 18 <match target="pattern">
16 <test qual="any" name="family"><string>serif</string></test> 19 <test name="family"><string>serif</string></test>
17 <edit name="family" mode="prepend" binding="same"><string>Noto Serif</string></edit> 20 <edit name="family" mode="prepend">
21 <string>Noto Serif</string>
22 </edit>
18 </match> 23 </match>
19 <match target="pattern"> 24 <match target="pattern">
20 <test qual="any" name="family"><string>sans-serif</string></test> 25 <test name="family"><string>sans-serif</string></test>
21 <edit name="family" mode="prepend" binding="same"><string>Noto Sans</string></edit> 26 <edit name="family" mode="prepend">
27 <string>Noto Sans</string>
28 </edit>
22 </match> 29 </match>
23 <match target="pattern"> 30 <match target="pattern">
24 <edit name="dpi" mode="assign"><double>102</double></edit> 31 <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")
203 autocmd BufWinEnter * if &previewwindow | setlocal nonumber nolist signcolumn=no filetype=c nobuflisted | endif 203 autocmd BufWinEnter * if &previewwindow | setlocal nonumber nolist signcolumn=no filetype=c nobuflisted | endif
204 204
205 " Workaround: Allows Vim to yank text within wayland 205 " Workaround: Allows Vim to yank text within wayland
206 if $XDG_SESSION_TYPE ==# 'wayland' && !has('nvim') 206 " XDG_SESSION_TYPE is only set if a login manager was used
207 " WAYLAND_DISPLAY should always work
208 if ($XDG_SESSION_TYPE ==# 'wayland' || ! empty($WAYLAND_DISPLAY)) && !has('nvim')
207 autocmd TextYankPost * call system("wl-copy", getreg('+')) 209 autocmd TextYankPost * call system("wl-copy", getreg('+'))
208 endif 210 endif
209 211
..