diff options
-rw-r--r-- | experimental/list-commands.vim (renamed from list-commands.vim) | 0 | ||||
-rw-r--r-- | experimental/vimrc-minimal (renamed from vimrc-minimal) | 0 | ||||
-rw-r--r-- | experimental/vimrc-minimal-statusline (renamed from vimrc-minimal-statusline) | 0 | ||||
-rw-r--r-- | experimental/vimrc-old (renamed from vimrc-old) | 0 | ||||
-rw-r--r-- | favicon.ico | bin | 32038 -> 0 bytes | |||
-rw-r--r-- | ftplugin/c.vim | 8 | ||||
-rw-r--r-- | init.vim | 2 | ||||
-rw-r--r-- | plugged/.info | 1 | ||||
-rw-r--r-- | plugin/max-fix-colorschemes.vim | 7 | ||||
-rw-r--r-- | utils/applications/gvim-buffer.desktop (renamed from xdg-additions/applications/gvim-buffer.desktop) | 0 | ||||
-rw-r--r-- | utils/applications/gvim.desktop (renamed from xdg-additions/applications/gvim.desktop) | 0 | ||||
-rw-r--r-- | utils/applications/nvim.desktop (renamed from xdg-additions/applications/nvim.desktop) | 0 | ||||
-rw-r--r-- | utils/applications/vim.desktop (renamed from xdg-additions/applications/vim.desktop) | 0 | ||||
-rw-r--r-- | utils/bashrc (renamed from xdg-additions/bashrc) | 0 | ||||
-rw-r--r-- | utils/default-font.conf (renamed from xdg-additions/default-font.conf) | 23 | ||||
-rw-r--r-- | utils/gtk-3.0.css (renamed from xdg-additions/gtk-3.0.css) | 2 | ||||
-rw-r--r-- | vimrc | 2 | ||||
-rw-r--r-- | vimrc-common | 20 | ||||
-rw-r--r-- | vimrc-medium | 108 | ||||
-rw-r--r-- | ycm_extra_conf.pyc | bin | 2659 -> 0 bytes |
20 files changed, 41 insertions, 132 deletions
diff --git a/list-commands.vim b/experimental/list-commands.vim index 0dd4bca..0dd4bca 100644 --- a/list-commands.vim +++ b/experimental/list-commands.vim | |||
diff --git a/vimrc-minimal b/experimental/vimrc-minimal index 96924f0..96924f0 100644 --- a/vimrc-minimal +++ b/experimental/vimrc-minimal | |||
diff --git a/vimrc-minimal-statusline b/experimental/vimrc-minimal-statusline index 8a8656e..8a8656e 100644 --- a/vimrc-minimal-statusline +++ b/experimental/vimrc-minimal-statusline | |||
diff --git a/vimrc-old b/experimental/vimrc-old index c5bd4e6..c5bd4e6 100644 --- a/vimrc-old +++ b/experimental/vimrc-old | |||
diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index ca0b3c3..0000000 --- a/favicon.ico +++ /dev/null | |||
Binary files differ | |||
diff --git a/ftplugin/c.vim b/ftplugin/c.vim new file mode 100644 index 0000000..e7dc155 --- /dev/null +++ b/ftplugin/c.vim | |||
@@ -0,0 +1,8 @@ | |||
1 | setlocal equalprg=clang-format | ||
2 | setlocal breakat-=- | ||
3 | setlocal keywordprg=man\ 3 | ||
4 | |||
5 | map <buffer> = :pyf /usr/share/clang/clang-format.py<CR> | ||
6 | |||
7 | |||
8 | |||
@@ -1,4 +1,4 @@ | |||
1 | exec ':source '.fnamemodify($MYVIMRC,':h').'/vimrc-common' | 1 | exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common' |
2 | 2 | ||
3 | set packpath+=pack/neovim | 3 | set packpath+=pack/neovim |
4 | 4 | ||
diff --git a/plugged/.info b/plugged/.info deleted file mode 100644 index 8057473..0000000 --- a/plugged/.info +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | This file must exist, because git does not allow empty directories to be commited. | ||
diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim index ac2af76..1624565 100644 --- a/plugin/max-fix-colorschemes.vim +++ b/plugin/max-fix-colorschemes.vim | |||
@@ -8,16 +8,20 @@ function! ExtendColorTheme() | |||
8 | highlight! BoldUnderline cterm=bold,underline gui=bold,underline | 8 | highlight! BoldUnderline cterm=bold,underline gui=bold,underline |
9 | highlight! BoldItalic cterm=bold,Italic gui=Bold,Italic | 9 | highlight! BoldItalic cterm=bold,Italic gui=Bold,Italic |
10 | highlight! Todo cterm=bold gui=bold guibg=#ffffaa guifg=#000000 | 10 | highlight! Todo cterm=bold gui=bold guibg=#ffffaa guifg=#000000 |
11 | highlight! Error ctermbg=NONE guibg=NONE | 11 | highlight! Error guibg=NONE |
12 | highlight! SpellBad cterm=NONE gui=undercurl guibg=NONE guifg=red | 12 | highlight! SpellBad cterm=NONE gui=undercurl guibg=NONE guifg=red |
13 | 13 | ||
14 | 14 | ||
15 | highlight! link qfSeparator Normal | " reserve one space | ||
16 | highlight! link qfLineNr Normal | " informational line numbers should look different | ||
17 | |||
15 | highlight! link SpecialKey NonText | " makes tab stop (see listchars) less disturbing | 18 | highlight! link SpecialKey NonText | " makes tab stop (see listchars) less disturbing |
16 | highlight! link EndOfBuffer Ignore | 19 | highlight! link EndOfBuffer Ignore |
17 | highlight! link WildMenu Search | 20 | highlight! link WildMenu Search |
18 | highlight! link Convention Error | 21 | highlight! link Convention Error |
19 | highlight! link VertSplit NonText | 22 | highlight! link VertSplit NonText |
20 | 23 | ||
24 | highlight! link VertSplit LineNr | ||
21 | highlight! link Folded LineNr | 25 | highlight! link Folded LineNr |
22 | highlight! link SignColumn LineNr | 26 | highlight! link SignColumn LineNr |
23 | highlight! link FoldColumn LineNr | 27 | highlight! link FoldColumn LineNr |
@@ -26,7 +30,6 @@ function! ExtendColorTheme() | |||
26 | highlight! PmenuThumb cterm=inverse | 30 | highlight! PmenuThumb cterm=inverse |
27 | highlight! MoreMsg cterm=inverse | 31 | highlight! MoreMsg cterm=inverse |
28 | 32 | ||
29 | |||
30 | endfunction | 33 | endfunction |
31 | autocmd ColorScheme * call ExtendColorTheme() | 34 | autocmd ColorScheme * call ExtendColorTheme() |
32 | 35 | ||
diff --git a/xdg-additions/applications/gvim-buffer.desktop b/utils/applications/gvim-buffer.desktop index 5cd2cbf..5cd2cbf 100644 --- a/xdg-additions/applications/gvim-buffer.desktop +++ b/utils/applications/gvim-buffer.desktop | |||
diff --git a/xdg-additions/applications/gvim.desktop b/utils/applications/gvim.desktop index 37c6e58..37c6e58 100644 --- a/xdg-additions/applications/gvim.desktop +++ b/utils/applications/gvim.desktop | |||
diff --git a/xdg-additions/applications/nvim.desktop b/utils/applications/nvim.desktop index 21f0090..21f0090 100644 --- a/xdg-additions/applications/nvim.desktop +++ b/utils/applications/nvim.desktop | |||
diff --git a/xdg-additions/applications/vim.desktop b/utils/applications/vim.desktop index f8efe76..f8efe76 100644 --- a/xdg-additions/applications/vim.desktop +++ b/utils/applications/vim.desktop | |||
diff --git a/xdg-additions/bashrc b/utils/bashrc index 24c51a0..24c51a0 100644 --- a/xdg-additions/bashrc +++ b/utils/bashrc | |||
diff --git a/xdg-additions/default-font.conf b/utils/default-font.conf index b1de279..8c487c9 100644 --- a/xdg-additions/default-font.conf +++ b/utils/default-font.conf | |||
@@ -18,16 +18,25 @@ | |||
18 | <string>monospace</string> | 18 | <string>monospace</string> |
19 | </test> | 19 | </test> |
20 | <edit binding="strong" mode="assign" name="family"> | 20 | <edit binding="strong" mode="assign" name="family"> |
21 | <string>SauceCodePro Nerd Font Mono</string> | 21 | <string>FuraCode Nerd Font</string> |
22 | </edit> | ||
23 | <edit binding="strong" mode="assign" name="weight"> | ||
24 | <int>100</int> | ||
25 | </edit> | 22 | </edit> |
26 | <edit binding="strong" mode="assign" name="style"> | 23 | <edit binding="strong" mode="assign" name="style"> |
27 | <string>dz</string> | 24 | <string>Retina</string> |
25 | </edit> | ||
26 | <edit binding="strong" name="weight" mode="assign"> | ||
27 | <int>120</int> | ||
28 | </edit> | ||
29 | <edit binding="strong" name="embolden" mode="assign"> | ||
30 | <bool>true</bool> | ||
31 | </edit> | ||
32 | <edit mode="assign" name="hinting"> | ||
33 | <bool>false</bool> | ||
34 | </edit> | ||
35 | <edit name="autohint" mode="assign"> | ||
36 | <bool>true</bool> | ||
28 | </edit> | 37 | </edit> |
29 | <edit binding="strong" mode="assign" name="pixelsize"> | 38 | <edit mode="assign" name="hintstyle"> |
30 | <double>14</double> | 39 | <const>hintmedium</const> |
31 | </edit> | 40 | </edit> |
32 | </match> | 41 | </match> |
33 | </fontconfig> | 42 | </fontconfig> |
diff --git a/xdg-additions/gtk-3.0.css b/utils/gtk-3.0.css index f347a83..b2adaf6 100644 --- a/xdg-additions/gtk-3.0.css +++ b/utils/gtk-3.0.css | |||
@@ -1,3 +1,5 @@ | |||
1 | /* name or link this file ~/.config/gtk-3.0/gtk.css */ | ||
2 | |||
1 | /* | 3 | /* |
2 | #vim-menubar, | 4 | #vim-menubar, |
3 | #vim-menubar #menu, | 5 | #vim-menubar #menu, |
@@ -1,4 +1,4 @@ | |||
1 | exec ':source '.fnamemodify($MYVIMRC,':h').'/vimrc-common' | 1 | exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common' |
2 | 2 | ||
3 | set packpath+=pack/vim | 3 | set packpath+=pack/vim |
4 | 4 | ||
diff --git a/vimrc-common b/vimrc-common index 00c7996..7eb499f 100644 --- a/vimrc-common +++ b/vimrc-common | |||
@@ -119,8 +119,8 @@ if has('nvim') " Neovim? | |||
119 | endif | 119 | endif |
120 | 120 | ||
121 | set pumheight=8 | " Determines the maximum number of items to show in the pop-up menu for | 121 | set pumheight=8 | " Determines the maximum number of items to show in the pop-up menu for |
122 | set scrolljump=5 | " how many lines get scrolled into view when cursor reaches the screens edge | 122 | set scrolljump=4 | " how many lines get scrolled into view when cursor reaches the screens edge |
123 | set scrolloff=0 | " keeps cursor centered | 123 | set scrolloff=4 | " keeps cursor centered |
124 | set shiftround | " indent/un-indent snaps to multiple of shiftwidths | 124 | set shiftround | " indent/un-indent snaps to multiple of shiftwidths |
125 | set writedelay=0 | 125 | set writedelay=0 |
126 | 126 | ||
@@ -225,10 +225,6 @@ if has("autocmd") | |||
225 | autocmd FileType python setlocal keywordprg=pydoc | 225 | autocmd FileType python setlocal keywordprg=pydoc |
226 | autocmd FileType vim setlocal keywordprg=:help |. | 226 | autocmd FileType vim setlocal keywordprg=:help |. |
227 | autocmd FileType conf setlocal isfname-== | 227 | autocmd FileType conf setlocal isfname-== |
228 | autocmd FileType c,cpp setlocal equalprg=clang-format | ||
229 | autocmd FileType c,cpp setlocal breakat-=- | ||
230 | autocmd FileType c,cpp setlocal keywordprg=man\ 3 | ||
231 | autocmd FileType c,cpp map <buffer> = :pyf /usr/share/clang/clang-format.py<CR> | ||
232 | autocmd Filetype css command! CSSsort :g/{/+1;/}/-1 sort | 228 | autocmd Filetype css command! CSSsort :g/{/+1;/}/-1 sort |
233 | autocmd Filetype html,markdown,xml iabbrev </ </<C-X><C-O> | 229 | autocmd Filetype html,markdown,xml iabbrev </ </<C-X><C-O> |
234 | 230 | ||
@@ -259,6 +255,7 @@ augroup CUSTOM_COMMANDS | |||
259 | \ 'text': '='.printf('%*s, % 3d: %s [%s]', winwidth(0) / 2, '', v:val.bufnr, v:val.name, getbufvar(v:val.bufnr, '&buftype')), | 255 | \ 'text': '='.printf('%*s, % 3d: %s [%s]', winwidth(0) / 2, '', v:val.bufnr, v:val.name, getbufvar(v:val.bufnr, '&buftype')), |
260 | \ 'pattern': 'not loaded'} | 256 | \ 'pattern': 'not loaded'} |
261 | \ ")) | 257 | \ ")) |
258 | command! Qfls call setqflist([],'r',{ 'title':'listed buffers', 'items':map(getbufinfo({"buflisted":1}), '{"bufnr":get(v:val,"bufnr"),"lnum":get(v:val,"lnum"),"module":printf("%-*s",winwidth(0)-4,fnamemodify(get(v:val,"name"),":t"))}') }) | ||
262 | command! Ctoggle | 259 | command! Ctoggle |
263 | \ if(get(getqflist({'winid':1}), 'winid') == win_getid())|cclose|else|botright copen|endif | 260 | \ if(get(getqflist({'winid':1}), 'winid') == win_getid())|cclose|else|botright copen|endif |
264 | command! Ltoggle | 261 | command! Ltoggle |
@@ -308,7 +305,8 @@ augroup KEYBOARD_MAPPING | |||
308 | " exec current line as a command, insert output of command (from: https://youtu.be/MquaityA1SM?t=35m45s) | 305 | " exec current line as a command, insert output of command (from: https://youtu.be/MquaityA1SM?t=35m45s) |
309 | nnoremap <leader>Q !!$SHELL<CR> | 306 | nnoremap <leader>Q !!$SHELL<CR> |
310 | " google the word under the cursor | 307 | " google the word under the cursor |
311 | nnoremap <leader>G :execute ":!xdg-open https://google.de/search?q=".expand("<cword>") | 308 | nnoremap <leader>g :execute ":!xdg-open https://google.de/search?q=".expand("<cword>")<CR> |
309 | nnoremap <leader>u :execute ":!xdg-open ".expand("<cWORD>")<CR> | ||
312 | " display highlight group under the cursor | 310 | " display highlight group under the cursor |
313 | nnoremap <leader>h :echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')<CR> | 311 | nnoremap <leader>h :echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')<CR> |
314 | 312 | ||
@@ -319,13 +317,11 @@ augroup KEYBOARD_MAPPING | |||
319 | " inoremap <C-@> <C-Space> | 317 | " inoremap <C-@> <C-Space> |
320 | 318 | ||
321 | " Bind CTRL+Backspace to vim's version (CTRL+W) in " <CR> insert mode (only works with gvim) | 319 | " Bind CTRL+Backspace to vim's version (CTRL+W) in " <CR> insert mode (only works with gvim) |
322 | inoremap | 320 | inoremap <C-Backspace> <C-W> |
323 | \ <C-Backspace> | ||
324 | \ <C-W> | ||
325 | 321 | ||
326 | " INDENTATION: allows un-indenting a selected block and keeps selection | 322 | " INDENTATION: allows un-indenting a selected block and keeps selection |
327 | vnoremap < <gv | 323 | vnoremap < <gv |
328 | vnoremap > >gv | 324 | vnoremap > >gv |
329 | 325 | ||
330 | " make shift-home select to the beginning of the line | 326 | " make shift-home select to the beginning of the line |
331 | nnoremap <s-home> v^ | 327 | nnoremap <s-home> v^ |
diff --git a/vimrc-medium b/vimrc-medium deleted file mode 100644 index 8281ef1..0000000 --- a/vimrc-medium +++ /dev/null | |||
@@ -1,108 +0,0 @@ | |||
1 | set nocompatible " be iMproved, required | ||
2 | filetype off " required | ||
3 | |||
4 | |||
5 | |||
6 | call plug#begin() | ||
7 | |||
8 | " let Vundle manage Vundle, required | ||
9 | Plug 'VundleVim/Vundle.vim' | ||
10 | |||
11 | Plug 'tpope/vim-sensible' | " a sane and modern default configuration | ||
12 | Plug 'tpope/vim-fugitive' | " the most complete GIT integration plugin | ||
13 | Plug 'tpope/vim-surround' | " plugin makes cs"' inside a line replace " with ' | ||
14 | Plug 'tpope/vim-repeat' | " lets . (dot) repeat plugin macros as well, specifically vim-surround | ||
15 | Plug 'tpope/vim-vinegar' | " Improves :Explore | ||
16 | Plug 'tpope/vim-characterize' | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values) | ||
17 | |||
18 | Plug 'gregsexton/matchtag' | " highlights closing ML tags like braces | ||
19 | Plug 'loremipsum' | " Sample text generator | ||
20 | Plug 'vim-airline/vim-airline' | " beautification of the mode line | ||
21 | Plug 'vim-airline/vim-airline-themes' | " airline themes to match any light and dark terminal using :AirlineTheme | ||
22 | Plug 'sheerun/vim-polyglot' | ||
23 | |||
24 | Plug 'f-breidenstein/icinga-vim' | ||
25 | Plug 'godlygeek/tabular' | " align code on a sign, like :Tab/= | ||
26 | |||
27 | "# Plugin 'indenthtml.vim' | " works better with mixed html/css/javascript | ||
28 | "# Plugin 'evanmiller/nginx-vim-syntax' | ||
29 | |||
30 | |||
31 | " Plugin 'tpope/vim-vividchalk' | " dark theme | ||
32 | " Plugin 'nelstrom/vim-mac-classic-theme' | " light theme | ||
33 | |||
34 | |||
35 | |||
36 | " All of your Plugins must be added before the following line | ||
37 | call plug#end() | " all plugins are getting loaded on this line, don't remove! | ||
38 | |||
39 | filetype plugin indent on | " required | ||
40 | |||
41 | " set term=xtermc | " required on solaris | ||
42 | set t_Co=256 | ||
43 | colorscheme industry | ||
44 | set background=light | ||
45 | |||
46 | let g:airline_theme='luna' | ||
47 | let g:airline_powerline_fonts = 1 | ||
48 | " enable airline's fancy headline with all buffers and tabs | ||
49 | let g:airline#extensions#tabline#enabled = 1 | ||
50 | let g:airline#extensions#tabline#show_buffers = 1 | ||
51 | let g:airline#extensions#tabline#show_tabs = 1 | ||
52 | |||
53 | |||
54 | syntax on | ||
55 | |||
56 | |||
57 | set ts=2 sts=2 sw=2 expandtab | " indentation which i like (abbr: tabstop, softtabstop, shiftwidth) | ||
58 | |||
59 | set encoding=utf-8 | " set up vim's cosole encoding (not file encoding, for which there is fileencoding=) | ||
60 | |||
61 | set ignorecase smartcase | " search with ignorecase by default, but use case sensitive search when one captical char is contained | ||
62 | |||
63 | set lazyredraw | ||
64 | set ttyscroll=3 | ||
65 | set ttyfast | ||
66 | set mouse=a | ||
67 | set hidden | ||
68 | set viminfo+=% | " restore buffer list | ||
69 | |||
70 | |||
71 | " set title | ||
72 | " set t_ts=^[k | ||
73 | " set t_fs=^[\ | ||
74 | " auto BufEnter * :set title | let &titlestring = 'v:' . expand('%') | ||
75 | " auto VimLeave * :set t_ts=^[k^[\ | ||
76 | " To ignore plugin indent changes, instead use: | ||
77 | "filetype plugin on | ||
78 | " | ||
79 | " Brief help | ||
80 | " :PluginList - lists configured plugins | ||
81 | " :PluginInstall - installs plugins; append `!` to update or just :PluginUpdate | ||
82 | " :PluginSearch foo - searches for foo; append `!` to refresh local cache | ||
83 | " :PluginClean - confirms removal of unused plugins; append `!` to auto-approve removal | ||
84 | " | ||
85 | " see :h vundle for more details or wiki for FAQ | ||
86 | " Put your non-Plugin stuff after this line | ||
87 | " | ||
88 | if has("autocmd") | ||
89 | set modeline | " set variables specific to a file, like indentation by adding a comment | ||
90 | endif | ||
91 | |||
92 | " set window title for screen(3) | ||
93 | if &term == "screen" | ||
94 | set t_ts=k | ||
95 | set t_fs=\ | ||
96 | endif | ||
97 | if &term == "screen" || &term == "xterm" | ||
98 | let &titlestring = "%t|".$USER."@".hostname().":%{expand(\"%:~:.:h\")}%=%y" | ||
99 | set title | ||
100 | endif | ||
101 | |||
102 | " let &titlestring = hostname() . "[vim(" . expand("%:t") . ")]" | ||
103 | " automatically remove trailing white spaces on save.. | ||
104 | autocmd BufWritePre * %s/\s\+$//e | ||
105 | |||
106 | nnoremap <Tab> :bn<CR>| " lets one use CTRL+Tab to switch between tabs | ||
107 | nnoremap <S-Tab> :bp<CR>| " use CTRL+Shift+Tab to switch to preview tab | ||
108 | |||
diff --git a/ycm_extra_conf.pyc b/ycm_extra_conf.pyc deleted file mode 100644 index b1ae85c..0000000 --- a/ycm_extra_conf.pyc +++ /dev/null | |||
Binary files differ | |||