mirror of
https://github.com/ViViDboarder/vim-settings.git
synced 2024-12-23 00:47:34 +00:00
Clean plugins rc a bit
Reorganize things
This commit is contained in:
parent
90b505bb34
commit
f50cdda385
@ -21,17 +21,28 @@ endfunction
|
|||||||
command! SavePlugSnapshot call s:save_snapshot()
|
command! SavePlugSnapshot call s:save_snapshot()
|
||||||
|
|
||||||
|
|
||||||
" Navigation {{
|
" General
|
||||||
Plug 'vim-scripts/file-line'
|
Plug 'godlygeek/tabular' " Tabular spacing
|
||||||
|
Plug 'gregsexton/MatchTag'
|
||||||
|
Plug 'tpope/vim-endwise'
|
||||||
|
Plug 'tpope/vim-eunuch'
|
||||||
|
Plug 'tpope/vim-repeat'
|
||||||
|
Plug 'tpope/vim-rsi' " emacs bindinds in insert
|
||||||
|
Plug 'tpope/vim-surround'
|
||||||
Plug 'tpope/vim-vinegar'
|
Plug 'tpope/vim-vinegar'
|
||||||
" }} Navigation
|
Plug 'vim-scripts/file-line'
|
||||||
|
if !g:gui.has_buffer_features
|
||||||
|
call s:smart_source_rc('plugins/airline')
|
||||||
|
call s:smart_source_rc('plugins/startify')
|
||||||
|
endif
|
||||||
|
Plug 'milkypostman/vim-togglelist'
|
||||||
|
nnoremap <silent> <F6> :call ToggleQuickfixList()<CR>
|
||||||
|
nnoremap <silent> <F7> :call ToggleLocationList()<CR>
|
||||||
|
" Plug 'edkolev/tmuxline.vim' " Removed because this can fail on some machines
|
||||||
|
" let g:tmuxline_powerline_separators = 0
|
||||||
|
call s:smart_source_rc('plugins/goyo-limelight') " Distraction free editing
|
||||||
|
|
||||||
" Git {{
|
" Searching
|
||||||
call s:smart_source_rc('plugins/fugitive')
|
|
||||||
call s:smart_source_rc('plugins/gitgutter')
|
|
||||||
" }} Git
|
|
||||||
|
|
||||||
" Searching {{
|
|
||||||
if !exists('g:gui_oni')
|
if !exists('g:gui_oni')
|
||||||
if !executable('fzf')
|
if !executable('fzf')
|
||||||
call s:smart_source_rc('plugins/ctrlp')
|
call s:smart_source_rc('plugins/ctrlp')
|
||||||
@ -39,13 +50,20 @@ if !exists('g:gui_oni')
|
|||||||
call s:smart_source_rc('plugins/fzf')
|
call s:smart_source_rc('plugins/fzf')
|
||||||
call s:smart_source_rc('plugins/vim-grepper')
|
call s:smart_source_rc('plugins/vim-grepper')
|
||||||
endif
|
endif
|
||||||
" }} Searching
|
|
||||||
|
|
||||||
" Programming {{
|
" Git / Version control
|
||||||
|
call s:smart_source_rc('plugins/fugitive')
|
||||||
|
call s:smart_source_rc('plugins/gitgutter')
|
||||||
|
|
||||||
|
" Programming
|
||||||
Plug 'FooSoft/vim-argwrap'
|
Plug 'FooSoft/vim-argwrap'
|
||||||
|
nnoremap <silent> <leader>a :ArgWrap<CR>
|
||||||
Plug 'tomtom/tcomment_vim', { 'on': ['TComment', 'TCommentBlock'] }
|
Plug 'tomtom/tcomment_vim', { 'on': ['TComment', 'TCommentBlock'] }
|
||||||
nnoremap // :TComment<CR>
|
nnoremap // :TComment<CR>
|
||||||
vnoremap // :TCommentBlock<CR>
|
vnoremap // :TCommentBlock<CR>
|
||||||
|
Plug 'rizzatti/dash.vim', { 'on': 'DashSearch' }
|
||||||
|
nmap <silent> <leader>d <Plug>DashSearch
|
||||||
|
let g:dash_map = { 'apex' : 'apex', 'visualforce' : 'vf' }
|
||||||
|
|
||||||
" IDE stuff
|
" IDE stuff
|
||||||
|
|
||||||
@ -75,9 +93,7 @@ if (g:vim_as_an_ide && !g:gui.has_linter_features) && (has('nvim') || v:version
|
|||||||
\ 'go': ['gofmt', 'goimports'],
|
\ 'go': ['gofmt', 'goimports'],
|
||||||
\ 'json': s:ale_pretty_trim_fixer,
|
\ 'json': s:ale_pretty_trim_fixer,
|
||||||
\ 'rust': ['rustfmt'],
|
\ 'rust': ['rustfmt'],
|
||||||
\ 'python': [
|
\ 'python': [ 'autopep8', 'reorder-python-imports', 'remove_trailing_lines', 'trim_whitespace'],
|
||||||
\ 'autopep8', 'reorder-python-imports',
|
|
||||||
\ 'remove_trailing_lines', 'trim_whitespace'],
|
|
||||||
\ 'markdown': s:ale_pretty_trim_fixer,
|
\ 'markdown': s:ale_pretty_trim_fixer,
|
||||||
\ 'yaml': ['prettier', 'remove_trailing_lines'],
|
\ 'yaml': ['prettier', 'remove_trailing_lines'],
|
||||||
\ 'css': s:ale_pretty_trim_fixer,
|
\ 'css': s:ale_pretty_trim_fixer,
|
||||||
@ -120,21 +136,8 @@ if g:vim_as_an_ide && (v:version > 703) && !g:gui.has_ctags_features
|
|||||||
Plug 'ludovicchabant/vim-gutentags' " Auto generate tags files
|
Plug 'ludovicchabant/vim-gutentags' " Auto generate tags files
|
||||||
command! TagsUpdate :GutentagsUpdate
|
command! TagsUpdate :GutentagsUpdate
|
||||||
end
|
end
|
||||||
" }}
|
|
||||||
|
|
||||||
" GUI {{
|
" Filetype configuration
|
||||||
Plug 'gregsexton/MatchTag'
|
|
||||||
call s:smart_source_rc('plugins/dash')
|
|
||||||
if !g:gui.has_buffer_features
|
|
||||||
call s:smart_source_rc('plugins/airline')
|
|
||||||
call s:smart_source_rc('plugins/startify')
|
|
||||||
endif
|
|
||||||
" Plug 'edkolev/tmuxline.vim' " Removed because this can fail on some machines
|
|
||||||
" let g:tmuxline_powerline_separators = 0
|
|
||||||
|
|
||||||
" }} GUI
|
|
||||||
|
|
||||||
" Filetypes {{
|
|
||||||
|
|
||||||
" Languages with custom configuration
|
" Languages with custom configuration
|
||||||
" Custom go
|
" Custom go
|
||||||
@ -158,21 +161,6 @@ Plug 'hsanson/vim-android'
|
|||||||
Plug 'pdurbin/vim-tsv'
|
Plug 'pdurbin/vim-tsv'
|
||||||
" }}
|
" }}
|
||||||
|
|
||||||
" Themes {{
|
" Themes
|
||||||
Plug 'altercation/vim-colors-solarized'
|
Plug 'altercation/vim-colors-solarized'
|
||||||
Plug 'vim-scripts/wombat256.vim'
|
Plug 'vim-scripts/wombat256.vim'
|
||||||
call s:smart_source_rc('plugins/goyo-limelight') " Distraction free editing
|
|
||||||
" }}
|
|
||||||
|
|
||||||
" System {{
|
|
||||||
Plug 'tpope/vim-surround'
|
|
||||||
Plug 'tpope/vim-endwise'
|
|
||||||
Plug 'tpope/vim-eunuch'
|
|
||||||
Plug 'tpope/vim-repeat'
|
|
||||||
Plug 'tpope/vim-rsi' " emacs bindinds in insert
|
|
||||||
Plug 'godlygeek/tabular' " Tabular spacing
|
|
||||||
|
|
||||||
Plug 'milkypostman/vim-togglelist'
|
|
||||||
nnoremap <silent> <F6> :call ToggleQuickfixList()<CR>
|
|
||||||
nnoremap <silent> <F7> :call ToggleLocationList()<CR>
|
|
||||||
" }}
|
|
||||||
|
@ -1,8 +0,0 @@
|
|||||||
" Install plugin
|
|
||||||
Plug 'rizzatti/dash.vim', { 'on': 'DashSearch' }
|
|
||||||
" Set config"
|
|
||||||
nmap <silent> <leader>d <Plug>DashSearch
|
|
||||||
let g:dash_map = {
|
|
||||||
\ 'apex' : 'apex',
|
|
||||||
\ 'visualforce' : 'vf',
|
|
||||||
\ }
|
|
Loading…
Reference in New Issue
Block a user