nvim: Migrate from vim-plug to paq-nvim

This commit is contained in:
Sanchayan Maity 2020-10-23 15:25:04 +05:30
parent cb16ddec0c
commit b1c51c6e83
9 changed files with 106 additions and 2887 deletions

3
.gitignore vendored
View file

@ -1,6 +1,5 @@
tmux/.tmux/resurrect tmux/.tmux/resurrect
nvim/.config/nvim/plugged
nvim/.config/nvim/.netrwhist nvim/.config/nvim/.netrwhist
plug.vim.old nvim/.local/share/nvim/site/pack/paqs/start
*.patch *.patch
*.diff *.diff

3
.gitmodules vendored
View file

@ -19,3 +19,6 @@
[submodule "tmux/.tmux/plugins/tmux-battery"] [submodule "tmux/.tmux/plugins/tmux-battery"]
path = tmux/.tmux/plugins/tmux-battery path = tmux/.tmux/plugins/tmux-battery
url = https://github.com/tmux-plugins/tmux-battery url = https://github.com/tmux-plugins/tmux-battery
[submodule "nvim/.local/share/nvim/site/pack/paqs/opt/paq-nvim"]
path = nvim/.local/share/nvim/site/pack/paqs/opt/paq-nvim
url = https://github.com/savq/paq-nvim

View file

@ -1,4 +1,4 @@
nmap <buffer> pg :PlugUpgrade<CR> nmap <buffer> pg :PaqUpdate<CR>
nmap <buffer> pd :PlugUpdate<CR> nmap <buffer> pd :PaqInstall<CR>
nmap <buffer> pw :PlugClean<CR> nmap <buffer> pw :PaqClean<CR>
nmap <buffer> pr :so %<CR> nmap <buffer> pr :so %<CR>

View file

@ -1,99 +1,10 @@
call plug#begin('~/.config/nvim/plugged') " Set up leader keys. FIXME: Move this to lua
" Vertical Motion
Plug 'justinmk/vim-sneak'
" Search
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
Plug 'junegunn/fzf.vim'
Plug 'PeterRincker/vim-searchlight'
Plug 'wincent/ferret'
Plug 'lambdalisue/reword.vim'
" Remove extraneous whitespace when edit mode is exited
Plug 'ntpeters/vim-better-whitespace'
" Manage Project sessions
Plug 'thaerkh/vim-workspace'
" For autocompletion
Plug 'nvim-lua/completion-nvim'
Plug 'steelsojka/completion-buffers'
" For tmux
Plug 'tmux-plugins/vim-tmux-focus-events'
" Git support
Plug 'lambdalisue/gina.vim'
Plug 'rhysd/git-messenger.vim'
Plug 'mhinz/vim-signify'
Plug 'rhysd/conflict-marker.vim'
Plug 'salcode/vim-interactive-rebase-reverse'
" Boost vim command line mode
Plug 'vim-utils/vim-husk'
" Rainbow Parentheses
Plug 'luochen1990/rainbow'
" Formatting
Plug 'sbdchd/neoformat'
" Run things async
Plug 'hauleth/asyncdo.vim'
" Quickfix
Plug 'ronakg/quickr-cscope.vim'
Plug 'milkypostman/vim-togglelist'
Plug 'yssl/QFEnter'
Plug 'chengzeyi/fzf-preview.vim'
" Text Object plugins
Plug 'wellle/targets.vim'
Plug 'tpope/vim-surround'
Plug 'coderifous/textobj-word-column.vim'
Plug 'tommcdo/vim-exchange'
Plug 'chaoren/vim-wordmotion'
" Tim pope essentials
Plug 'tpope/vim-commentary'
Plug 'tpope/vim-repeat'
Plug 'tpope/vim-sleuth'
" Show indentation levels
Plug 'Yggdroot/indentLine'
" Smooth scrolling
Plug 'psliwka/vim-smoothie'
" Scrollbar
Plug 'Xuyuanp/scrollbar.nvim'
" Directory viewer
Plug 'justinmk/vim-dirvish'
" Show leader key bindings
Plug 'liuchengxu/vim-which-key'
" Clipboard
Plug 'christoomey/vim-system-copy'
" Toggle terminal
Plug 'voldikss/vim-floaterm'
Plug 'lambdalisue/edita.vim'
" Take care of sudo
Plug 'lambdalisue/suda.vim'
" LSP
Plug 'neovim/nvim-lspconfig'
Plug 'nvim-lua/diagnostic-nvim'
Plug 'nvim-lua/lsp-status.nvim'
" Language support & syntax highlighting
" Haskell
Plug 'neovimhaskell/haskell-vim'
Plug 'Twinside/vim-hoogle', { 'for': 'haskell' }
Plug 'godlygeek/tabular', { 'for': 'haskell' }
Plug 'ndmitchell/ghcid', { 'rtp': 'plugins/nvim' }
" For C, Lua and Rust
Plug 'nvim-treesitter/nvim-treesitter'
" LaTeX
Plug 'lervag/vimtex'
" Dhall & nix
Plug 'vmchale/dhall-vim'
Plug 'LnL7/vim-nix'
" Other syntax highlighting support
Plug 'georgewitteman/vim-fish'
Plug 'elzr/vim-json'
Plug 'lifepillar/pgsql.vim'
Plug 'mtdl9/vim-log-highlighting'
Plug 'martinda/Jenkinsfile-vim-syntax'
call plug#end()
" Set up leader keys
let mapleader="\<SPACE>" let mapleader="\<SPACE>"
let maplocalleader="," let maplocalleader=","
" Use Tab & S-Tab instead of C-g and C-t for incsearch " Use Tab & S-Tab instead of C-g and C-t for incsearch. FIXME: Move this to lua
cno <expr> <Tab> getcmdtype() =~ '[?/]' ? '<C-g>' : feedkeys('<Tab>', 'int')[1] cno <expr> <Tab> getcmdtype() =~ '[?/]' ? '<C-g>' : feedkeys('<Tab>', 'int')[1]
cno <expr> <S-Tab> getcmdtype() =~ '[?/]' ? '<C-t>' : feedkeys('<S-Tab>', 'int')[1] cno <expr> <S-Tab> getcmdtype() =~ '[?/]' ? '<C-t>' : feedkeys('<S-Tab>', 'int')[1]
" Initialise
lua require 'init' lua require 'init'
" This seems to be required here else our colorscheme does not load
colorscheme yolokai

