diff options
Diffstat (limited to 'vim')
-rw-r--r-- | vim/colors/dessert.vim | 12 | ||||
-rw-r--r-- | vim/vimrc | 53 |
2 files changed, 46 insertions, 19 deletions
diff --git a/vim/colors/dessert.vim b/vim/colors/dessert.vim index 68eb54cd..b810b974 100644 --- a/vim/colors/dessert.vim +++ b/vim/colors/dessert.vim @@ -233,7 +233,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256 "DiffDelete "DiffText "ErrorMsg - call <SID>X("VertSplit", "c2bfa5", "7f7f7f", "reverse") + call <SID>X("VertSplit", "444444", "7f7f7f", "") call <SID>X("Folded", "ffd700", "4d4d4d", "") call <SID>X("FoldColumn", "d2b48c", "4d4d4d", "") call <SID>X("IncSearch", "445599", "aabbff", "") @@ -244,9 +244,12 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256 call <SID>X("Question", "00ff7f", "", "") call <SID>X("Search", "aabbff", "334499", "") call <SID>X("SpecialKey", "9acd32", "", "") - call <SID>X("StatusLine", "c2bfa5", "000000", "reverse") - call <SID>X("StatusLineNC", "c2bfa5", "7f7f7f", "reverse") - call <SID>X("Title", "cd5c5c", "", "") + call <SID>X("StatusLine", "444444", "ffffff", "") + call <SID>X("StatusLineNC", "444444", "000000", "") + call <SID>X("TabLine", "000000", "444444", "none") + call <SID>X("TabLineSel", "ffffff", "444444", "none") + call <SID>X("TabLineFill", "444444", "000000", "") + call <SID>X("Title", "888888", "", "") call <SID>X("Visual", "6b8e23", "f0e68c", "reverse") "VisualNOS call <SID>X("WarningMsg", "fa8072", "", "") @@ -318,3 +321,4 @@ else hi Error cterm= ctermfg=7 ctermbg=1 hi Pmenu ctermfg=0 ctermbg=8 endif + @@ -12,6 +12,9 @@ endif set nobackup set nowritebackup +" Buffers +set hidden + " Colors if has("syntax") syntax enable @@ -21,7 +24,7 @@ if has("syntax") endtry endif -" Command +" Commands if has("cmdline_info") set ruler set showcmd @@ -29,8 +32,12 @@ endif " Completion if has("wildmenu") - set wildmode=longest,list + set wildignore+=*.a,*.o + set wildignore+=*.bmp,*.gif,*.ico,*.jpg,*.png + set wildignore+=.DS_Store,.git,.hg,.svn + set wildignore+=*~,*.sw,*.tmp set wildmenu + set wildmode=longest,list endif " Encoding @@ -39,6 +46,16 @@ if has("multi_byte") set encoding=utf-8 endif +" Formatting +set expandtab +set formatoptions+=coqnr1 +set nojoinspaces +set shiftround +set shiftwidth=4 +set softtabstop=4 +set tabstop=4 +set textwidth=78 + " History set history=100 @@ -55,11 +72,18 @@ nnoremap <leader>w :set wrap!<CR> " Macros set lazyredraw +" Numbering +set number + " Miscellaneous set backspace=indent,eol,start +set modelines=0 set shortmess+=I set visualbell t_vb= +" Scrolling +set sidescroll=1 + " Search set hlsearch set incsearch @@ -70,13 +94,8 @@ if has("spell") set spelllang=en_nz endif -" Splits -if has("windows") - set splitbelow - if has("vertsplit") - set splitright - endif -endif +" Status +set laststatus=2 " Swaps set noswapfile @@ -89,12 +108,16 @@ command Q q command QA qa command Qa qa -" Whitespace -set expandtab -set nojoinspaces -set shiftwidth=4 -set softtabstop=4 -set tabstop=4 +" Windows +if has("windows") + set showtabline=2 + set splitbelow + if has("vertsplit") + set fillchars= + set splitright + endif + au VimResized * exe "normal! \<C-w>=" +endif " Wrapping set nowrap |