commit 6fed37ecc326e3e253ef1e2f36b69e59837dbeff
parent d2ec7cbcbb40216240d201c724aad29886175100
Author: Alex Balgavy <a.balgavy@gmail.com>
Date: Tue, 2 Apr 2019 18:05:22 +0200
Merged plugins with pluginconf for vim
Former-commit-id: 2b98b80f85220efeb5b778b2c7259d4362882acc
Diffstat:
3 files changed, 70 insertions(+), 69 deletions(-)
diff --git a/vim/init.vimrc b/vim/init.vimrc
@@ -4,4 +4,3 @@ source $HOME/.dotfiles/vim/editor.vimrc
source $HOME/.dotfiles/vim/commands.vimrc
source $HOME/.dotfiles/vim/map.vimrc
source $HOME/.dotfiles/vim/autocmd.vimrc
-source $HOME/.dotfiles/vim/pluginconf.vimrc
diff --git a/vim/pluginconf.vimrc b/vim/pluginconf.vimrc
@@ -1,63 +0,0 @@
-let g:NERDSpaceDelims = 1
-let g:vimwiki_list = [{'path': '$HOME/Dropbox/vimwiki',
- \ 'template_path': '$HOME/Dropbox/vimwiki/templates',
- \ 'template_default': 'default',
- \ 'template_ext': '.html'}]
-
-let g:vimwiki_global_ext = 1
-let g:vimwiki_ext2syntax = {'.mkd': 'markdown',
- \ '.wiki': 'default'}
-let tlist_vimwiki_settings = 'wiki;h:Headers'
-
-" tagbar language definitions
-let g:tagbar_type_vimwiki = {
- \ 'ctagstype':'vimwiki'
- \ , 'kinds':['h:header']
- \ , 'sro':'&&&'
- \ , 'kind2scope':{'h':'header'}
- \ , 'sort':0
- \ , 'ctagsbin':'$CONF_DIR/scripts/vwtags.py'
- \ , 'ctagsargs': 'default'
- \ }
-
-let g:tagbar_type_go = {
- \ 'ctagstype' : 'go',
- \ 'kinds' : [
- \ 'p:package',
- \ 'i:imports:1',
- \ 'c:constants',
- \ 'v:variables',
- \ 't:types',
- \ 'n:interfaces',
- \ 'w:fields',
- \ 'e:embedded',
- \ 'm:methods',
- \ 'r:constructor',
- \ 'f:functions'
- \ ],
- \ 'sro' : '.',
- \ 'kind2scope' : {
- \ 't' : 'ctype',
- \ 'n' : 'ntype'
- \ },
- \ 'scope2kind' : {
- \ 'ctype' : 't',
- \ 'ntype' : 'n'
- \ },
- \ 'ctagsbin' : 'gotags',
- \ 'ctagsargs' : '-sort -silent'
-\ }
-let g:tagbar_type_markdown = {
- \ 'ctagstype' : 'markdown',
- \ 'kinds' : [
- \ 'h:Heading_L1',
- \ 'i:Heading_L2',
- \ 'k:Heading_L3'
- \ ],
- \ 'sort': 0
-\ }
-
-" vim-qf mappings
-nmap ]q <Plug>(qf_qf_next)
-nmap [q <Plug>(qf_qf_previous)
-nmap <leader>qf <Plug>(qf_qf_toggle)
diff --git a/vim/plugins.vimrc b/vim/plugins.vimrc
@@ -1,3 +1,4 @@
+" vim: foldmethod=marker foldlevel=0:
" Install vim-plug if needed
if empty(glob('~/.vim/autoload/plug.vim'))
silent execute "!curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim"
@@ -13,8 +14,10 @@ Plug 'guns/xterm-color-table.vim'
Plug 'scrooloose/nerdtree'
Plug 'jistr/vim-nerdtree-tabs'
-" NERD Commenter - simple comment toggling
+" NERD Commenter - simple comment toggling {{{
Plug 'scrooloose/nerdcommenter'
+let g:NERDSpaceDelims = 1
+" }}}
" Emmet - must-have for HTML, awesome snippet expansion
Plug 'mattn/emmet-vim'
@@ -35,11 +38,69 @@ Plug 'tpope/vim-eunuch'
Plug 'godlygeek/tabular'
Plug 'plasticboy/vim-markdown'
-" Tagbar
+" Tagbar {{{
Plug 'majutsushi/tagbar'
-
-" Personal wiki
+" tagbar language definitions
+let g:tagbar_type_vimwiki = {
+ \ 'ctagstype':'vimwiki'
+ \ , 'kinds':['h:header']
+ \ , 'sro':'&&&'
+ \ , 'kind2scope':{'h':'header'}
+ \ , 'sort':0
+ \ , 'ctagsbin':'$CONF_DIR/scripts/vwtags.py'
+ \ , 'ctagsargs': 'default'
+ \ }
+
+let g:tagbar_type_go = {
+ \ 'ctagstype' : 'go',
+ \ 'kinds' : [
+ \ 'p:package',
+ \ 'i:imports:1',
+ \ 'c:constants',
+ \ 'v:variables',
+ \ 't:types',
+ \ 'n:interfaces',
+ \ 'w:fields',
+ \ 'e:embedded',
+ \ 'm:methods',
+ \ 'r:constructor',
+ \ 'f:functions'
+ \ ],
+ \ 'sro' : '.',
+ \ 'kind2scope' : {
+ \ 't' : 'ctype',
+ \ 'n' : 'ntype'
+ \ },
+ \ 'scope2kind' : {
+ \ 'ctype' : 't',
+ \ 'ntype' : 'n'
+ \ },
+ \ 'ctagsbin' : 'gotags',
+ \ 'ctagsargs' : '-sort -silent'
+\ }
+let g:tagbar_type_markdown = {
+ \ 'ctagstype' : 'markdown',
+ \ 'kinds' : [
+ \ 'h:Heading_L1',
+ \ 'i:Heading_L2',
+ \ 'k:Heading_L3'
+ \ ],
+ \ 'sort': 0
+\ }
+" }}}
+
+" Vimwiki {{{
Plug 'vimwiki/vimwiki'
+let g:vimwiki_list = [{'path': '$HOME/Dropbox/vimwiki',
+ \ 'template_path': '$HOME/Dropbox/vimwiki/templates',
+ \ 'template_default': 'default',
+ \ 'template_ext': '.html'}]
+
+let g:vimwiki_global_ext = 1
+let g:vimwiki_ext2syntax = {'.mkd': 'markdown',
+ \ '.wiki': 'default'}
+let tlist_vimwiki_settings = 'wiki;h:Headers'
+" }}}
" Git wrapper from tpope
Plug 'tpope/vim-fugitive'
@@ -47,8 +108,12 @@ Plug 'tpope/vim-fugitive'
" Undo tree visualiser
Plug 'simnalamburt/vim-mundo'
-" Quickfix window settings/mappings
+" Quickfix window settings/mappings {{{
Plug 'romainl/vim-qf'
+nmap ]q <Plug>(qf_qf_next)
+nmap [q <Plug>(qf_qf_previous)
+nmap <leader>qf <Plug>(qf_qf_toggle)
+" }}}
" Repeat everything with '.'
Plug 'tpope/vim-repeat'
