diff options
-rw-r--r-- | after/syntax/c.vim | 10 | ||||
l--------- | after/syntax/cpp.vim | 1 | ||||
-rw-r--r-- | ftplugin/coffee.vim | 1 | ||||
-rw-r--r-- | gtk-3.0.css | 2 | ||||
-rw-r--r-- | vimrc-full | 11 |
5 files changed, 15 insertions, 10 deletions
diff --git a/after/syntax/c.vim b/after/syntax/c.vim index f4b1de9..49e96f0 100644 --- a/after/syntax/c.vim +++ b/after/syntax/c.vim | |||
@@ -1,6 +1,10 @@ | |||
1 | set number | 1 | setlocal number |
2 | set foldenable | 2 | setlocal foldenable |
3 | set foldmethod=syntax | 3 | setlocal foldmethod=expr |
4 | setlocal foldcolumn=0 | ||
5 | |||
6 | " setlocal foldexpr=get(synstack(v:lnum,1),0)==hlID('cComment') | ||
7 | setlocal foldexpr=index([0,hlID('cComment'),hlID('Comment')],get(synstack(v:lnum,1),0)) | ||
4 | 8 | ||
5 | " syntax match cType "struct\s+[A-Za-z0-9_]+\>" | 9 | " syntax match cType "struct\s+[A-Za-z0-9_]+\>" |
6 | " syn clear cStructure | 10 | " syn clear cStructure |
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim new file mode 120000 index 0000000..64e3fd4 --- /dev/null +++ b/after/syntax/cpp.vim | |||
@@ -0,0 +1 @@ | |||
c.vim \ No newline at end of file | |||
diff --git a/ftplugin/coffee.vim b/ftplugin/coffee.vim new file mode 100644 index 0000000..5d5675c --- /dev/null +++ b/ftplugin/coffee.vim | |||
@@ -0,0 +1 @@ | |||
let coffee_indent_keep_current = 1 " avoid problems with html indentation | |||
diff --git a/gtk-3.0.css b/gtk-3.0.css index 04e8fc0..f347a83 100644 --- a/gtk-3.0.css +++ b/gtk-3.0.css | |||
@@ -53,7 +53,7 @@ window#vim-main-window > box | |||
53 | 53 | ||
54 | /* within window > box ... */ | 54 | /* within window > box ... */ |
55 | menubar#vim-menubar { | 55 | menubar#vim-menubar { |
56 | font-family: "Hasklug Nerd Font Mono", "Source Code Pro for Powerline", "Source Code Pro", "Roboto"; | 56 | font-family: "monospace", "Hasklug Nerd Font Mono", "Source Code Pro for Powerline", "Source Code Pro", "Roboto"; |
57 | font-weight:bold; | 57 | font-weight:bold; |
58 | font-size:8pt; | 58 | font-size:8pt; |
59 | background: #fff; | 59 | background: #fff; |
@@ -249,7 +249,7 @@ set foldopen=block,hor,search | " when do we unfold? | |||
249 | " set foldtext=Foldtext() | " | 249 | " set foldtext=Foldtext() | " |
250 | " set foldtext=v:folddashes.substitute(getline(v:foldstart),'\\v^/[/*]\','','g') | 250 | " set foldtext=v:folddashes.substitute(getline(v:foldstart),'\\v^/[/*]\','','g') |
251 | " set foldtext='⊞\ '.substitute(getline(v:foldstart),'^[\ '.printf(&cms,'').']*','','').'↵'.getline(v:foldstart+1).'↵'.getline(v:foldstart+2) | 251 | " set foldtext='⊞\ '.substitute(getline(v:foldstart),'^[\ '.printf(&cms,'').']*','','').'↵'.getline(v:foldstart+1).'↵'.getline(v:foldstart+2) |
252 | set foldtext='⊞\ '.substitute(substitute(join(getline(v:foldstart,v:foldend)),'\\s\\s\\+\\\|\[\*\/\]','\ ','g'),'\^\\s\\+','','g') | 252 | set foldtext='⊞\ '.substitute(substitute(substitute(join(getline(v:foldstart,v:foldend)),'\\s\\s\\+\\\|\[\*\/\]','\ ','g'),'\^\\s\\+','','g'),\ '\\s\\s\\+',\ '\ ',\ 'g') |
253 | 253 | ||
254 | " vim window behaviour | 254 | " vim window behaviour |
255 | set splitbelow | " open new windows below the current one (i find that more intuitive) | 255 | set splitbelow | " open new windows below the current one (i find that more intuitive) |
@@ -517,8 +517,8 @@ if has("autocmd") | |||
517 | 517 | ||
518 | menu &Git.&Display\ uncommited\ files\ in\ location\ list | 518 | menu &Git.&Display\ uncommited\ files\ in\ location\ list |
519 | \ :call setloclist(0, map(systemlist("git diff --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR> | 519 | \ :call setloclist(0, map(systemlist("git diff --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR> |
520 | menu &Git.&Display\ recently\ changed\ files\ in\ location\ list | 520 | menu &Git.&Display\ recently\ changed\ files\ in\ quickfix\ list |
521 | \ :call setloclist(0, map(systemlist("git show --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR> | 521 | \ :call setqflist([], 'r', {'title': 'Recently changed in GIT', 'items':map(systemlist("git show --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}) })<CR>:copen<CR> |
522 | menu &Git.&Display\ last\ changes | 522 | menu &Git.&Display\ last\ changes |
523 | \ :let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f'}<CR>:SignifyRefresh<CR> | 523 | \ :let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f'}<CR>:SignifyRefresh<CR> |
524 | menu &Git.&Display\ unmerged\ files\ in\ location\ list | 524 | menu &Git.&Display\ unmerged\ files\ in\ location\ list |
@@ -690,7 +690,6 @@ Plug 'NLKNguyen/papercolor-theme' | " the one I like the most | |||
690 | Plug 'mhinz/vim-signify' | " uses the sign column to indicate added, modified and removed lines | 690 | Plug 'mhinz/vim-signify' | " uses the sign column to indicate added, modified and removed lines |
691 | Plug 'tpope/vim-fugitive' | " the most complete GIT integration plugin | 691 | Plug 'tpope/vim-fugitive' | " the most complete GIT integration plugin |
692 | Plug 'godlygeek/tabular' | " align code on a sign, like :Tab/= | 692 | Plug 'godlygeek/tabular' | " align code on a sign, like :Tab/= |
693 | Plug 'severin-lemaignan/vim-minimap' | ||
694 | Plug 'tpope/vim-surround' | " plugin makes cs"' inside a line replace " with ' | 693 | Plug 'tpope/vim-surround' | " plugin makes cs"' inside a line replace " with ' |
695 | let g:signify_vcs_list = [ 'git' ] | " use signify only with git (improves speed when loading buffers, see :h signify) | 694 | let g:signify_vcs_list = [ 'git' ] | " use signify only with git (improves speed when loading buffers, see :h signify) |
696 | let g:signify_cursorhold_insert = 0 | 695 | let g:signify_cursorhold_insert = 0 |
@@ -998,7 +997,7 @@ function! ExtendColorTheme() | |||
998 | highlight! MoreMsg cterm=inverse | 997 | highlight! MoreMsg cterm=inverse |
999 | highlight! link Folded LineNr | 998 | highlight! link Folded LineNr |
1000 | " highlight! Cursor guibg=#729fcf ctermbg=yellow | 999 | " highlight! Cursor guibg=#729fcf ctermbg=yellow |
1001 | highlight! link VertSplit LineNr | 1000 | highlight! link VertSplit NonText |
1002 | " highlight! SpellBad ctermbg=none | 1001 | " highlight! SpellBad ctermbg=none |
1003 | highlight! SpecialKey ctermfg=19 | 1002 | highlight! SpecialKey ctermfg=19 |
1004 | highlight! WhiteSpace ctermfg=19 | 1003 | highlight! WhiteSpace ctermfg=19 |
@@ -1180,7 +1179,7 @@ augroup status | |||
1180 | \ ."%{(&readonly\ ?\ '\ \ \ '\ :\ '')}" | 1179 | \ ."%{(&readonly\ ?\ '\ \ \ '\ :\ '')}" |
1181 | \ ."%{(&modified\ ?\ '\ \ '.nr2char(0xF0C7).'\ '\ :\ '')\ }" | 1180 | \ ."%{(&modified\ ?\ '\ \ '.nr2char(0xF0C7).'\ '\ :\ '')\ }" |
1182 | \ ."%{(haslocaldir() ?\ ' '.fnamemodify(getcwd(),\ ':.').' '.nr2char(0xe0b1)\ \:\ '')}\ " | 1181 | \ ."%{(haslocaldir() ?\ ' '.fnamemodify(getcwd(),\ ':.').' '.nr2char(0xe0b1)\ \:\ '')}\ " |
1183 | \ ."%{(&buftype\ ==\ \"terminal\"\ ?\ b:term_title\ :\ substitute(expand('%:p'),\ '^'.getcwd(-1).'/*',\ '',\ ''))\ }" | 1182 | \ ."%{(&buftype\ ==\ \"terminal\"\ ?\ has('nvim')?b:term_title:expand(&titlestring)\ :\ substitute(expand('%:p'),\ '^'.getcwd(-1).'/*',\ '',\ ''))\ }" |
1184 | \ ."%1(%)" | 1183 | \ ."%1(%)" |
1185 | \ ."%#".l:invert_group."#" | 1184 | \ ."%#".l:invert_group."#" |
1186 | \ .g:status_sym_end | 1185 | \ .g:status_sym_end |