From 9b2bd1fbfac05b1812bf6fd929e5be6c8c3faa57 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Tue, 12 Mar 2024 10:11:14 -0400
Subject: [PATCH] feat: Use neogit instead of vimagit

---
 nix/base-system/flake.lock | 6 +++---
 nix/base-system/flake.nix  | 4 ++--
 nix/base-system/init.lua   | 9 ++++++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/nix/base-system/flake.lock b/nix/base-system/flake.lock
index 8653155..e30b7af 100644
--- a/nix/base-system/flake.lock
+++ b/nix/base-system/flake.lock
@@ -329,11 +329,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1709072133,
-        "narHash": "sha256-RdDYNockp2wH22DdJlQ/h8IJnB9n9U3XLIAI4dqMQME=",
+        "lastModified": 1710102698,
+        "narHash": "sha256-PO4wOhMGqL1zVWSTiGMPGnW1aC5urvInhd9TV82LF0E=",
         "owner": "zaphar",
         "repo": "Heracles",
-        "rev": "782cca41a0b44ea8ac68c696f73d5491197a933b",
+        "rev": "00e84bd99a2ccf25363034ac9de7eeba916867a8",
         "type": "github"
       },
       "original": {
diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index 5cb41a4..ab31493 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -132,7 +132,7 @@ EOF";
                 cmp-nvim-lsp-signature-help
                 nvim-dap # Debug Adapter Protocol support
                 #nvim-dap-ui
-                vimagit
+                neogit
                 hoon-vim
                 nvim-treesitter
                 lean-nvim
@@ -190,7 +190,7 @@ EOF";
             nil-pkg
 			lua-language-server
             rust-analyzer
-            #omnisharp-roslyn
+            omnisharp-roslyn
         ]);
       };
     };
diff --git a/nix/base-system/init.lua b/nix/base-system/init.lua
index 263ec67..d533f78 100644
--- a/nix/base-system/init.lua
+++ b/nix/base-system/init.lua
@@ -452,8 +452,13 @@ vim.keymap.set("n", "<Leader>ts", function()
     vim.cmd("tabs")
 end)
 
+-- Neogit integration
+-- See https://github.com/NeogitOrg/neogit for configuration information.
+local neogit = require('neogit')
+neogit.setup()
+
 vim.keymap.set("n", "<Leader>mg", function()
-    vim.cmd("MagitOnly")
+    neogit.open()
 end)
 
 -- Add a file to git
@@ -525,7 +530,9 @@ lean.setup {
 
 -- telescope keymaps
 vim.keymap.set("n", "<Leader>pl", telescope.extensions.possession.list)
+-- TODO(zaphar): Remove this once my muscle memory has set in.
 vim.keymap.set("n", "<Leader>nff", telescope_builtins.fd)
+vim.keymap.set("n", "<Leader>ff", telescope_builtins.fd)
 vim.keymap.set("n", "<Leader>rl", telescope_builtins.lsp_references)
 vim.keymap.set("n", "<Leader>rn", vim.lsp.buf.rename)
 vim.keymap.set("n", "<Leader>sl", telescope_builtins.lsp_workspace_symbols)