From f30dcd048a5ca7b93dbd683dce4b57f9dd909826 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Sun, 28 Jan 2024 17:16:20 -0500
Subject: [PATCH] add d2 vim plugin

---
 nix/base-system/flake.lock       | 23 ++++++++++++++++++++---
 nix/base-system/flake.nix        | 19 +++++++++++++++----
 nix/base-system/harpoon-nvim.nix |  5 -----
 nix/darwin/flake.lock            | 23 ++++++++++++++++++++---
 4 files changed, 55 insertions(+), 15 deletions(-)
 delete mode 100644 nix/base-system/harpoon-nvim.nix

diff --git a/nix/base-system/flake.lock b/nix/base-system/flake.lock
index 7cf8080..894de69 100644
--- a/nix/base-system/flake.lock
+++ b/nix/base-system/flake.lock
@@ -20,6 +20,22 @@
         "type": "github"
       }
     },
+    "d2-vim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1675176182,
+        "narHash": "sha256-+mT4pEbtq7f9ZXhOop3Jnjr7ulxU32VtahffIwQqYF4=",
+        "owner": "terrastruct",
+        "repo": "d2-vim",
+        "rev": "981c87dccb63df2887cc41b96e84bf550f736c57",
+        "type": "github"
+      },
+      "original": {
+        "owner": "terrastruct",
+        "repo": "d2-vim",
+        "type": "github"
+      }
+    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -236,11 +252,11 @@
     "harpoon-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1703800925,
-        "narHash": "sha256-WD93Oq1WHrfkdOVbYDJiExr+MP1Uezl5WKA53jEdwmY=",
+        "lastModified": 1706306053,
+        "narHash": "sha256-RjwNUuKQpLkRBX3F9o25Vqvpu3Ah1TCFQ5Dk4jXhsbI=",
         "owner": "ThePrimeagen",
         "repo": "harpoon",
-        "rev": "6afc142443f8135329f8dd09b77e229f65001c0c",
+        "rev": "a38be6e0dd4c6db66997deab71fc4453ace97f9c",
         "type": "github"
       },
       "original": {
@@ -506,6 +522,7 @@
     "root": {
       "inputs": {
         "agenix-flake": "agenix-flake",
+        "d2-vim-src": "d2-vim-src",
         "durnitisp-flake": "durnitisp-flake",
         "harpoon-src": "harpoon-src",
         "jj-flake": "jj-flake",
diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index eeb1be1..7da420d 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -18,6 +18,10 @@
         url = "github:ThePrimeagen/harpoon/harpoon2";
         flake = false;
     };
+    d2-vim-src = {
+        url = "github:terrastruct/d2-vim";
+        flake = false;
+    };
     # We need to pin to this version of treesitter because it breaks after this revision
     treesitter-context = {
         url = "github:nvim-treesitter/nvim-treesitter-context/e6b743ccd4e780bc9cd85b707de67df72eea1a23";
@@ -39,6 +43,7 @@
     nil-flake,
     nurl-flake,
     harpoon-src,
+    d2-vim-src,
     treesitter-context,
     roslyn-lsp,
     nixpkgs,
@@ -54,9 +59,15 @@
             inherit (pkgs.vimUtils) buildVimPlugin;
 			inherit (pkgs) fetchFromGitHub;
         };
-        harpoon-nvim = pkgs.callPackage ./harpoon-nvim.nix {
-            inherit (pkgs.vimUtils) buildVimPlugin;
-			harpoonSrc = harpoon-src;
+        harpoon-nvim = pkgs.vimUtils.buildVimPlugin {
+          pname = "harpoon";
+          version = "2024-01-28";
+          src = harpoon-src;
+        };
+        d2-vim =  pkgs.vimUtils.buildVimPlugin {
+          pname = "d2-nvim";
+          version = "2024-01-28";
+          src = d2-vim-src;
         };
         nvim-treesitter-context = pkgs.vimUtils.buildVimPlugin {
             name = "nvim-treesitter-context";
@@ -153,7 +164,7 @@ EOF";
                 vim-dadbod
                 vim-dadbod-ui
                 vim-dadbod-completion
-              ]) ++ [ possession-nvim harpoon-nvim ];
+              ]) ++ [ possession-nvim harpoon-nvim d2-vim ];
             };
           };
         };
diff --git a/nix/base-system/harpoon-nvim.nix b/nix/base-system/harpoon-nvim.nix
deleted file mode 100644
index fbae076..0000000
--- a/nix/base-system/harpoon-nvim.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{buildVimPlugin, harpoonSrc, ...}:
-buildVimPlugin {
-    name = "harpoon";
-    src = harpoonSrc;
-}
diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock
index 2559cc7..891cd6e 100644
--- a/nix/darwin/flake.lock
+++ b/nix/darwin/flake.lock
@@ -23,6 +23,7 @@
     "base-system": {
       "inputs": {
         "agenix-flake": "agenix-flake",
+        "d2-vim-src": "d2-vim-src",
         "durnitisp-flake": "durnitisp-flake",
         "harpoon-src": "harpoon-src",
         "jj-flake": "jj-flake",
@@ -37,15 +38,31 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Uat1zSsHZfJ0lf1Ya9aW8r0mjBNtbt8woaSmHNyDGRA=",
-        "path": "/nix/store/4kzm062qwsfzq1vza029ic4lx9zpdy8p-source/nix/base-system",
+        "narHash": "sha256-0oGq3sK7ihOgO60F4x7xsYeeLKfLSVjia4sgVCjxKhc=",
+        "path": "/nix/store/mfyhkqw0pjia0lr8mxv6n5sn3drj4qbz-source/nix/base-system",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/4kzm062qwsfzq1vza029ic4lx9zpdy8p-source/nix/base-system",
+        "path": "/nix/store/mfyhkqw0pjia0lr8mxv6n5sn3drj4qbz-source/nix/base-system",
         "type": "path"
       }
     },
+    "d2-vim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1675176182,
+        "narHash": "sha256-+mT4pEbtq7f9ZXhOop3Jnjr7ulxU32VtahffIwQqYF4=",
+        "owner": "terrastruct",
+        "repo": "d2-vim",
+        "rev": "981c87dccb63df2887cc41b96e84bf550f736c57",
+        "type": "github"
+      },
+      "original": {
+        "owner": "terrastruct",
+        "repo": "d2-vim",
+        "type": "github"
+      }
+    },
     "darwin": {
       "inputs": {
         "nixpkgs": [