View file

@ -94,5 +94,6 @@ vim.cmd [[colorscheme yolokai]]
-- Add other lua configs or plugins -- Add other lua configs or plugins
require 'autocmd' require 'autocmd'
require 'keymappings' require 'keymappings'
require 'plugins'
require 'lsp' require 'lsp'
require 'treesitter' require 'treesitter'

View file

@ -0,0 +1,92 @@
vim.cmd 'packadd paq-nvim'
local paq = require'paq-nvim'.paq
-- Vertical Motion
paq 'justinmk/vim-sneak'
-- Search
paq 'junegunn/fzf'
paq 'junegunn/fzf.vim'
paq 'PeterRincker/vim-searchlight'
paq 'wincent/ferret'
paq 'lambdalisue/reword.vim'
-- Remove extraneous whitespace when edit mode is exited
paq 'ntpeters/vim-better-whitespace'
-- Manage Project sessions
paq 'thaerkh/vim-workspace'
-- For autocompletion
paq 'nvim-lua/completion-nvim'
paq 'steelsojka/completion-buffers'
-- For tmux
paq 'tmux-plugins/vim-tmux-focus-events'
-- Git support
paq 'lambdalisue/gina.vim'
paq 'rhysd/git-messenger.vim'
paq 'mhinz/vim-signify'
paq 'rhysd/conflict-marker.vim'
paq 'salcode/vim-interactive-rebase-reverse'
-- Boost vim command line mode
paq 'vim-utils/vim-husk'
-- Rainbow Parentheses
paq 'luochen1990/rainbow'
-- Formatting
paq 'sbdchd/neoformat'
-- Run things async
paq 'hauleth/asyncdo.vim'
-- Quickfix
paq 'ronakg/quickr-cscope.vim'
paq 'milkypostman/vim-togglelist'
paq 'yssl/QFEnter'
paq 'chengzeyi/fzf-preview.vim'
-- Text Object plugins
paq 'wellle/targets.vim'
paq 'tpope/vim-surround'
paq 'coderifous/textobj-word-column.vim'
paq 'tommcdo/vim-exchange'
paq 'chaoren/vim-wordmotion'
-- Tim pope essentials
paq 'tpope/vim-commentary'
paq 'tpope/vim-repeat'
paq 'tpope/vim-sleuth'
-- Show indentation levels
paq 'Yggdroot/indentLine'
-- Smooth scrolling
paq 'psliwka/vim-smoothie'
-- Scrollbar
paq 'Xuyuanp/scrollbar.nvim'
-- Directory viewer
paq 'justinmk/vim-dirvish'
-- Show leader key bindings
paq 'liuchengxu/vim-which-key'
-- Clipboard
paq 'christoomey/vim-system-copy'
-- Toggle terminal
paq 'voldikss/vim-floaterm'
paq 'lambdalisue/edita.vim'
-- Take care of sudo
paq 'lambdalisue/suda.vim'
-- LSP
paq 'neovim/nvim-lspconfig'
paq 'nvim-lua/diagnostic-nvim'
paq 'nvim-lua/lsp-status.nvim'
-- Language support & syntax highlighting
-- Haskell
paq 'neovimhaskell/haskell-vim'
paq 'Twinside/vim-hoogle'
paq 'godlygeek/tabular'
paq 'ndmitchell/ghcid'
-- For C, Lua and Rust
paq 'nvim-treesitter/nvim-treesitter'
-- LaTeX
paq 'lervag/vimtex'
-- Dhall & nix
paq 'vmchale/dhall-vim'
paq 'LnL7/vim-nix'
-- Other syntax highlighting support
paq 'georgewitteman/vim-fish'
paq 'elzr/vim-json'
paq 'lifepillar/pgsql.vim'
paq 'mtdl9/vim-log-highlighting'
paq 'martinda/Jenkinsfile-vim-syntax'
-- Without this lua plugins like LSP or treesitter won't work
vim.cmd [[packloadall]]

View file

@ -1,2 +0,0 @@
plug.vim:
wget https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim

File diff suppressed because it is too large Load diff

@ -0,0 +1 @@
Subproject commit 65bb54b1fee23ec7e0c2416c34efd63e0fcb3e48