From be1be078cf9e74919db5228c8f907a53e9662d51 Mon Sep 17 00:00:00 2001 From: Von Random Date: Wed, 21 Dec 2016 14:18:30 +0300 Subject: [PATCH] vimplugins and bashplugins should be sourced from a symlink, it is more flexible that way --- plugins.bash => bashplugins | 0 bashrc | 2 +- plugins.vim | 77 ----------------------------------- vimplugins | 80 +++++++++++++++++++++++++++++++++++++ vimrc | 2 +- 5 files changed, 82 insertions(+), 79 deletions(-) rename plugins.bash => bashplugins (100%) delete mode 100644 plugins.vim create mode 100644 vimplugins diff --git a/plugins.bash b/bashplugins similarity index 100% rename from plugins.bash rename to bashplugins diff --git a/bashrc b/bashrc index 05efd4e..5bad20b 100644 --- a/bashrc +++ b/bashrc @@ -145,7 +145,7 @@ alias rscreen='command screen -Dr' alias scr='command screen sudo -Es' # }}} # {{{ plugins and traps -plugins="${HOME}/vdotfiles/plugins.bash" +plugins="${HOME}/.bashplugins" [[ -r "${plugins}" ]] && . "${plugins}" # we want to see exit code on error (it also has to be the last entry here) diff --git a/plugins.vim b/plugins.vim deleted file mode 100644 index 2883067..0000000 --- a/plugins.vim +++ /dev/null @@ -1,77 +0,0 @@ -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 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' - Plug 'cocopon/iceberg.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 diff --git a/vimplugins b/vimplugins new file mode 100644 index 0000000..e493ad5 --- /dev/null +++ b/vimplugins @@ -0,0 +1,80 @@ +" support my own way of using plugins in vim / bash +autocmd BufRead *vimplugins set ft=vim +autocmd BufRead *bashplugins set ft=sh + +" enable plugins +set noshowmode +source ~/.vim/plugged/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' +Plug 'cocopon/iceberg.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', + \ } diff --git a/vimrc b/vimrc index 7230b9d..59c553b 100644 --- a/vimrc +++ b/vimrc @@ -59,7 +59,7 @@ nnoremap qw :wq nnoremap w :w " plugins -let plugins = expand("$HOME/vdotfiles/plugins.vim") +let plugins = expand("$HOME/.vimplugins") if filereadable(plugins) execute 'source ' . fnameescape(plugins) endif