Skip to content

Commit

Permalink
vim: Clean up nvim version conditionals in plugins.vim (#36)
Browse files Browse the repository at this point in the history
Now that we assume neovim >= 0.7.0 ...
  • Loading branch information
wookayin committed Oct 20, 2022
1 parent 3d480be commit 4d81783
Showing 1 changed file with 23 additions and 29 deletions.
52 changes: 23 additions & 29 deletions vim/plugins.vim
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Plug 'dstein64/vim-startuptime', { 'on': ['StartupTime'] }

" Vim Interfaces
" -------------------------------------
if has('nvim-0.6.0')
if has('nvim')
" Status line: use lualine.nvim (fork)
Plug 'nvim-lualine/lualine.nvim'
ForcePlugURI 'lualine.nvim'
Expand All @@ -53,10 +53,8 @@ endif
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all --no-update-rc' }
Plug 'junegunn/fzf.vim'
Plug 'wookayin/fzf-ripgrep.vim'
if has('nvim-0.4.0')
if has('nvim') || has('popup')
Plug 'voldikss/vim-floaterm'
endif
if has('nvim-0.4.0') || has('popup')
Plug 'skywind3000/vim-quickui'
endif
if exists('##TermOpen') || exists('##TerminalOpen')
Expand All @@ -73,7 +71,7 @@ Plug 'tpope/vim-dispatch', { 'tag' : 'v1.1' }
if has('nvim') || v:version >= 800
Plug 'neomake/neomake'
endif
if has('nvim-0.4.0')
if has('nvim')
Plug 'gelguy/wilder.nvim', { 'do': function('UpdateRemote') }
Plug 'romgrk/fzy-lua-native'
endif
Expand All @@ -90,35 +88,32 @@ endif
Plug 'tpope/vim-fugitive'
Plug 'junegunn/gv.vim'
Plug 'rbong/vim-flog'
if has('nvim-0.5.0')
if has('nvim')
Plug 'lewis6991/gitsigns.nvim'
else
Plug 'airblade/vim-gitgutter'
endif
if has('nvim-0.7.0')
if has('nvim')
Plug 'sindrets/diffview.nvim'
endif
if has('nvim-0.4.0') && exists('*nvim_open_win')
" git blame with floating window (requires nvim 0.4.0+)
Plug 'rhysd/git-messenger.vim'
endif
Plug 'majutsushi/tagbar'
Plug 'rking/ag.vim'
Plug 'kshenoy/vim-signature'
Plug 'junegunn/vim-easy-align'
if has('nvim-0.5.0')
if has('nvim')
Plug 'lukas-reineke/indent-blankline.nvim'
else
Plug 'Yggdroot/indentLine'
endif
if exists('##WinScrolled') " neovim nightly (0.5.0+)
if exists('##WinScrolled')
Plug 'dstein64/nvim-scrollview'
endif
if has('nvim-0.7.0')

" Advanced Folding
if has('nvim')
Plug 'kevinhwang91/nvim-ufo'
Plug 'kevinhwang91/promise-async'
elseif has('nvim-0.5.0')
Plug 'anuvyklack/pretty-fold.nvim', {'commit': 'eba8996'}
end

" Miscellanious Utilities
Expand Down Expand Up @@ -154,54 +149,53 @@ Plug 'junegunn/vader.vim'
Plug 'MarcWeber/vim-addon-mw-utils'
Plug 'tpope/vim-eunuch'
Plug 'wookayin/vim-typora', { 'on': 'Typora' }
if has('nvim-0.5.0')
if has('nvim')
Plug 'folke/which-key.nvim'
ForcePlugURI 'which-key.nvim' " See GH-227, GH-280
endif

if s:darwin && isdirectory('/Applications/Dash.app')
if has('nvim-0.5.0')
if has('nvim')
Plug 'mrjones2014/dash.nvim', { 'do': 'make install',
\ 'on': ['Dash', 'DashWord'] }
else
Plug 'rizzatti/dash.vim', { 'on': 'Dash' }
endif
endif

if has('nvim-0.5.0')
" Some lua-powered plugins for neovim 0.5.0+
if has('nvim')
" Some lua-powered plugins for UI
Plug 'nvim-lua/plenary.nvim'
Plug 'rcarriga/nvim-notify'
Plug 'norcalli/nvim-colorizer.lua'
Plug 'nvim-neo-tree/neo-tree.nvim', {'branch': 'main'}
Plug 'MunifTanjim/nui.nvim'
Plug 'nvim-lua/plenary.nvim'
endif
if has('nvim-0.7.0')

Plug 'nvim-telescope/telescope.nvim'
endif

if has('nvim-0.7.0')
" Treesitter (see ~/.config/nvim/lua/config/treesitter.lua)
" Treesitter (see ~/.config/nvim/lua/config/treesitter.lua)
if has('nvim')
function! TSUpdate(arg) abort
if luaeval('pcall(require, "nvim-treesitter")')
TSUpdate
endif
endfunction

let g:_plug_ts_config = {'do': function('TSUpdate')}
if !has('nvim-0.7')
let g:_plug_ts_config['commit'] = '8a1acc00' " Since a1893234, 0.7.0+ required
if !has('nvim-0.8')
" Since 42ab95d5, nvim 0.8.0+ is required
let g:_plug_ts_config['commit'] = '4cccb6f4'
endif
Plug 'nvim-treesitter/nvim-treesitter', g:_plug_ts_config
Plug 'nvim-treesitter/playground', {'as': 'nvim-treesitter-playground'}

Plug 'SmiteshP/nvim-gps'
endif

if has('nvim-0.7')
" Test integration
if has('nvim')
Plug 'nvim-neotest/neotest'
Plug 'antoinemadec/FixCursorHold.nvim'
Plug 'rcarriga/nvim-dap-ui'

Plug 'nvim-neotest/neotest-python'
Plug 'nvim-neotest/neotest-plenary'
Expand Down

0 comments on commit 4d81783

Please sign in to comment.