config/vim
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Compare commits

base: config:ab403c69ac53d47f5fdac4b1d64ca0fdeedc3d07
Branches Tags
config:main
config:ansible-plugins
...
compare: config:dda49e02f44a65d3f6f891a6919c42069fdabc2f
Branches Tags
config:main
config:ansible-plugins

3 Commits
ab403c69ac ... dda49e02f4

Author SHA1 Message Date
Kenneth Benzie (Benie)
dda49e02f4 Add vim-projectionist plugin 2018-04-13 23:52:00 +01:00
Kenneth Benzie (Benie)
520671fa8d Don't match non conflict markers 2018-04-13 23:23:31 +01:00
Kenneth Benzie (Benie)
647aabdaf3 Use own fork for vim-cmake-completion 2018-04-13 18:06:29 +01:00
2 changed files with 5 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
plugin/autocmds.vim
View File

@ -11,5 +11,5 @@ augroup benieAugroup
au BufRead,BufNewFile .out set filetype=zsh au BufRead,BufNewFile .out set filetype=zsh
" Highlight conflict markers in any filefile " Highlight conflict markers in any filefile
au FileType * :call matchadd('Todo', '^\(<<<<<<<\||||||||\|=======\|>>>>>>>\)\ze.*$') au FileType * :call matchadd('Todo', '^\(<<<<<<<\||||||||\|=======\|>>>>>>>\)\s\ze.*$')
augroup END augroup END

5
vimrc
View File

@ -53,7 +53,7 @@ if has('python')
Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
endif endif
" vim-cmake-completion - completion & help " vim-cmake-completion - completion & help
Plug 'richq/vim-cmake-completion', {'for': ['cmake']} Plug 'kbenzie/vim-cmake-completion', {'for': ['cmake']}
" vimomni - Completion for vimscript " vimomni - Completion for vimscript
Plug 'vim-scripts/vimomni', {'for': ['vim']} Plug 'vim-scripts/vimomni', {'for': ['vim']}
@ -112,6 +112,7 @@ Plug 'tpope/vim-eunuch'
" vim-vinegar - improved directory browser " vim-vinegar - improved directory browser
Plug 'tpope/vim-vinegar' Plug 'tpope/vim-vinegar'
" vim-abolish - CamelCase to under_score to mixedCase " vim-abolish - CamelCase to under_score to mixedCase
" TODO: Copy the good bit remove this plugin
Plug 'tpope/vim-abolish' Plug 'tpope/vim-abolish'
" vim-unimpaired - for pairs of tasks " vim-unimpaired - for pairs of tasks
Plug 'tpope/vim-unimpaired' Plug 'tpope/vim-unimpaired'
@ -121,6 +122,8 @@ Plug 'tpope/vim-speeddating'
Plug 'godbyk/vim-endwise', {'branch': 'patch-1'} Plug 'godbyk/vim-endwise', {'branch': 'patch-1'}
" vim-jdaddy - text object & formatting for json " vim-jdaddy - text object & formatting for json
Plug 'tpope/vim-jdaddy' Plug 'tpope/vim-jdaddy'
" vim-projectionist - granular project configuration
Plug 'tpope/vim-projectionist'
" fzf.vim - Fuzzy finder " fzf.vim - Fuzzy finder
if !platform#is_windows() if !platform#is_windows()