diff --git a/.gitignore b/.gitignore
index e9a7156..a5b3e80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 tmux/.tmux/resurrect
 nvim/.config/nvim/.netrwhist
 nvim/.config/nvim/plugin/packer_compiled.vim
-nvim/.local/share/nvim/site/pack/packer/start
-nvim/.local/share/nvim/site/pack/packer/opt/*
+nvim/.local/share/nvim/site/pack/paqs/start
+nvim/.local/share/nvim/site/pack/paqs/opt/*
 nvim/.local/share/nvim/log
 nvim/.local/share/nvim/lsp.log
 nvim/.local/share/nvim/rplugin.vim
diff --git a/.gitmodules b/.gitmodules
index 86a1662..c006147 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "tmux/.tmux/plugins/tmux-butler"]
 	path = tmux/.tmux/plugins/tmux-butler
 	url = https://github.com/woodstok/tmux-butler
-[submodule "nvim/.local/share/nvim/site/pack/packer/opt/packer.nvim"]
-	path = nvim/.local/share/nvim/site/pack/packer/opt/packer.nvim
-	url = https://github.com/wbthomason/packer.nvim
 [submodule "tmux/.tmux/plugins/tmux-fuzzback"]
 	path = tmux/.tmux/plugins/tmux-fuzzback
 	url = https://github.com/roosta/tmux-fuzzback.git
@@ -19,3 +16,6 @@
 [submodule "tmux/.tmux/plugins/vim-tmux-navigator"]
 	path = tmux/.tmux/plugins/vim-tmux-navigator
 	url = https://github.com/christoomey/vim-tmux-navigator.git
+[submodule "nvim/.local/share/nvim/site/pack/paqs/start/paq-nvim"]
+	path = nvim/.local/share/nvim/site/pack/paqs/start/paq-nvim
+	url = https://github.com/savq/paq-nvim.git
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index 4d87837..e8b925a 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -1,55 +1,41 @@
 -- Add the in built Cfilter plugin. Replaces QFGrep.
 vim.cmd 'packadd cfilter'
 
-local init = function ()
-  use {
-    'wbthomason/packer.nvim'                          ,
-    'phaazon/hop.nvim'                                ,
-    'junegunn/fzf'                                    ,
-    'junegunn/fzf.vim'                                ,
-    'rmagatti/auto-session'                           ,
-    'dcampos/nvim-snippy'                             ,
-    'honza/vim-snippets'                              ,
-    'lewis6991/gitsigns.nvim'                         ,
-    'tpope/vim-fugitive'                              ,
-    'https://github.com/SanchayanMaity/gitlinker.nvim',
-    'vim-utils/vim-husk'                              ,
-    'chengzeyi/fzf-preview.vim'                       ,
-    'https://gitlab.com/yorickpeterse/nvim-pqf'       ,
-    'wellle/targets.vim'                              ,
-    'tpope/vim-surround'                              ,
-    'kana/vim-textobj-user'                           ,
-    'idbrii/textobj-word-column.vim'                  ,
-    'glts/vim-textobj-comment'                        ,
-    'numToStr/Comment.nvim'                           ,
-    'tpope/vim-repeat'                                ,
-    'tpope/vim-sleuth'                                ,
-    'tpope/vim-dispatch'                              ,
-    'elihunter173/dirbuf.nvim'                        ,
-    'junegunn/vim-easy-align'                         ,
-    'nvim-lua/plenary.nvim'                           ,
-    'kosayoda/nvim-lightbulb'                         ,
-    'mfussenegger/nvim-lint'                          ,
-    'lvimuser/lsp-inlayhints.nvim'                    ,
-    'sdiehl/vim-cabalfmt'                             ,
-    'nvim-treesitter/nvim-treesitter'                 ,
-    'nvim-treesitter/playground'                      ,
-    'mfussenegger/nvim-treehopper'                    ,
-    'chentoast/marks.nvim'                            ,
-    'andymass/vim-matchup'                            ,
-    'christoomey/vim-tmux-navigator'                  ,
-    'windwp/nvim-autopairs'                           ,
-    'gpanders/nvim-parinfer'
-  }
-end
-
-local config = {
-  git = {
-    subcommands = {
-      update = 'pull --ff-only --progress --rebase=false --no-tags',
-      fetch  = 'fetch --depth 999999 --progress --no-tags',
-    }
-  }
+require "paq" {
+  'phaazon/hop.nvim'                         ,
+  'junegunn/fzf'                             ,
+  'junegunn/fzf.vim'                         ,
+  'rmagatti/auto-session'                    ,
+  'dcampos/nvim-snippy'                      ,
+  'honza/vim-snippets'                       ,
+  'lewis6991/gitsigns.nvim'                  ,
+  'tpope/vim-fugitive'                       ,
+  'SanchayanMaity/gitlinker.nvim'            ,
+  'vim-utils/vim-husk'                       ,
+  'chengzeyi/fzf-preview.vim'                ,
+  'https://gitlab.com/yorickpeterse/nvim-pqf',
+  'wellle/targets.vim'                       ,
+  'tpope/vim-surround'                       ,
+  'kana/vim-textobj-user'                    ,
+  'idbrii/textobj-word-column.vim'           ,
+  'glts/vim-textobj-comment'                 ,
+  'numToStr/Comment.nvim'                    ,
+  'tpope/vim-repeat'                         ,
+  'tpope/vim-sleuth'                         ,
+  'tpope/vim-dispatch'                       ,
+  'elihunter173/dirbuf.nvim'                 ,
+  'junegunn/vim-easy-align'                  ,
+  'nvim-lua/plenary.nvim'                    ,
+  'kosayoda/nvim-lightbulb'                  ,
+  'mfussenegger/nvim-lint'                   ,
+  'lvimuser/lsp-inlayhints.nvim'             ,
+  'sdiehl/vim-cabalfmt'                      ,
+  'nvim-treesitter/nvim-treesitter'          ,
+  'nvim-treesitter/playground'               ,
+  'mfussenegger/nvim-treehopper'             ,
+  'chentoast/marks.nvim'                     ,
+  'andymass/vim-matchup'                     ,
+  'christoomey/vim-tmux-navigator'           ,
+  'windwp/nvim-autopairs'                    ,
+  'gpanders/nvim-parinfer'
 }
-
-require('packer').startup(init, config)
diff --git a/nvim/.local/share/nvim/site/pack/paqs/start/paq-nvim b/nvim/.local/share/nvim/site/pack/paqs/start/paq-nvim
new file mode 160000
index 0000000..540642d
--- /dev/null
+++ b/nvim/.local/share/nvim/site/pack/paqs/start/paq-nvim
@@ -0,0 +1 @@
+Subproject commit 540642d7765fa5fbe661f26b635b08ad9fb24fd0