From ff824e9dba2422a41c6ec21d4b522aeecc1bbfad Mon Sep 17 00:00:00 2001
From: Pedro Alves <pta2002@pta2002.com>
Date: Sun, 12 Dec 2021 12:39:08 +0000
Subject: [PATCH] Declaratively manage plugins not in nixpkgs

Created the plugins/plugin-defs.nix file, which will include
definitions for all plugins not in nixpkgs. This way, we can get
rid of the packer dependency and make the whole thing truly
declarative!
---
 plugins/plugin-defs.nix      | 16 ++++++++++++++++
 plugins/utils/intellitab.nix |  9 +++------
 2 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 plugins/plugin-defs.nix

diff --git a/plugins/plugin-defs.nix b/plugins/plugin-defs.nix
new file mode 100644
index 00000000..9473969e
--- /dev/null
+++ b/plugins/plugin-defs.nix
@@ -0,0 +1,16 @@
+# This is for plugins not in nixpkgs
+# e.g. intellitab.nvim
+# Ideally, in the future, this would all be specified as a flake input!
+{ pkgs, ... }:
+{
+  intellitab-nvim = pkgs.vimUtils.buildVimPlugin rec {
+    pname = "intellitab-nvim";
+    version = "a6c1a505865f6131866d609c52440306e9914b16";
+    src = pkgs.fetchFromGitHub {
+      owner = "pta2002";
+      repo = "intellitab.nvim";
+      rev = version;
+      sha256 = "19my464jsji7cb81h0agflzb0vmmb3f5kapv0wwhpdddcfzvp4fg";
+    };
+  };
+}
diff --git a/plugins/utils/intellitab.nix b/plugins/utils/intellitab.nix
index 85209fff..195f80fb 100644
--- a/plugins/utils/intellitab.nix
+++ b/plugins/utils/intellitab.nix
@@ -2,7 +2,7 @@
 with lib;
 let
   cfg = config.programs.nixvim.plugins.comment-nvim;
-  helpers = import ../helpers.nix { inherit lib; };
+  defs = import ../plugin-defs.nix { inherit pkgs; };
 in
 {
   options = {
@@ -13,12 +13,9 @@ in
 
   config = mkIf cfg.enable {
     programs.nixvim = {
-      maps.insert."<Tab>" = "<CMD>lua require([[intellitab]]).indent()<CR>";
-      plugins.packer = {
-        enable = true;
-        plugins = [ "pta2002/intellitab.nvim" ];
-      };
+      extraPlugins = [ defs.intellitab-nvim ];
 
+      maps.insert."<Tab>" = "<CMD>lua require([[intellitab]]).indent()<CR>";
       plugins.treesitter = {
         indent = true;
       };