enforce 256 colours (kinda tired of default and elflord themes everywhere on old machines) + fix indentation and some other tweaks
This commit is contained in:
parent
1ac60219ba
commit
cc00f4a783
1 changed files with 38 additions and 33 deletions
71
vimrc
71
vimrc
|
|
@ -26,6 +26,11 @@ set foldmethod=marker
|
||||||
" disable bell
|
" disable bell
|
||||||
set noerrorbells visualbell t_vb=
|
set noerrorbells visualbell t_vb=
|
||||||
|
|
||||||
|
" enforce 256 colours for ssh connections and VTE
|
||||||
|
if $TERM == 'xterm' || exists("$SSH_CLIENT")
|
||||||
|
let &t_Co=256
|
||||||
|
endif
|
||||||
|
|
||||||
" set indentation options for specific file types
|
" set indentation options for specific file types
|
||||||
autocmd FileType ruby setlocal sts=2 sw=2 expandtab
|
autocmd FileType ruby setlocal sts=2 sw=2 expandtab
|
||||||
autocmd FileType eruby setlocal sts=2 sw=2 expandtab
|
autocmd FileType eruby setlocal sts=2 sw=2 expandtab
|
||||||
|
|
@ -54,42 +59,40 @@ if v:version >= 703
|
||||||
filetype off
|
filetype off
|
||||||
set rtp+=~/.vim/bundle/Vundle.vim/
|
set rtp+=~/.vim/bundle/Vundle.vim/
|
||||||
silent! call vundle#begin()
|
silent! call vundle#begin()
|
||||||
Plugin 'gmarik/Vundle.vim' "plugin manager
|
Plugin 'gmarik/Vundle.vim' "plugin manager
|
||||||
|
|
||||||
" general plugins
|
" general plugins
|
||||||
" from github.com
|
" from github.com
|
||||||
Plugin 'bling/vim-airline' "stylish info display
|
Plugin 'bling/vim-airline' "stylish info display
|
||||||
Plugin 'bling/vim-bufferline' "stylish buffer display
|
Plugin 'bling/vim-bufferline' "stylish buffer display
|
||||||
Plugin 'jeetsukumaran/vim-buffergator' "buffer management
|
Plugin 'bhiestand/vcscommand' "shortcuts for vcs
|
||||||
Plugin 'kien/ctrlp.vim' "some quick file accessiong goodness
|
Plugin 'jeetsukumaran/vim-buffergator' "buffer management
|
||||||
Plugin 'mbbill/undotree' "undo buffer manager
|
Plugin 'kien/ctrlp.vim' "some quick file accessiong goodness
|
||||||
Plugin 'mhinz/vim-signify' "version control system gutter info
|
Plugin 'mbbill/undotree' "undo buffer manager
|
||||||
Plugin 'msanders/snipmate.vim' "snippets support
|
Plugin 'mhinz/vim-signify' "version control system gutter info
|
||||||
Plugin 'scrooloose/nerdcommenter' "comment manager
|
Plugin 'msanders/snipmate.vim' "snippets support
|
||||||
Plugin 'scrooloose/nerdtree' "file manager
|
Plugin 'scrooloose/nerdcommenter' "comment manager
|
||||||
Plugin 'scrooloose/syntastic' "syntax checker
|
Plugin 'scrooloose/nerdtree' "file manager
|
||||||
Plugin 'tpope/vim-fugitive' "git awesomeness
|
Plugin 'scrooloose/syntastic' "syntax checker
|
||||||
Plugin 'tpope/vim-surround' "quotes replacement made easy
|
Plugin 'tpope/vim-fugitive' "git awesomeness
|
||||||
Plugin 'tpope/vim-tbone' "tmux support
|
Plugin 'tpope/vim-surround' "quotes replacement made easy
|
||||||
|
Plugin 'tpope/vim-tbone' "tmux support
|
||||||
|
|
||||||
" from vim.sf.net
|
" from vim.sf.net
|
||||||
Plugin 'directionalWindowResizer' "resize windows with simple hotkeys
|
Plugin 'directionalWindowResizer' "resize windows with simple hotkeys
|
||||||
Plugin 'vcscommand.vim' "shortcuts for vcs
|
|
||||||
|
|
||||||
" colorscheme ...
|
" colorscheme ...
|
||||||
Plugin 'vdrandom/forked-solarized.vim' "solarized
|
Plugin 'vdrandom/forked-solarized.vim' "solarized
|
||||||
Plugin 'nanotech/jellybeans.vim' "jellybeans
|
Plugin 'nanotech/jellybeans.vim' "jellybeans
|
||||||
Plugin 'tomasr/molokai' "molokai
|
Plugin 'tomasr/molokai' "molokai
|
||||||
|
|
||||||
" syntax highlight plugins
|
" syntax highlight plugins
|
||||||
Plugin 'dag/vim-fish' "fish
|
Plugin 'dag/vim-fish' "fish
|
||||||
Plugin 'puppetlabs/puppet-syntax-vim' "puppet
|
Plugin 'puppetlabs/puppet-syntax-vim' "puppet
|
||||||
Plugin 'nagios-syntax' "nagios / icinga
|
Plugin 'nagios-syntax' "nagios / icinga
|
||||||
silent! call vundle#end()
|
silent! call vundle#end()
|
||||||
|
|
||||||
" airline options
|
" airline options
|
||||||
if &t_Co > 88 || has("gui_running")
|
|
||||||
let g:airline_powerline_fonts = 1
|
|
||||||
endif
|
|
||||||
let g:airline_symbols = {}
|
let g:airline_symbols = {}
|
||||||
let g:airline_symbols.whitespace = '!'
|
let g:airline_symbols.whitespace = '!'
|
||||||
|
|
||||||
|
|
@ -106,14 +109,13 @@ if v:version >= 703
|
||||||
|
|
||||||
" buffergator options
|
" buffergator options
|
||||||
map <C-W>, :BuffergatorToggle<cr>
|
map <C-W>, :BuffergatorToggle<cr>
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
" set color scheme depending on the terminal capabilities
|
" check before setting
|
||||||
if &t_Co > 88 || has("gui_running")
|
if &t_Co > 88
|
||||||
colorscheme solarized
|
let g:airline_powerline_fonts = 1
|
||||||
else
|
colorscheme solarized
|
||||||
colorscheme elflord
|
endif
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" gvim stuff
|
" gvim stuff
|
||||||
|
|
@ -123,10 +125,13 @@ if has("gui_running")
|
||||||
let NERDTreeDirArrows=1
|
let NERDTreeDirArrows=1
|
||||||
set guioptions=aegimLl
|
set guioptions=aegimLl
|
||||||
set mouse=a
|
set mouse=a
|
||||||
set guifont=Terminus\ 11
|
set guifont=Monofur\ 11
|
||||||
set novb
|
set novb
|
||||||
map <S-Insert> <MiddleMouse>
|
map <S-Insert> <MiddleMouse>
|
||||||
map! <S-Insert> <MiddleMouse>
|
map! <S-Insert> <MiddleMouse>
|
||||||
|
colorscheme jellybeans
|
||||||
|
elseif &t_Co < 88
|
||||||
|
colorscheme elflord
|
||||||
endif
|
endif
|
||||||
|
|
||||||
syntax on
|
syntax on
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue