diff options
author | Max Christian Pohle | 2017-08-29 21:27:52 +0200 |
---|---|---|
committer | Max Christian Pohle | 2017-08-30 09:27:52 +0200 |
commit | 70b1aef8f3721769d7998bdd55088250287066ba (patch) | |
tree | 267197d4853dc65f09cf17d5b72343d9cdc19743 | |
parent | 4afcd2c0bb7aa768f42ebbf5b5ef70fcc563aeba (diff) | |
download | vim-karlmarks-70b1aef8f3721769d7998bdd55088250287066ba.tar.bz2 vim-karlmarks-70b1aef8f3721769d7998bdd55088250287066ba.zip |
Changed Colorscheme, improved gvim support
-rw-r--r-- | gtk-3.0.css | 20 | ||||
-rw-r--r-- | vimrc-full | 58 |
2 files changed, 61 insertions, 17 deletions
diff --git a/gtk-3.0.css b/gtk-3.0.css new file mode 100644 index 0000000..614f277 --- /dev/null +++ b/gtk-3.0.css | |||
@@ -0,0 +1,20 @@ | |||
1 | #vim-menubar, | ||
2 | #vim-toolbar, | ||
3 | #vim-gui-drawarea, | ||
4 | #vim-main-window { | ||
5 | background-color: #fff; | ||
6 | /* background-image: url("/usr/share/backgrounds/xfce/Squirrel.jpg"); */ | ||
7 | color:#000; | ||
8 | font-family: "Roboto"; | ||
9 | font-weight:600; | ||
10 | font-size:8pt; | ||
11 | border:0px; | ||
12 | outline:0px; | ||
13 | } | ||
14 | |||
15 | #vim-menubar | ||
16 | { | ||
17 | padding-left:1em; | ||
18 | border-bottom:2px solid #000; | ||
19 | |||
20 | } | ||
@@ -130,7 +130,7 @@ if has("gui_running") | |||
130 | set guioptions+=m | " remove menu | 130 | set guioptions+=m | " remove menu |
131 | set guioptions-=e | " do not display tabs | 131 | set guioptions-=e | " do not display tabs |
132 | set guioptions-=L | " do not show left scrollbar | 132 | set guioptions-=L | " do not show left scrollbar |
133 | set guioptions+=r | " do not show right scrollbar | 133 | set guioptions-=r | " do not show right scrollbar |
134 | set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped) | 134 | set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped) |
135 | " set selectmode=mouse,key,cmd | " enters vim's select mode when pressing shift-left or shift-END | 135 | " set selectmode=mouse,key,cmd | " enters vim's select mode when pressing shift-left or shift-END |
136 | " set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text | 136 | " set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text |
@@ -201,7 +201,16 @@ set virtualedit=all | " virtual edit should be default behaviour, beca | |||
201 | set writedelay=0 | 201 | set writedelay=0 |
202 | set wildmenu | " use a menu in the command line | 202 | set wildmenu | " use a menu in the command line |
203 | set wildmode=longest:full | " do not preselect any entry and show all possible | 203 | set wildmode=longest:full | " do not preselect any entry and show all possible |
204 | set sessionoptions-=blank | 204 | set sessionoptions= |
205 | set sessionoptions+=buffers | ||
206 | set sessionoptions+=curdir | ||
207 | set sessionoptions+=folds | ||
208 | set sessionoptions+=tabpages | ||
209 | set sessionoptions+=winpos | ||
210 | set sessionoptions+=winsize | ||
211 | set sessionoptions+=resize | ||
212 | set sessionoptions+=unix | ||
213 | set sessionoptions+=slash | ||
205 | 214 | ||
206 | set nocindent smartindent | " use smart indent rather then cindent | 215 | set nocindent smartindent | " use smart indent rather then cindent |
207 | set noshiftround | " indent/unindent sna=ps to multiple of shiftwidths | 216 | set noshiftround | " indent/unindent sna=ps to multiple of shiftwidths |
@@ -373,10 +382,13 @@ if has("autocmd") | |||
373 | set wcm=<C-Z> | 382 | set wcm=<C-Z> |
374 | map <F4> :emenu <C-Z> | 383 | map <F4> :emenu <C-Z> |
375 | 384 | ||
376 | menu &Chdir.Git\ root | 385 | menu &Chdir.Git\ root<tab>:Gcd |
377 | \ :Gcd<CR>:pwd<CR> | 386 | \ :Gcd<CR>:pwd<CR> |
378 | 387 | ||
379 | menu &Chdir.current\ buffer | 388 | menu &Chdir.current\ buffer<tab>:cd\ %:h |
389 | \ :cd %:h<CR>:pwd<CR> | ||
390 | |||
391 | menu &Chdir.current\ buffer<tab>:lcd\ %:p:h | ||
380 | \ :lcd %:p:h<CR>:pwd<CR> | 392 | \ :lcd %:p:h<CR>:pwd<CR> |
381 | 393 | ||
382 | menu &Git.&Display\ last\ changes | 394 | menu &Git.&Display\ last\ changes |
@@ -477,6 +489,7 @@ endif | |||
477 | call plug#begin() | 489 | call plug#begin() |
478 | " Colorschemes: | 490 | " Colorschemes: |
479 | Plug 'chriskempson/base16-vim' | " not just one high quality color scheme (all named base16-*) | 491 | Plug 'chriskempson/base16-vim' | " not just one high quality color scheme (all named base16-*) |
492 | Plug 'NLKNguyen/papercolor-theme' | " the one I like the most | ||
480 | 493 | ||
481 | Plug 'mhinz/vim-signify' | " uses the sign column to indicate added, modified and removed lines | 494 | Plug 'mhinz/vim-signify' | " uses the sign column to indicate added, modified and removed lines |
482 | Plug 'tpope/vim-fugitive' | " the most complete GIT integration plugin | 495 | Plug 'tpope/vim-fugitive' | " the most complete GIT integration plugin |
@@ -572,7 +585,7 @@ let g:lightline_buffer_minfextlen = 3 | |||
572 | let g:lightline_buffer_reservelen = 20 | 585 | let g:lightline_buffer_reservelen = 20 |
573 | 586 | ||
574 | let g:lightline = { | 587 | let g:lightline = { |
575 | \ 'colorscheme': 'Tomorrow_Night_Bright', | 588 | \ 'colorscheme': 'Tomorrow_Night_Blue', |
576 | \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" }, | 589 | \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" }, |
577 | \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" }, | 590 | \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" }, |
578 | \ 'active': { | 591 | \ 'active': { |
@@ -604,6 +617,12 @@ let g:lightline = { | |||
604 | \ }, | 617 | \ }, |
605 | \ } | 618 | \ } |
606 | 619 | ||
620 | function! ExtendLightlineColorTheme() | ||
621 | highlight! link LightlineMiddle_normal Normal | ||
622 | endfunction | ||
623 | |||
624 | autocmd! ColorScheme * call ExtendLightlineColorTheme() | ||
625 | |||
607 | " Autocompleter: ===================================== | 626 | " Autocompleter: ===================================== |
608 | if has("python") | 627 | if has("python") |
609 | " YouCompleteMe: ===================================================================================================== | 628 | " YouCompleteMe: ===================================================================================================== |
@@ -726,7 +745,9 @@ function! ExtendColorTheme() | |||
726 | syntax sync minlines=60 | " how many preceding lines will be parsed? (has performance impact) | 745 | syntax sync minlines=60 | " how many preceding lines will be parsed? (has performance impact) |
727 | 746 | ||
728 | " use the default terminal background color as background (allows transparency) | 747 | " use the default terminal background color as background (allows transparency) |
729 | " highlight Normal ctermbg=NONE ctermfg=black | 748 | " highlight! Normal guibg=NONE guifg=black ctermbg=NONE ctermfg=black |
749 | " highlight! NonText guibg=NONE guifg=black ctermbg=NONE ctermfg=black | ||
750 | highlight! EndOfBuffer guifg=white ctermfg=white | ||
730 | 751 | ||
731 | highlight! CursorLineNr cterm=inverse | " ctermbg=black ctermfg=NONE | 752 | highlight! CursorLineNr cterm=inverse | " ctermbg=black ctermfg=NONE |
732 | highlight! Pmenu ctermbg=LightYellow ctermfg=blue | 753 | highlight! Pmenu ctermbg=LightYellow ctermfg=blue |
@@ -755,18 +776,21 @@ function! ExtendColorTheme() | |||
755 | endfunction | 776 | endfunction |
756 | autocmd! ColorScheme * call ExtendColorTheme() | 777 | autocmd! ColorScheme * call ExtendColorTheme() |
757 | 778 | ||
758 | set background=dark | " critical: should be set by the colorscheme, but often is not or gets used by it | ||
759 | |||
760 | if filereadable(expand("~/.config/base16-shell/colortest")) | ||
761 | let g:base16_shell_path="~/.config/base16-shell/scripts" | ||
762 | endif | ||
763 | 779 | ||
764 | let base16colorspace=256 | 780 | colorscheme PaperColor |
765 | if filereadable(expand("~/.vimrc_background")) | 781 | set background=light |
766 | source ~/.vimrc_background | 782 | " set background=dark | " critical: should be set by the colorscheme, but often is not or gets used by it |
767 | else | 783 | " |
768 | colorscheme base16-phd | 784 | " if filereadable(expand("~/.config/base16-shell/colortest")) |
769 | endif | 785 | " let g:base16_shell_path="~/.config/base16-shell/scripts" |
786 | " endif | ||
787 | " | ||
788 | " let base16colorspace=256 | ||
789 | " if filereadable(expand("~/.vimrc_background")) | ||
790 | " source ~/.vimrc_background | ||
791 | " else | ||
792 | " colorscheme base16-phd | ||
793 | " endif | ||
770 | 794 | ||
771 | 795 | ||
772 | " ====================================================================================================================== | 796 | " ====================================================================================================================== |