From 41850130142b1730c5754b0cc6ea437397805209 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sat, 14 Dec 2024 21:05:24 +0000
Subject: [PATCH] Refactor Vim plugins into its own default.nix

---
 nix/pkgs/default.nix             | 15 +++------------
 nix/pkgs/vim-plugins/default.nix | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 nix/pkgs/vim-plugins/default.nix

diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix
index fd069a2..6608dc9 100644
--- a/nix/pkgs/default.nix
+++ b/nix/pkgs/default.nix
@@ -2,6 +2,8 @@
 
 let
   inherit (pkgs) callPackage;
+
+  vimPlugins = callPackage ./vim-plugins { inherit callPackage; };
 in
 {
   build-glove80 = callPackage ./build-glove80.nix { };
@@ -9,16 +11,5 @@ in
   notes = callPackage ./notes.nix { };
   notify-battery = callPackage ./notify-battery.nix { };
 
-  vimPlugins = prev.vimPlugins // {
-    conf-vim = callPackage ./vim-plugins/conf-vim.nix { };
-    edit-alternate-vim = callPackage ./vim-plugins/edit-alternate-vim.nix { };
-    nvim-tmux-navigation = callPackage ./vim-plugins/nvim-tmux-navigation.nix { };
-    standard-vim = callPackage ./vim-plugins/standard-vim.nix { };
-    vim-autoread = callPackage ./vim-plugins/vim-autoread.nix { };
-    vim-caser = callPackage ./vim-plugins/vim-caser.nix { };
-    vim-heritage = callPackage ./vim-plugins/vim-heritage.nix { };
-    vim-textobj-indent = callPackage ./vim-plugins/vim-textobj-indent.nix { };
-    vim-textobj-xmlattr = callPackage ./vim-plugins/vim-textobj-xmlattr.nix { };
-    vim-zoom = callPackage ./vim-plugins/vim-zoom.nix { };
-  };
+  vimPlugins = prev.vimPlugins // vimPlugins;
 }
diff --git a/nix/pkgs/vim-plugins/default.nix b/nix/pkgs/vim-plugins/default.nix
new file mode 100644
index 0000000..1b4c22d
--- /dev/null
+++ b/nix/pkgs/vim-plugins/default.nix
@@ -0,0 +1,14 @@
+{ callPackage }:
+
+{
+  conf-vim = callPackage ./conf-vim.nix { };
+  edit-alternate-vim = callPackage ./edit-alternate-vim.nix { };
+  nvim-tmux-navigation = callPackage ./nvim-tmux-navigation.nix { };
+  standard-vim = callPackage ./standard-vim.nix { };
+  vim-autoread = callPackage ./vim-autoread.nix { };
+  vim-caser = callPackage ./vim-caser.nix { };
+  vim-heritage = callPackage ./vim-heritage.nix { };
+  vim-textobj-indent = callPackage ./vim-textobj-indent.nix { };
+  vim-textobj-xmlattr = callPackage ./vim-textobj-xmlattr.nix { };
+  vim-zoom = callPackage ./vim-zoom.nix { };
+}