aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules1
-rw-r--r--colors/coderonline.vim3
m---------pack/_all/opt/jedi-vim0
m---------pack/_all/opt/nerdtree0
m---------pack/_all/opt/vim-signify0
m---------pack/_all/opt/vim-snippets0
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/vim/opt/YouCompleteMe0
m---------pack/vim/opt/syntastic0
m---------pack/vim/opt/vimtex0
-rw-r--r--plugin/max-fix-colorschemes.vim83
-rw-r--r--plugin/statusline.vim67
-rw-r--r--vimrc-common12
16 files changed, 82 insertions, 84 deletions
diff --git a/.gitmodules b/.gitmodules
index 4759f0d..95820b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,6 +40,7 @@
40[submodule "pack/neovim/opt/LanguageClient-neovim"] 40[submodule "pack/neovim/opt/LanguageClient-neovim"]
41 path = pack/neovim/opt/LanguageClient-neovim 41 path = pack/neovim/opt/LanguageClient-neovim
42 url = https://github.com/autozimu/LanguageClient-neovim.git 42 url = https://github.com/autozimu/LanguageClient-neovim.git
43 branch = next
43[submodule "pack/neovim/opt/ale"] 44[submodule "pack/neovim/opt/ale"]
44 path = pack/neovim/opt/ale 45 path = pack/neovim/opt/ale
45 url = https://github.com/w0rp/ale.git 46 url = https://github.com/w0rp/ale.git
diff --git a/colors/coderonline.vim b/colors/coderonline.vim
index f842b28..d2ec135 100644
--- a/colors/coderonline.vim
+++ b/colors/coderonline.vim
@@ -3,7 +3,7 @@
3" Last Change: 07.09.2015 3" Last Change: 07.09.2015
4" Web: http://max.coderonline.de/ 4" Web: http://max.coderonline.de/
5 5
6set background=dark 6set background=light
7hi clear 7hi clear
8if exists("syntax_on") 8if exists("syntax_on")
9 syntax reset 9 syntax reset
@@ -105,6 +105,7 @@ highlight SpellBad gui=underline cterm=underline term=underline ctermbg=white
105highlight! link SpellCap SpellBad 105highlight! link SpellCap SpellBad
106highlight! link SpellLocal Todo 106highlight! link SpellLocal Todo
107highlight! link SpellRare Todo 107highlight! link SpellRare Todo
108highlight! EndOfBuffer guibg=white
108" *hl-Conceal* 109" *hl-Conceal*
109" *hl-DiffAdd* 110" *hl-DiffAdd*
110" DiffAdd diff mode: Added line |diff.txt| 111" DiffAdd diff mode: Added line |diff.txt|
diff --git a/pack/_all/opt/jedi-vim b/pack/_all/opt/jedi-vim
Subproject 89c995e7d964fb71c715e6f4ac330e4c59b4412 Subproject b4b2f3ef54c02d6f8fb09cf1eb0f139d3a45bdb
diff --git a/pack/_all/opt/nerdtree b/pack/_all/opt/nerdtree
Subproject 9193962ad88f15d9f426c3cfb8a274ff1dd0c5b Subproject 2d639b70e73ecf3f62884a578fe5e5937e6d8a9
diff --git a/pack/_all/opt/vim-signify b/pack/_all/opt/vim-signify
Subproject 2b5070441dea482cc4f88556b19002f2da6f356 Subproject 80f64eace5694413f9dfd8e70e4a7018b56c42b
diff --git a/pack/_all/opt/vim-snippets b/pack/_all/opt/vim-snippets
Subproject db67e54d5998dbfbe9fe4161a29d74323031b1f Subproject 9e323311e5fff93482aeaebd4ae3a1c6339ca6f
diff --git a/pack/_all/start/vim-fugitive b/pack/_all/start/vim-fugitive
Subproject 1d8c0a38b2fc4ce9ca4204676573b6335725ff7 Subproject 698065596c9ccee74825ac9667357ce8222ed7b
diff --git a/pack/neovim/opt/LanguageClient-neovim b/pack/neovim/opt/LanguageClient-neovim
Subproject dd45e31449511152f2127fe862d955237caa130 Subproject ee6cdb0940d9c2c95f31488f7d463b2d12abcbc
diff --git a/pack/neovim/opt/ale b/pack/neovim/opt/ale
Subproject e3784c4c4ebb86bc0cdac3652b4f7e4b38ac554 Subproject f9322113095ac01c00d4c38da6aca715663e35c
diff --git a/pack/neovim/opt/deoplete.nvim b/pack/neovim/opt/deoplete.nvim
Subproject 98566131d5f574ee2896138bdda08afa68bda41 Subproject 70a11ee67f3c4353e48aad69812c34b5c8489f0
diff --git a/pack/vim/opt/YouCompleteMe b/pack/vim/opt/YouCompleteMe
Subproject bdbfdd938fe711ff75155546fc0a0e0bebcb952 Subproject 94cfacd11ff97643a32409671fed072e3b1412d
diff --git a/pack/vim/opt/syntastic b/pack/vim/opt/syntastic
Subproject 0336c35c0b10b46d85cdd9c3df721f978429e82 Subproject 3b3f4ee8abf81191d1eca4350448148b86e8a74
diff --git a/pack/vim/opt/vimtex b/pack/vim/opt/vimtex
Subproject d3a9a1daf097d75195da3ea2a7b95c5f30cb5f4 Subproject 661c25d14a8a9a41033d78387624acbedf1d5c5
diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim
index 96b57e2..1535dc7 100644
--- a/plugin/max-fix-colorschemes.vim
+++ b/plugin/max-fix-colorschemes.vim
@@ -1,6 +1,34 @@
1"======================================================================================================================= 1"=======================================================================================================================
2" COLOR SCHEME: 2" COLOR SCHEME:
3"======================================================================================================================= 3"=======================================================================================================================
4function! ExtendColorTheme()
5 highlight! Bold cterm=bold gui=bold
6 highlight! Italic cterm=italic gui=italic
7 highlight! Underline cterm=underline gui=underline
8 highlight! BoldUnderline cterm=bold,underline gui=bold,underline
9 highlight! BoldItalic cterm=bold,Italic gui=bold,italic
10 highlight! Todo cterm=bold gui=bold guibg=#ffffaa guifg=#000000
11 highlight! Error cterm=NONE ctermbg=NONE gui=NONE guibg=NONE
12 highlight! SpellBad cterm=NONE gui=undercurl guibg=NONE guifg=red
13 highlight! Ignore cterm=NONE ctermbg=NONE ctermfg=NONE gui=NONE guibg=NONE guifg=NONE
14 highlight! LineNr cterm=italic gui=italic
15 highlight! PmenuThumb cterm=inverse
16 highlight! MoreMsg cterm=inverse
17
18 highlight! link qfSeparator Normal | " reserve one space
19 highlight! link qfLineNr Normal | " informational line numbers should look different
20 highlight! link SpecialKey NonText | " makes tab stop (see listchars) less disturbing
21 highlight! link WildMenu Search
22 highlight! link Convention Error
23 highlight! link PmenuSbar Pmenu
24 highlight! link Tabline StatusLine
25 highlight! link VertSplit LineNr
26 highlight! link SignColumn LineNr
27 highlight! link FoldColumn LineNr
28 highlight! link Folded LineNr
29 highlight! link EndOfBuffer LineNr
30endfunction
31autocmd ColorScheme * call ExtendColorTheme()
4 32
5if &term == "linux" 33if &term == "linux"
6 set notermguicolors 34 set notermguicolors
@@ -8,64 +36,19 @@ else
8 set termguicolors 36 set termguicolors
9endif 37endif
10 38
11 39if filereadable(expand('~/.vimrc_background')) && filereadable(expand('~/.config/base16-shell/colortest'))
12function! ExtendColorTheme() 40 let g:base16_shell_path = '~/.config/base16-shell/scripts'
13 highlight! Bold cterm=bold gui=bold
14 highlight! Italic cterm=italic gui=italic
15 highlight! Underline cterm=underline gui=underline
16 highlight! BoldUnderline cterm=bold,underline gui=bold,underline
17 highlight! BoldItalic cterm=bold,Italic gui=bold,italic
18 highlight! Todo cterm=bold gui=bold guibg=#ffffaa guifg=#000000
19 highlight! Error ctermbg=NONE cterm=NONE gui=NONE guibg=NONE
20 highlight! SpellBad cterm=NONE gui=undercurl guibg=NONE guifg=red
21 highlight! Ignore ctermbg=NONE ctermfg=NONE cterm=NONE gui=NONE guibg=NONE guifg=NONE
22 highlight! LineNr cterm=italic gui=italic
23
24 if has("gui_running")
25 highlight invisible gui=NONE guifg=background guibg=background
26 else
27 let w:color=synIDtrans(synIDattr(hlID("Normal"), "bg"))
28 silent! exec 'highlight invisible cterm=NONE ctermfg='.w:color.' ctermbg='.w:color
29 let w:color="NONE"
30 silent! exec 'highlight invisible cterm=NONE ctermbg='.w:color
31 endif
32
33 highlight! link EndOfBuffer Invisible
34
35 highlight! link qfSeparator Normal | " reserve one space
36 highlight! link qfLineNr Normal | " informational line numbers should look different
37
38 highlight! link SpecialKey NonText | " makes tab stop (see listchars) less disturbing
39 highlight! link WildMenu Search
40 highlight! link Convention Error
41
42 highlight! link VertSplit LineNr
43 highlight! link SignColumn LineNr
44 highlight! link FoldColumn LineNr
45 highlight! link Folded LineNr
46
47 highlight! link PmenuSbar Pmenu
48 highlight! PmenuThumb cterm=inverse
49 highlight! MoreMsg cterm=inverse
50
51 highlight! link Tabline StatusLine
52
53endfunction
54autocmd ColorScheme * call ExtendColorTheme()
55
56
57" set background=light
58if filereadable(expand("~/.vimrc_background")) && filereadable(expand("~/.config/base16-shell/colortest"))
59 let g:base16_shell_path = "~/.config/base16-shell/scripts"
60 let base16colorspace = 256 41 let base16colorspace = 256
61 source ~/.vimrc_background 42 source ~/.vimrc_background
62else 43else
63 let g:PaperColor_Theme_Options = { 44 let g:PaperColor_Theme_Options = {
64 \ 'theme': { 45 \ 'theme': {
65 \ 'default': { 46 \ 'default.dark': {
66 \ 'transparent_background': 1 47 \ 'transparent_background': 1
67 \ } 48 \ }
68 \ } 49 \ }
69 \ } 50 \ }
70 colorscheme PaperColor 51 colorscheme PaperColor
71endif 52endif
53
54
diff --git a/plugin/statusline.vim b/plugin/statusline.vim
index 20d6b7e..db2bc28 100644
--- a/plugin/statusline.vim
+++ b/plugin/statusline.vim
@@ -1,11 +1,11 @@
1augroup MAX_FANCYLINE 1augroup MAX_FANCYLINE
2 set noshowmode | " mode will be shown twice, in lightline and below, so we want to deactivate one 2 set noshowmode | " mode would otherwise be shown twice- in lightline and below. We want to deactivate one.
3 set laststatus=2 | " required by AirLine and Lightline, without status line does not appear until a window split 3 set laststatus=2 | " required by AirLine and Lightline, without status line does not appear until a window split
4 4
5 let g:status_sym_start = '' 5 let g:status_sym_start = ''
6 let g:status_sym_end = '' 6 let g:status_sym_end = ''
7 let g:status_sym_sep_start = '' 7 let g:status_sym_sep_start = ''
8 let g:status_sym_sep_end = '' 8 let g:status_sym_sep_end = ''
9 let g:symbol_branch = '' 9 let g:symbol_branch = ''
10 let g:symbol_screen_edge = '░' 10 let g:symbol_screen_edge = '░'
11 11
@@ -33,7 +33,7 @@ augroup MAX_FANCYLINE
33 if(exists('w:color') && w:color == '') 33 if(exists('w:color') && w:color == '')
34 let w:color = 'NONE' 34 let w:color = 'NONE'
35 endif 35 endif
36 silent! exec 'highlight '.retval.' gui=NONE guifg='.w:color.' cterm=NONE ctermfg='.w:color 36 silent! exec 'highlight '.l:retval.' guifg='.w:color.' ctermfg='.w:color
37 return l:retval 37 return l:retval
38 endfunction 38 endfunction
39 39
@@ -52,60 +52,69 @@ augroup MAX_FANCYLINE
52 \ "\<C-s>" : 'select block', 52 \ "\<C-s>" : 'select block',
53 \ 't' : 'terminal' 53 \ 't' : 'terminal'
54 \ }, mode(), mode()) 54 \ }, mode(), mode())
55 let l:webdev_ft_icon = exists("*WebDevIconsGetFileTypeSymbol") ?
56 \ " ".WebDevIconsGetFileTypeSymbol('*.'.&filetype)." " : ""
57 return '' 55 return ''
58 \ ."%#StatusLineHighlight#" 56 \ ."%#StatusLineHighlight#"
59 \ ."%#".a:highlight_group."#" 57 \ ."%#".a:highlight_group."#"
60 \ .g:symbol_screen_edge.' ' 58 \ .g:symbol_screen_edge.' '
61 \ ."%{(&readonly\ ?\ '\ \ 🔒'\ :\ '')}" 59 \ ."%{(&readonly\ ?\ '\ \ 🔒'\ :\ '')}"
62 \ ."%{(&modified\ ?\ '\ \ 💾'\ :\ '')}" 60 \ ."%{(&modified\ ?\ '\ \ 💾'\ :\ '')}"
63 \ ."%(%w%h%q%)".' '.l:mode.' '.g:status_sym_sep_start 61 \ ."%(%w%h%q%)".l:mode.' '.g:status_sym_sep_start
64 \ ."%{(argc()>1\ ?\ ' '.(argidx()+1).':'.argc().' '.g:status_sym_sep_start:'')}" 62 \ ."%{(argc()>1\ ?\ ' '.(argidx()+1).':'.argc().' '.g:status_sym_sep_start:'')}"
65 \ ."%{(haslocaldir() ?\ fnamemodify(getcwd(),\ ':.').'/ '\ \:'')}\ " 63 \ ."%{(haslocaldir() ?\ fnamemodify(getcwd(),\ ':.').'/ '\ \:'')}\ "
66 \ ."%{bufname('%')==''?'':substitute(bufname('%'),\ '^'.getcwd(-1).'/*',\ '',\ '').' '}" 64 \ ."%{winbufnr(0).': '}"
65 \ ."%{bufname('%')==''?'':substitute(bufname('%'),\ '^'.getcwd(-1).'/*',\ '',\ '')}"
67 \ ."%{(&titlestring\ ?\ has('nvim')?b:term_title:expand(&titlestring):'')\ }" 66 \ ."%{(&titlestring\ ?\ has('nvim')?b:term_title:expand(&titlestring):'')\ }"
68 \ ."%{'['.winbufnr(0).']'}" 67 \ .' '
69 \ ."%#".l:invert_group."#" 68 \ ."%#".l:invert_group."#"
70 \ .g:status_sym_end 69 \ .g:status_sym_end
70 \ .'%<'
71 \ .'' 71 \ .''
72 \ ."%=" 72 \ ."%="
73 \ .'' 73 \ .''
74 \ ."%#".l:invert_group."#" 74 \ ."%#".l:invert_group."#"
75 \ .g:status_sym_start 75 \ .g:status_sym_start
76 \ ."%#".a:highlight_group."#" 76 \ ."%#".a:highlight_group."#".' '
77 \ ."%{&buftype==''?'':' '.&buftype.' '.g:status_sym_sep_end.' '}" 77 \ ."%{&buftype==''?'':&buftype.' '.g:status_sym_sep_end.' '}"
78 \ .l:webdev_ft_icon." %{&filetype==''?'':&filetype.' '.g:status_sym_sep_end.' '}" 78 \ ."%{&filetype==''?'':&filetype.' '.g:status_sym_sep_end.' '}"
79 \ ."%{(&spell\ ?\ &spelllang.' '.g:status_sym_sep_end\ :\ '')}" 79 \ ."%{(&spell\ ?\ &spelllang.' '.g:status_sym_sep_end\ :\ '')}"
80 \ ."%{(&fileencoding=~'^$\\|^utf\-8$'?'':&fileencoding.' '.g:status_sym_sep_end.' ')}" 80 \ ."%{(&fileencoding=~'^$\\|^utf\-8$'?'':&fileencoding.' '.g:status_sym_sep_end.' ')}"
81 \ ."%{(&fileformat=~'^$\\|^unix$'?'':&fileformat.' '.g:status_sym_sep_end)}" 81 \ ."%{(&fileformat=~'^$\\|^unix$'?'':&fileformat.' '.g:status_sym_sep_end)}"
82 \ ."%cx%-l: " 82 \ ."%cx%-l: "
83 \ ."%p%% " 83 \ .g:status_sym_sep_end
84 \ .' '
85 \ .'%p%% '
84 \ .g:symbol_screen_edge 86 \ .g:symbol_screen_edge
85 endfunction 87 endfunction
86 88
87 function! UpdateTabline(highlight_group) 89 function! UpdateTabline(highlight_group)
88 let l:invert_group = CreateInvertGroup(a:highlight_group) 90 let l:invert_group = CreateInvertGroup(a:highlight_group)
89 let l:git_branch = FugitiveHead() 91 let l:git_branch = FugitiveHead()
90" 
91 return '' 92 return ''
92 \ ."%#".a:highlight_group."#" 93 \ .'%#'.a:highlight_group.'#'
93 \ .g:symbol_screen_edge 94 \ .g:symbol_screen_edge
94 \ ."%3( \ %)\ " 95 \ .' '
95 \ ."%{getcwd(-1)}\ " 96 \ .'%#'.a:highlight_group.'#'
96 \ ."%{FugitiveHead()==''?'':g:status_sym_sep_start.' '.g:symbol_branch.' '.FugitiveHead().' '}" 97 \ .'%-2( %)'
97 \ ."%#".l:invert_group."#" 98 \ .'%{getcwd(-1)}'
99 \ .' '
100 \ ."%{FugitiveHead()==''?'':g:status_sym_sep_start.' '.g:symbol_branch.' '.FugitiveHead()}"
101 \ .' '
102 \ .'%#'.l:invert_group.'#'
98 \ .g:status_sym_end 103 \ .g:status_sym_end
99 \ .'' 104 \ .'%<'
100 \ ."%=" 105 \ .'%='
101 \ .'' 106 \ .'%#'.l:invert_group.'#'
102 \ ."%#".l:invert_group."#"
103 \ .g:status_sym_start 107 \ .g:status_sym_start
104 \ ."%#".a:highlight_group."#" 108 \ .'%(%#'.a:highlight_group.'#%)'
105 \ ."%3(\ %)" 109 \ .' '
106 \ ."%(%{v:servername}\ %{v:this_session}%)" 110 \ .'%-3(%)'
111 \ .'%(%#'.a:highlight_group.'#%)'
112 \ .'%(%{v:servername} %{v:this_session}%)'
107 \ .g:status_sym_sep_end.' ' 113 \ .g:status_sym_sep_end.' '
108 \ ."%(\ \ \ %{tabpagenr()}/%{tabpagenr('$')}\ %)" 114 \ .'%-3(%)'
115 \ .'%#'.a:highlight_group.'#'
116 \ .'%{tabpagenr()}/%{tabpagenr()}'
117 \ .' '
109 \ .g:symbol_screen_edge 118 \ .g:symbol_screen_edge
110 \ ."%##" 119 \ ."%##"
111 \ ."" " end 120 \ ."" " end
@@ -119,6 +128,10 @@ augroup MAX_FANCYLINE
119 setlocal statusline=%!UpdateStatus(g:group_active) 128 setlocal statusline=%!UpdateStatus(g:group_active)
120 " set up the tabline (match colors) 129 " set up the tabline (match colors)
121 set tabline=%!UpdateTabline(g:group_tabline) 130 set tabline=%!UpdateTabline(g:group_tabline)
131
132 " otherwise 'bold' can mess up icon sizes and I do not know why
133 highlight! StatusLine cterm=reverse
134 " exec 'highlight! User3 guifg=#D2A032 guibg='.l:fgcolor
122 endfunction 135 endfunction
123 " apply colors from the loaded colorscheme... 136 " apply colors from the loaded colorscheme...
124 " when changing the colorscheme also apply new colors to the statusbar... 137 " when changing the colorscheme also apply new colors to the statusbar...
diff --git a/vimrc-common b/vimrc-common
index 4b00369..77ebbdf 100644
--- a/vimrc-common
+++ b/vimrc-common
@@ -64,7 +64,7 @@ if has("multi_byte")
64 set fillchars= | " initialize empty fillchars 64 set fillchars= | " initialize empty fillchars
65 set listchars= | " initialize empty listchars 65 set listchars= | " initialize empty listchars
66 66
67 if &term == "linux" 67 if &term ==# 'linux'
68 set fillchars+=vert:\│ | " cool vertical split char 68 set fillchars+=vert:\│ | " cool vertical split char
69 else 69 else
70 set fillchars+=vert:\║ | " cool vertical split char 70 set fillchars+=vert:\║ | " cool vertical split char
@@ -143,11 +143,11 @@ set wildmode=longest:full | " do not preselect any entry and show all possib
143" set dictionary=/usr/share/dict/cracklib-small 143" set dictionary=/usr/share/dict/cracklib-small
144set complete+=d | " scan current and included files for defined name or macro 144set complete+=d | " scan current and included files for defined name or macro
145set complete+=i | " scan current and included files for completions 145set complete+=i | " scan current and included files for completions
146set complete+=k " make default completer <C-N> respect the dictionary 146set complete+=k | " make default completer <C-N> respect the dictionary
147set complete-=u " scan current and included files 147set complete-=u | " scan current and included files
148set complete+=i " scan current and included files 148set complete+=i | " scan current and included files
149set complete+=d " scan current and included files for defined name or macro 149set complete+=d | " scan current and included files for defined name or macro
150" set complete=d " scan current and included files for defined name or macro 150" set complete=d | " scan current and included files for defined name or macro
151set completeopt+=noinsert | " Do not insert any text for a match until the user selects one 151set completeopt+=noinsert | " Do not insert any text for a match until the user selects one
152set completeopt+=noselect | " Do not select a completion from the menu, let the user do that 152set completeopt+=noselect | " Do not select a completion from the menu, let the user do that
153set tagcase=match | " tagcase match, because we mostly use ^] to jump around and that variant respects the upper/lower case [followscs, followic, match, ignore] 153set tagcase=match | " tagcase match, because we mostly use ^] to jump around and that variant respects the upper/lower case [followscs, followic, match, ignore]
..