diff --git a/plugins.vim b/plugins.vim new file mode 100644 index 0000000..4f27db2 --- /dev/null +++ b/plugins.vim @@ -0,0 +1,76 @@ +if filereadable(expand("$HOME/.vim/plugged/vim-plug/plug.vim")) + set noshowmode + source ~/.vimplug/vim-plug/plug.vim + silent!call plug#begin('~/.vim/plugged') + " plugin manager for self updates + Plug 'junegunn/vim-plug' + + " general plugins + Plug 'Lokaltog/vim-easymotion' "easy motion + Plug 'directionalWindowResizer' "resize windows with simple hotkeys + Plug 'jeetsukumaran/vim-buffergator' "buffer management + Plug 'junegunn/vim-easy-align' "aligning + Plug 'mhinz/vim-signify' "version control system gutter info + Plug 'nvie/vim-togglemouse' "hotkey to toggle mouse + Plug 'vim-airline/vim-airline' "airline + Plug 'vim-airline/vim-airline-themes' "themes for airline + Plug 'wincent/command-t' "fuzzy file search + Plug 'tpope/vim-fugitive' "moar git awesomeness + Plug 'sheerun/vim-polyglot' "syntax + + " python, uncomment when needed + "Plug 'neomake/neomake' "linter + "Plug 'davidhalter/jedi-vim' "python support + "Plug 'ervandew/supertab' "TAB autocompletion + + " colorschemes + Plug 'lifepillar/vim-solarized8' + + " syntax highlight plugins + Plug 'neilhwatson/vim_cf3' + call plug#end() + + " easymotion options + let g:EasyMotion_do_mapping=0 + let g:EasyMotion_smartcase=1 + nmap f (easymotion-s) + map j (easymotion-j) + map k (easymotion-k) + + " airline options + let g:airline_symbols={} + let g:airline_symbols.whitespace='!' + let g:airline_powerline_fonts=1 + let g:airline_exclude_preview=1 + let g:airline_extensions=['hunks'] + let g:airline_section_z='%3p%% %{g:airline_symbols.linenr}%4l:%3v' + + " buffergator options + map :BuffergatorToggle + + " signify options + let g:signify_vcs_list=[ 'svn', 'git', 'fossil' ] + let g:signify_sign_change='~' + + " vim-togglemouse options + nmap m + + " easy-align options + xmap a (EasyAlign) + nmap a (EasyAlign) + + " neomake + nmap i :Neomake + let g:neomake_error_sign={ + \ 'text': 'e>', + \ 'texthl': 'ErrorMsg', + \ } + let g:neomake_warning_sign={ + \ 'text': 'w>', + \ 'texthl': 'WarningMsg', + \ } + let g:neomake_info_sign={ + \ 'text': 'i>', + \ 'texthl': 'InfoMsg', + \ } +endif diff --git a/vimrc b/vimrc index 4e80466..e0b2e7a 100644 --- a/vimrc +++ b/vimrc @@ -63,142 +63,33 @@ nmap qw :wq nmap w :w " still have to deal with old vim versions :< -if v:version >= 700 - if v:version >= 703 - set colorcolumn=80 - set relativenumber - nnoremap r :setlocal relativenumber! - endif - if v:version >= 800 - set breakindent - endif - - set helplang=en - set list - set number - set listchars=tab:\|_,nbsp:x,trail:* - nnoremap n :setlocal number! - nnoremap l :setlocal list! - - " enable case indentation - let g:sh_indent_case_labels=1 - - " plugins - if filereadable(expand("$HOME/.vim/plugged/vim-plug/plug.vim")) - set noshowmode - source ~/.vim/plugged/vim-plug/plug.vim - silent!call plug#begin('~/.vim/plugged') - "plugin manager - Plug 'junegunn/vim-plug' - - " general plugins - Plug 'Lokaltog/vim-easymotion' "easy motion - Plug 'directionalWindowResizer' "resize windows with simple hotkeys - Plug 'jeetsukumaran/vim-buffergator' "buffer management - Plug 'junegunn/vim-easy-align' "aligning - Plug 'mhinz/vim-signify' "version control system gutter info - Plug 'nvie/vim-togglemouse' "hotkey to toggle mouse - Plug 'vim-airline/vim-airline' "airline - Plug 'vim-airline/vim-airline-themes' "themes for airline - Plug 'wincent/command-t' "fuzzy file search - Plug 'tpope/vim-fugitive' "moar git awesomeness - - " python, uncomment when needed - "Plug 'neomake/neomake' "linter - "Plug 'davidhalter/jedi-vim' "python support - "Plug 'ervandew/supertab' "TAB autocompletion - - " colorschemes - Plug 'lifepillar/vim-solarized8' - "Plug 'jonathanfilip/vim-lucius' - " some good true color themes - "Plug 'cocopon/iceberg.vim' - "Plug 'KeitaNakamura/neodark.vim' - "Plug 'chriskempson/base16-vim' - - " syntax highlight plugins - Plug 'neilhwatson/vim_cf3' - call plug#end() - - " easymotion options - let g:EasyMotion_do_mapping=0 - let g:EasyMotion_smartcase=1 - nmap f (easymotion-s) - map j (easymotion-j) - map k (easymotion-k) - - " airline options - let g:airline_symbols={} - let g:airline_symbols.whitespace='!' - let g:airline_powerline_fonts=1 - let g:airline_exclude_preview=1 - let g:airline_extensions=['hunks'] - let g:airline_section_z='%3p%% %{g:airline_symbols.linenr}%4l:%3v' - - " buffergator options - map :BuffergatorToggle - - " signify options - let g:signify_vcs_list=[ 'svn', 'git', 'fossil' ] - let g:signify_sign_change='~' - - " vim-togglemouse options - nmap m - - " easy-align options - xmap a (EasyAlign) - nmap a (EasyAlign) - - " neomake - nmap i :Neomake - let g:neomake_error_sign={ - \ 'text': 'e>', - \ 'texthl': 'ErrorMsg', - \ } - let g:neomake_warning_sign={ - \ 'text': 'w>', - \ 'texthl': 'WarningMsg', - \ } - let g:neomake_info_sign={ - \ 'text': 'i>', - \ 'texthl': 'InfoMsg', - \ } - endif - - " gvim and colorschemes related stuff - if has("gui_running") - set guioptions=aegimLl - set mouse=a - set guifont=Fantasque\ Sans\ Mono\ 11 - set novb - set guicursor=a:block "block cursor by default - set guicursor+=i:ver1-Cursor/lCursor "i-beam for insert mode - set guicursor+=r:hor1-Cursor/lCursor "underline for replace - set guicursor+=a:blinkon0 "and none of them should blink - set guiheadroom=0 - colorscheme solarized8_light - map - map! - " if true color support and I want to use it: - "elseif (has("nvim") || v:version >= 800) && $TERM != 'screen' - " " fix tmux and st - " set t_8f=[38;2;%lu;%lu;%lum - " set t_8b=[48;2;%lu;%lu;%lum - " set termguicolors - " set mouse=a - " let g:airline_theme='neodark' - " colorscheme iceberg - else - if $TERM != 'screen' - set mouse=a - else - set mouse= - endif - colorscheme solarized8_light - endif -else - colorscheme default +if v:version >= 703 + set colorcolumn=80 + set relativenumber + nnoremap r :setlocal relativenumber! endif +if v:version >= 800 + set breakindent +endif + +set mouse= + +set helplang=en +set list +set number +set listchars=tab:\|_,nbsp:x,trail:* +nnoremap n :setlocal number! +nnoremap l :setlocal list! + +" enable case indentation +let g:sh_indent_case_labels=1 + +" plugins +if filereadable(expand("$HOME/vdotfiles/plugins.vim")) + source ~/vdotfiles/plugins.vim +endif + +colorscheme solarized8_light syntax on