diff --git a/.config/nvim/init/plug.vim b/.config/nvim/init/plug.vim index 7ced358..7549ea3 100644 --- a/.config/nvim/init/plug.vim +++ b/.config/nvim/init/plug.vim @@ -13,13 +13,12 @@ call plug#begin() " Editing " text objects -Plug 'xerus2000/argtextobj.vim' " arguments in brackets as text objects +Plug 'xeruf/argtextobj.vim' " arguments in brackets as text objects Plug 'tpope/vim-surround' " edit surroundings - cs, ds, ys Plug 'bkad/CamelCaseMotion' " move through camel case words " commands Plug 'inkarkat/vim-ReplaceWithRegister' " gr to replace with register Plug 'tpope/vim-commentary' " gc to comment out (gcap for paragraph) -Plug 'terryma/vim-multiple-cursors' " new coursor+selection on match, skip, remove cursor & back Plug 'junegunn/vim-easy-align' " ga to align stuff xmap ga (EasyAlign) nmap ga (EasyAlign) @@ -28,17 +27,10 @@ Plug 'tpope/vim-repeat' Plug 'inkarkat/vim-ingo-library' " Ex commands -Plug 'DataWraith/auto_mkdir' " mkdir parent dirs when saving -Plug 'AndrewRadev/bufferize.vim' " Command to buffer -Plug 'tpope/vim-eunuch' " OS helpers -Plug 'tpope/vim-fugitive' " Git commands in vim -Plug 'jreybert/vimagit' " Magit for vim - git stage individual changes -Plug 'doy/vim-diff-changes' " Commands for diffing - :DiffAgainstFilesystem :DiffAgainstVCS :DiffStop -Plug 'junegunn/fzf' " File selection with :FZF - " Browse -Plug 'tyru/open-browser.vim' " :OpenBrowser, :OpenBrowserSearch -Plug 'tyru/open-browser-github.vim' -Plug 'KabbAmine/zeavim.vim' " Integrate with Zeal (Dash) offline documentation +Plug 'DataWraith/auto_mkdir' " mkdir parent dirs when saving +Plug 'AndrewRadev/bufferize.vim' " Command to buffer +Plug 'tpope/vim-eunuch' " OS helpers +Plug 'doy/vim-diff-changes' " Commands for diffing - :DiffAgainstFilesystem :DiffAgainstVCS :DiffStop " QOL Plug 'farmergreg/vim-lastplace' " Automatically jump to last edit position @@ -46,25 +38,19 @@ Plug 'chrisbra/Recover.vim' " Add Recover options for swap files Plug 'ntpeters/vim-better-whitespace' " Tools for trailing whitespace & mixed indents " Aesthetic -Plug 'vim-airline/vim-airline' " Status bar on the bottom -Plug 'psliwka/vim-smoothie' " Smooth scrolling -Plug 'romainl/vim-cool' " Automatically stop highlighting search results when moving - https://stackoverflow.com/questions/657447/vim-clear-last-search-highlighting -Plug 'airblade/vim-gitgutter' " Git info on the left -Plug 'norcalli/nvim-colorizer.lua' " Highlights color literals +Plug 'vim-airline/vim-airline' " Status bar on the bottom +set noshowmode " Don't show current mode because airline already does and it inhibits echo in visual mode +Plug 'romainl/vim-cool' " Automatically stop highlighting search results when moving - https://stackoverflow.com/questions/657447/vim-clear-last-search-highlighting +Plug 'airblade/vim-gitgutter' " Git info on the left + " Highlight color literals +Plug 'norcalli/nvim-colorizer.lua' " Visual indent guides Plug 'nathanaelkane/vim-indent-guides' let g:indent_guides_enable_on_vim_startup = 1 " Integrations -Plug 'dhruvasagar/vim-table-mode' -let g:table_mode_corner='|' -Plug 'neoclide/coc.nvim', {'branch': 'release' } -Plug 'udalov/kotlin-vim' -Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app & yarn install' } Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } } -Plug 'mipmip/vim-scimark' " Edit markdown tables -Plug 'APZelos/blamer.nvim' " Inline git blame -" Plug 'xerus2000/vim-dokuwiki' +Plug 'mipmip/vim-scimark' " Edit markdown tables with sc-im call plug#end() diff --git a/.config/nvim/init/pluginConfig.vim b/.config/nvim/init/pluginConfig.vim index 6d04aca..3448d2c 100644 --- a/.config/nvim/init/pluginConfig.vim +++ b/.config/nvim/init/pluginConfig.vim @@ -1,6 +1,3 @@ -" Don't show current mode because airline already does and it inhibits echo in visual mode -set noshowmode - command! PU PlugUpdate | PlugUpgrade lua require 'colorizer'.setup({ '*'; markdown = { names = false; }; }) @@ -12,12 +9,6 @@ let g:better_whitespace_skip_empty_lines=1 let g:better_whitespace_guicolor=$THEME == 'light' ? 'LightGrey' : 'DarkGrey' " see https://github.com/ntpeters/vim-better-whitespace/issues/134 - autocmd OptionSet background let g:better_whitespace_guicolor=&background == 'light' ? 'LightYellow' : 'Brown' -let g:blamer_enabled = 1 -let g:blamer_template = ': • ' -let g:blamer_relative_time = 1 -let g:blamer_delay = 300 -" let g:blamer_show_in_visual_modes = 0 - " remap movement commands to respect CamelCase map w CamelCaseMotion_w map b CamelCaseMotion_b @@ -30,15 +21,6 @@ xmap ib CamelCaseMotion_ib omap ie CamelCaseMotion_ie xmap ie CamelCaseMotion_ie -" open-browser -let g:openbrowser_default_search="duckduckgo" -let g:netrw_nogx = 1 " disable netrw's gx mapping. -nmap gs (openbrowser-smart-search) -vmap gs (openbrowser-smart-search) -nmap gx yi':OpenGithubProject " -command! S OpenBrowserSmartSearch " -command! GH OpenGithubProject " - " firenvim let g:firenvim_config = { \ 'globalSettings': { @@ -49,14 +31,14 @@ let g:firenvim_config = { \ 'cmdline': 'firenvim', \ 'priority': 0, \ 'selector': 'textarea:not([readonly]):not([class="handsontableInput"]):not([wrap="off"]), div[role="textbox"]:not([aria-label="Search"])', - \ 'takeover': 'never', + \ 'takeover': 'always', \ }, - \ '.*notion\.so.*': { 'priority': 9, 'takeover': 'never', }, - \ '.*docs\.google\.com.*': { 'priority': 9, 'takeover': 'never', }, + \ '.*notion\.so.*': { 'priority': 9, 'takeover': 'never', }, + \ '.*docs\.google\.com.*': { 'priority': 9, 'takeover': 'never', }, \ '.*mail\.protonmail\.com.*': { 'priority': 9, 'takeover': 'never', }, - \ '.*cloud.atomtoast.xyz.*': { 'priority': 9, 'takeover': 'never', }, - \ 'https://bigbluebutton.*': { 'priority': 9, 'takeover': 'never', }, - \ 'https://dhall-lang.org.*': { 'priority': 9, 'takeover': 'never', }, + \ '.*cloud.atomtoast.xyz.*': { 'priority': 9, 'takeover': 'never', }, + \ 'https://bigbluebutton.*': { 'priority': 9, 'takeover': 'never', }, + \ 'https://dhall-lang.org.*': { 'priority': 9, 'takeover': 'never', }, \ } \ } if exists('g:started_by_firenvim')