From 2694c76a67fd7e32aa1be29aa705e8bcfbd8d6ef Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Tue, 8 Nov 2022 13:23:22 +0000 Subject: [PATCH] Remove all references of Pack command The previous commit removed all command related to minpac, including `Pack` which was still being referenced in `vimrc`. --- vimrc | 158 ++++++++++++++++------------------------------------------ 1 file changed, 43 insertions(+), 115 deletions(-) diff --git a/vimrc b/vimrc index 9b393b9..70090f6 100644 --- a/vimrc +++ b/vimrc @@ -15,11 +15,40 @@ endif set runtimepath+=~/.config/work set packpath+=~/.config/work -" tabline.vim - sanely numbered tabs -Pack 'mkitt/tabline.vim' +" Markdown fenced code block languages +let g:markdown_fenced_languages = + \ ['cpp', 'c', 'cmake', 'console', 'sh', 'vim', 'python', 'yaml'] -" coc.nvim Conqueror of Completion -Pack 'neoclide/coc.nvim', {'branch': 'release'} +" reStructedText enable code styles +let g:rst_style = 1 +" reStructuredText code block languages +let g:rst_syntax_code_list = { +\ 'vim': ['vim'], +\ 'java': ['java'], +\ 'c': ['c'], +\ 'cpp': ['cpp', 'c++'], +\ 'console': ['console'], +\ 'python': ['python'] +\ } + +" Enable builtin syntax folding +let g:xml_syntax_folding = 1 +let g:sh_fold_enabled = 1 + +if wsl#isDetected() + " Make gx work in WSL + let g:netrw_browsex_viewer='cmd.exe /C start' +endif + +if tmux#inSession() + " Seemless vim/tmux pane navigation + packadd vim-tmux-navigator + let g:tmux_navigator_no_mappings = 1 + " Enable focus events when in tmux session + packadd vim-tmux-focus-events +endif + +" coc.nvim let g:coc_global_extensions = [ \ 'coc-clangd', \ 'coc-cmake', @@ -41,14 +70,7 @@ if has("win32") endif let g:coc_default_semantic_highlight_groups = 0 -" ultisnips - snippet engine -Pack 'SirVer/ultisnips' -Pack 'honza/vim-snippets' -" vimomni - Completion for vimscript -Pack 'vim-scripts/vimomni', {'type': 'opt'} - -" ale - Asynchronous Lint Engine -Pack 'w0rp/ale' +" ale let g:ale_sign_error = '▸' let g:ale_sign_warning = '▸' let g:ale_echo_msg_format = '[%linter%] %s (%code%)' @@ -56,134 +78,40 @@ let g:ale_linters = {'c': [], 'cpp': []} let g:ale_cmake_cmakelint_options = \ '-convention/filename,-package/consistency,-package/stdargs' -" Version control differences in the sign column -Pack 'mhinz/vim-signify' +" vim-signify let g:signify_sign_change = '~' -" Conflict marker utilities -Pack 'rhysd/conflict-marker.vim' -" vim-textobj-user - library for creating text objects -Pack 'kana/vim-textobj-user' -" vim-textobj-entire - Entire file text object +" vim-textobj-entire let g:textobj_entire_no_default_key_mappings = 1 -Pack 'kana/vim-textobj-entire' xmap a% (textobj-entire-a) omap a% (textobj-entire-a) xmap i% (textobj-entire-i) omap i% (textobj-entire-i) -" vim-textobj-parameter - Parameter text object -Pack 'sgur/vim-textobj-parameter' -" vim-textobj-uri - URI text object -Pack 'jceb/vim-textobj-uri' -" vim-textobj-comment - Comment text object -Pack 'glts/vim-textobj-comment' +" vim-textobj-comment omap a/ (textobj-comment-a) xmap a/ (textobj-comment-a) omap i/ (textobj-comment-i) xmap i/ (textobj-comment-i) -" vim-textobj-sentence - Improved sentence text object -Pack 'reedes/vim-textobj-sentence' -" vim-commentary - toggle comments -Pack 'tpope/vim-commentary' -" vim-surround - edit delimiters -Pack 'tpope/vim-surround' -" vim-repeat - better dot command -Pack 'tpope/vim-repeat' -" vim-fugitive - git wrapper -Pack 'tpope/vim-fugitive' -" vim-eunuch - unix command warppers -Pack 'tpope/vim-eunuch' -" vim-vinegar - improved directory browser -Pack 'tpope/vim-vinegar' -if wsl#isDetected() - " Make gx work in WSL - let g:netrw_browsex_viewer='cmd.exe /C start' -endif -" vim-abolish - CamelCase to under_score to mixedCase -" TODO: Copy the good bit remove this plugin -Pack 'tpope/vim-abolish' -" vim-unimpaired - for pairs of tasks -Pack 'tpope/vim-unimpaired' -" vim-speeddating - sane date manipulation -Pack 'tpope/vim-speeddating' -" vim-endwise - wisely add end{if,function}, fork with cmake support -Pack 'godbyk/vim-endwise', {'rev': 'patch-1'} -" vim-jdaddy - text object & formatting for json -Pack 'tpope/vim-jdaddy' -" vim-projectionist - granular project configuration -Pack 'tpope/vim-projectionist' - -" fzf.vim - Fuzzy finder -Pack 'junegunn/fzf' -Pack 'junegunn/fzf.vim' +" fzf.vim let g:fzf_action = { \ 'ctrl-t': 'tab split', \ 'ctrl-s': 'split', \ 'ctrl-v': 'vsplit' \ } -Pack 'kbenzie/note.vim' +" note.vim let g:note_directory = '~/Sync/Notes' -if !has('win32') - " Seemless vim/tmux pane navigation - Pack 'christoomey/vim-tmux-navigator' - let g:tmux_navigator_no_mappings = 1 - " Enable focus events when in tmux session - Pack 'tmux-plugins/vim-tmux-focus-events' -endif - -" replay macros with the enter key -Pack 'wincent/replay' -" vim-matchit - Improved % matching -Pack 'andymass/vim-matchup' +" vim-matchit let g:matchup_matchparen_offscreen = {'method': 'status_manual'} -" vim-table-mode - Easy table manipulation -Pack 'dhruvasagar/vim-table-mode' +" vim-table-mode let g:table_mode_map_prefix = 't' let g:table_mode_toggle_map = 'M' -" DoxygenToolkit.vim - documentation stubs -Pack 'vim-scripts/DoxygenToolkit.vim', {'type': 'opt'} +" DoxygenToolkit.vim let g:DoxygenToolkit_commentType = 'C++' -" markdown fenced code block languages -let g:markdown_fenced_languages = - \ ['cpp', 'c', 'cmake', 'console', 'sh', 'vim', 'python', 'yaml'] - -" reStructedText enable code styles -let g:rst_style = 1 -" reStructuredText code block languages -let g:rst_syntax_code_list = { -\ 'vim': ['vim'], -\ 'java': ['java'], -\ 'c': ['c'], -\ 'cpp': ['cpp', 'c++'], -\ 'console': ['console'], -\ 'python': ['python'] -\ } - -" Python folding -Pack 'kalekundert/vim-coiled-snake' - -" Enable builtin syntax folding -let g:xml_syntax_folding = 1 -let g:sh_fold_enabled = 1 - -" xterm-color-table.vim - view term and hex colors -Pack 'guns/xterm-color-table.vim' - -" Syntax plugins -Pack 'kbenzie/vim-spirv' +" vim-spirv let g:spirv_current_id_highlight = 'ctermbg=234, guibg=#1c1c1c' -Pack 'rperier/vim-cmake-syntax' -Pack 'tikhomirov/vim-glsl' -Pack 'beyondmarc/hlsl.vim' -Pack 'frasercrmck/opencl.vim' -Pack 'asciidoc/vim-asciidoc' -Pack 'mustache/vim-mustache-handlebars' -Pack 'joshglendenning/vim-caddyfile' -Pack 'kbenzie/vim-khr' -Pack 'jrozner/vim-antlr'