From 967ac2c84f63ad41bc99d8f61c505bc9247625e9 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Thu, 16 May 2024 15:49:23 -0500
Subject: [PATCH] Get neogit from source

---
 nix/base-system/flake.lock | 17 +++++++++++++++++
 nix/base-system/flake.nix  | 14 ++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/nix/base-system/flake.lock b/nix/base-system/flake.lock
index 2b4b2be..eb52d09 100644
--- a/nix/base-system/flake.lock
+++ b/nix/base-system/flake.lock
@@ -451,6 +451,22 @@
         "type": "github"
       }
     },
+    "neogit-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1715889863,
+        "narHash": "sha256-xaN7g7FUpt6yVzsKR/D+3RDmTlX+hfrWm6Xhq9Sws+k=",
+        "owner": "NeogitOrg",
+        "repo": "neogit",
+        "rev": "9040f6face04f93e6903f25f038d67550fc9027b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NeogitOrg",
+        "repo": "neogit",
+        "type": "github"
+      }
+    },
     "neovim-flake": {
       "inputs": {
         "flake-utils": "flake-utils_4",
@@ -687,6 +703,7 @@
         "durnitisp-flake": "durnitisp-flake",
         "harpoon-src": "harpoon-src",
         "heracles-flake": "heracles-flake",
+        "neogit-src": "neogit-src",
         "neovim-flake": "neovim-flake",
         "nil-flake": "nil-flake",
         "nixpkgs": "nixpkgs_7",
diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index 119fbef..5e1c871 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -36,6 +36,10 @@
         url = "github:ThePrimeagen/harpoon/harpoon2";
         flake = false;
     };
+    neogit-src = {
+        url = "github:NeogitOrg/neogit";
+        flake = false;
+    };
     d2-vim-src = {
         url = "github:terrastruct/d2-vim";
         flake = false;
@@ -63,6 +67,7 @@
     nil-flake,
     nurl-flake,
     harpoon-src,
+    neogit-src,
     d2-vim-src,
     treesitter-context,
     roslyn-lsp,
@@ -86,6 +91,11 @@
           version = "2024-01-28";
           src = harpoon-src;
         };
+        neogit-nvim = pkgs.vimUtils.buildVimPlugin {
+          pname = "neogit";
+          version = "2024-05-16";
+          src = neogit-src;
+        };
         d2-vim =  pkgs.vimUtils.buildVimPlugin {
           pname = "d2-nvim";
           version = "2024-01-28";
@@ -147,7 +157,7 @@ EOF";
                 cmp-nvim-lsp-signature-help
                 nvim-dap # Debug Adapter Protocol support
                 #nvim-dap-ui
-                neogit
+                #neogit
                 hoon-vim
                 nvim-treesitter
                 lean-nvim
@@ -192,7 +202,7 @@ EOF";
                 vim-dadbod
                 vim-dadbod-ui
                 vim-dadbod-completion
-              ]) ++ [ possession-nvim harpoon-nvim d2-vim ];
+              ]) ++ [ possession-nvim harpoon-nvim d2-vim neogit-nvim ];
             };
           };
         };