feat(pack): make use of packer dependencies

1 files changed, 12 insertions, 11 deletions

diff --git a/fnl/nvrc/pack.fnl b/fnl/nvrc/pack.fnl
index f651397..074fe80 100644
--- a/fnl/nvrc/pack.fnl
+++ b/fnl/nvrc/pack.fnl
@@ -1,4 +1,4 @@
-(import-macros {: pack! : unpack!} :nvrc.macro.pack)
+(import-macros {: pack : pack! : unpack!} :nvrc.macro.pack)
 
 (pack! :wbthomason/packer.nvim)
 (pack! :rktjmp/hotpot.nvim)
@@ -10,21 +10,18 @@
 (pack! :feline-nvim/feline.nvim {:req :feline})
 (pack! :lukas-reineke/indent-blankline.nvim {:req :blankline})
 (pack! :NvChad/nvim-colorizer.lua {:init :colorizer :cmd :ColorizerToggle})
-(pack! :nvim-treesitter/nvim-treesitter {:req :treesitter :run ":TSUpdate"})
-(pack! :p00f/nvim-ts-rainbow)
-(pack! :nvim-treesitter/nvim-treesitter-refactor)
-(pack! :nvim-treesitter/nvim-treesitter-textobjects)
-(pack! :JoosepAlviste/nvim-ts-context-commentstring)
+(pack! :nvim-treesitter/nvim-treesitter {:req :treesitter
+                                         :run ":TSUpdate"
+                                         :requires [(pack :p00f/nvim-ts-rainbow {:after :nvim-treesitter :commit :2da916a})
+                                                    (pack :nvim-treesitter/nvim-treesitter-refactor {:after :nvim-treesitter})
+                                                    (pack :nvim-treesitter/nvim-treesitter-textobjects {:after :nvim-treesitter})
+                                                    (pack :JoosepAlviste/nvim-ts-context-commentstring {:after :nvim-treesitter})]})
 (pack! :lewis6991/gitsigns.nvim {:req :gitsigns})
 (pack! :sindrets/diffview.nvim {:req :diffview :cmd [:DiffviewOpen :DiffviewFileHistory] :module_pattern [:diffview :diffview.*]})
 (pack! :Pocco81/TrueZen.nvim {:cmd [:TZMinimalist :TZFocus :TZAtaraxis]})
 (pack! :stefandtw/quickfix-reflector.vim {:ft :qf})
 
-(pack! :neovim/nvim-lspconfig {:req :lspconfig})
-(pack! :ray-x/lsp_signature.nvim {:req :lsp_signature})
-(pack! :hrsh7th/nvim-cmp {:req :cmp :event :InsertEnter})
-(pack! :hrsh7th/cmp-nvim-lsp {:after :nvim-cmp})
-
+(pack! :hrsh7th/nvim-cmp {:req :cmp :event :InsertCharPre})
 (pack! :luukvbaal/stabilize.nvim {:init :stabilize})
 (pack! :antoinemadec/FixCursorHold.nvim)
 (pack! :numToStr/Comment.nvim {:module :Comment :init :Comment})
@@ -39,6 +36,10 @@
 (pack! :ThePrimeagen/harpoon {:req :harpoon})
 (pack! :gpanders/editorconfig.nvim)
 
+(pack! :neovim/nvim-lspconfig {:req :lspconfig
+                               :requires [(pack :hrsh7th/cmp-nvim-lsp {:after :nvim-cmp})
+                                          (pack :ray-x/lsp_signature.nvim {:req :lsp_signature :after :nvim-lspconfig})]})
+
 (pack! :simrat39/rust-tools.nvim {:init :rust-tools :ft :rust})
 (pack! :eraserhd/parinfer-rust {:ft [:fennel :clojure :query :lisp] :run "cargo build --release"})