From 6c4c5f2518a71dbd92727781b7d3b3f86c248e6c Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Wed, 15 Jun 2016 13:55:21 +0200 Subject: [PATCH] main vimrc cleaning --- vim/colors/smyck.vim | 95 -------------------------------------------- vim/init.vim | 51 +++++++++++++----------- 2 files changed, 27 insertions(+), 119 deletions(-) delete mode 100644 vim/colors/smyck.vim diff --git a/vim/colors/smyck.vim b/vim/colors/smyck.vim deleted file mode 100644 index 12592ad..0000000 --- a/vim/colors/smyck.vim +++ /dev/null @@ -1,95 +0,0 @@ -" ---------------------------------------------------------------------------- -" Vim color file -" Maintainer: John-Paul Bader -" Last Change: 2012 April -" License: Beer Ware -" ---------------------------------------------------------------------------- - -" Reset Highlighting -hi clear -if exists("syntax_on") - syntax reset -endif - -set background=dark -set linespace=3 - -let g:colors_name = "smyck" - -hi Normal cterm=none ctermbg=none ctermfg=15 gui=none guibg=#282828 guifg=#F7F7F7 -hi LineNr cterm=none ctermbg=none ctermfg=8 gui=none guibg=#282828 guifg=#8F8F8F -hi StatusLine cterm=none ctermbg=8 ctermfg=15 gui=none guibg=#5D5D5D guifg=#FBFBFB -hi StatusLineNC cterm=none ctermbg=15 ctermfg=8 gui=none guibg=#5D5D5D guifg=#FBFBFB -hi Search cterm=none ctermbg=6 ctermfg=15 gui=none guibg=#2EB5C1 guifg=#F7F7F7 -hi IncSearch cterm=none ctermbg=3 ctermfg=8 gui=none guibg=#F6DC69 guifg=#8F8F8F -hi ColumnMargin cterm=none ctermbg=0 gui=none guibg=#000000 -hi Error cterm=none ctermbg=1 ctermfg=15 gui=none guifg=#F7F7F7 -hi ErrorMsg cterm=none ctermbg=1 ctermfg=15 gui=none guifg=#F7F7F7 -hi Folded cterm=none ctermbg=8 ctermfg=2 gui=none guibg=#3B3B3B guifg=#90AB41 -hi FoldColumn cterm=none ctermbg=8 ctermfg=2 gui=none guibg=#3B3B3B guifg=#90AB41 -hi NonText cterm=bold ctermbg=none ctermfg=8 gui=bold guifg=#8F8F8F -hi ModeMsg cterm=bold ctermbg=none ctermfg=10 gui=none -hi Pmenu cterm=none ctermbg=8 ctermfg=15 gui=none guibg=#8F8F8F guifg=#F7F7F7 -hi PmenuSel cterm=none ctermbg=15 ctermfg=8 gui=none guibg=#F7F7F7 guifg=#8F8F8F -hi PmenuSbar cterm=none ctermbg=15 ctermfg=8 gui=none guibg=#F7F7F7 guifg=#8F8F8F -hi SpellBad cterm=none ctermbg=1 ctermfg=15 gui=none guifg=#F7F7F7 -hi SpellCap cterm=none ctermbg=4 ctermfg=15 gui=none guifg=#F7F7F7 -hi SpellRare cterm=none ctermbg=4 ctermfg=15 gui=none guifg=#F7F7F7 -hi SpellLocal cterm=none ctermbg=4 ctermfg=15 gui=none guifg=#F7F7F7 -hi Visual cterm=none ctermbg=15 ctermfg=8 gui=none guibg=#F7F7F7 guifg=#8F8F8F -hi Directory cterm=none ctermbg=none ctermfg=4 gui=none guibg=#242424 guifg=#88CCE7 -hi SpecialKey cterm=none ctermbg=none ctermfg=8 gui=none guifg=#8F8F8F -hi DiffAdd cterm=bold ctermbg=2 ctermfg=15 -hi DiffChange cterm=bold ctermbg=4 ctermfg=15 -hi DiffDelete cterm=bold ctermbg=1 ctermfg=15 -hi DiffText cterm=bold ctermbg=3 ctermfg=8 -hi MatchParen cterm=none ctermbg=6 ctermfg=15 gui=none guibg=#2EB5C1 guifg=#F7F7F7 -hi CursorLine cterm=none ctermbg=238 ctermfg=none gui=none guibg=#424242 -hi CursorColumn cterm=none ctermbg=238 ctermfg=none gui=none guibg=#424242 -hi Title cterm=none ctermbg=none ctermfg=4 gui=none guifg=#88CCE7 - -" ---------------------------------------------------------------------------- -" Syntax Highlighting -" ---------------------------------------------------------------------------- -hi Keyword cterm=none ctermbg=none ctermfg=10 gui=none guifg=#D1FA71 -hi Comment cterm=none ctermbg=none ctermfg=8 gui=none guifg=#8F8F8F -hi Delimiter cterm=none ctermbg=none ctermfg=15 gui=none guifg=#F7F7F7 -hi Identifier cterm=none ctermbg=none ctermfg=12 gui=none guifg=#96D9F1 -hi Structure cterm=none ctermbg=none ctermfg=12 gui=none guifg=#9DEEF2 -hi Ignore cterm=none ctermbg=none ctermfg=8 gui=none guifg=bg -hi Constant cterm=none ctermbg=none ctermfg=12 gui=none guifg=#96D9F1 -hi PreProc cterm=none ctermbg=none ctermfg=10 gui=none guifg=#D1FA71 -hi Type cterm=none ctermbg=none ctermfg=12 gui=none guifg=#96D9F1 -hi Statement cterm=none ctermbg=none ctermfg=10 gui=none guifg=#D1FA71 -hi Special cterm=none ctermbg=none ctermfg=6 gui=none guifg=#d7d7d7 -hi String cterm=none ctermbg=none ctermfg=3 gui=none guifg=#F6DC69 -hi Number cterm=none ctermbg=none ctermfg=3 gui=none guifg=#F6DC69 -hi Underlined cterm=none ctermbg=none ctermfg=magenta gui=underline guibg=#272727 -hi Symbol cterm=none ctermbg=none ctermfg=9 gui=none guifg=#FAB1AB -hi Method cterm=none ctermbg=none ctermfg=15 gui=none guifg=#F7F7F7 -hi Interpolation cterm=none ctermbg=none ctermfg=6 gui=none guifg=#2EB5C1 - -" Erlang -hi link erlangAtom Keyword -hi link erlangBitType Keyword - -hi link rubyBeginend Keyword -hi link rubyClass Keyword -hi link rubyModule Keyword -hi link rubyKeyword Keyword -hi link rubyOperator Method -hi link rubyIdentifier Keyword -hi link rubyClassVariable Symbol -hi link rubyInstanceVariable Constant -hi link rubyGlobalVariable Constant -hi link rubyClassVariable Method -hi link rubyConstant Constant -hi link rubySymbol Symbol -hi link rubyFunction Constant -hi link rubyControl Keyword -hi link rubyConditional Keyword -hi link rubyInterpolation Interpolation -hi link rubyInterpolationDelimiter Interpolation -hi link rubyRailsMethod Method - - diff --git a/vim/init.vim b/vim/init.vim index 9b18d12..8e904b4 100644 --- a/vim/init.vim +++ b/vim/init.vim @@ -1,35 +1,32 @@ syntax on -set background=dark -colorscheme smyck -set guifont=MesloLGSDZ\ Nerd\ Font -hi BadWhitespace ctermbg=lightblue guibg=lightblue - -set gdefault -set nobackup -set nodigraph -set incsearch -set nohlsearch -set nojoinspaces -set nowritebackup set title set number -set noshowmode -set ruler -set laststatus=2 -set ignorecase +set gdefault +set wildmenu +set nobackup +set incsearch +set expandtab set smartcase -set backspace=eol,start,indent -set winminheight=0 -set scrolloff=5 +set ignorecase +set nohlsearch +set noshowmode +set autoindent +set shiftround set cursorline set cursorcolumn +set nojoinspaces +set nowritebackup -set shiftwidth=2 tabstop=2 softtabstop=2 expandtab -set shiftround -set autoindent -set matchpairs+=(:),{:},[:],<:>,':',":" set bs=2 +set tabstop=2 +set scrolloff=5 +set laststatus=2 +set shiftwidth=2 +set softtabstop=2 +set winminheight=0 +set backspace=eol,start,indent +set matchpairs+=(:),{:},[:],<:>,':',":" nmap w nmap  :wq! @@ -51,13 +48,19 @@ Plug 'godlygeek/tabular' Plug 'rodjek/vim-puppet' Plug 'ctrlpvim/ctrlp.vim' Plug 'edkolev/tmuxline.vim' +Plug 'brendonrapp/smyck-vim' Plug 'bitc/vim-bad-whitespace' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' -" has to be called as lat plugin +" has to be called as last plugin Plug 'ryanoasis/vim-devicons' call plug#end() +colorscheme smyck +set guifont=MesloLGSDZ\ Nerd\ Font:h11 +set background=dark +hi BadWhitespace ctermbg=lightblue guibg=lightblue + let g:airline_theme = 'powerlineish' let g:airline#extensions#tabline#enabled = 1 let g:airline_powerline_fonts = 1