From 1a1d2049489df7526a86a931f7d3b4e4876dd3c2 Mon Sep 17 00:00:00 2001
From: Dan Nixon <dan@dan-nixon.com>
Date: Wed, 7 Aug 2024 18:18:34 +0100
Subject: [PATCH] wip

---
 .../terminal_environment/neovim/plugins.nix   | 48 +++++++++----------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/modules/home-manager/terminal_environment/neovim/plugins.nix b/modules/home-manager/terminal_environment/neovim/plugins.nix
index 48ac220..4aae8a8 100644
--- a/modules/home-manager/terminal_environment/neovim/plugins.nix
+++ b/modules/home-manager/terminal_environment/neovim/plugins.nix
@@ -4,60 +4,56 @@
   pkgs,
   ...
 }: {
-  programs.neovim.plugins = with pkgs; [
+  programs.neovim.plugins = with pkgs.vimPlugins; [
     # Colour scheme
-    (vimPlugins.base16-vim.overrideAttrs (
+    (base16-vim.overrideAttrs (
       old: let
         schemeFile = config.scheme inputs.base16-vim;
       in {patchPhase = ''cp ${schemeFile} colors/base16-scheme.vim'';}
     ))
 
     # Provides easy line/block comment toggling
-    vimPlugins.vim-commentary
+    vim-commentary
 
     # Completion
-    vimPlugins.nvim-cmp
-    vimPlugins.vim-vsnip
-    vimPlugins.cmp-vsnip
-    vimPlugins.cmp-buffer
-    vimPlugins.cmp-nvim-lsp
-    vimPlugins.cmp-path
+    nvim-cmp
+    vim-vsnip
+    cmp-vsnip
+    cmp-buffer
+    cmp-nvim-lsp
+    cmp-path
 
     # Used to format and make editing CSV files trivial
-    vimPlugins.csv
+    csv
 
     # Fast jumping to markers in a file
-    vimPlugins.easymotion
+    easymotion
 
     # Fuzzy finding
-    vimPlugins.fzf-lua
+    fzf-lua
 
     # Status line
-    vimPlugins.lualine-nvim
+    lualine-nvim
 
     # Enhanced spelling and grammar checking
-    vimPlugins.vim-lexical
+    vim-lexical
 
     # Language server client
-    vimPlugins.nvim-lspconfig
+    nvim-lspconfig
 
     # Tree based file explorer
-    vimPlugins.neo-tree-nvim
+    neo-tree-nvim
 
     # Restores cursor position on opening previously opened files
-    vimPlugins.restore-view-vim
+    restore-view-vim
 
     # Format text into one line per sentence
-    vimPlugins.vim-sentence-chopper
-
-    # Query and insert unicode characters
-    vimPlugins.unicode-vim
+    vim-sentence-chopper
 
     # Treesitter
-    vimPlugins.nvim-treesitter
-    vimPlugins.nvim-treesitter-parsers.nix
-    vimPlugins.nvim-treesitter-parsers.python
-    vimPlugins.nvim-treesitter-parsers.rust
-    vimPlugins.nvim-treesitter-parsers.yaml
+    nvim-treesitter.withAllGrammars
+
+    # Query and insert unicode characters
+    unicode-vim
   ];
 }