From 00b61fb9cb648356b903f44f1cf4c83bc634d4c3 Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Fri, 29 Dec 2023 01:50:07 +0100
Subject: [PATCH] nvim: add diffview

---
 home/programs/nvim/default.nix  | 14 ++++++++------
 home/programs/nvim/plugins.nix  | 33 ++++++++++++++++++++++-----------
 home/programs/nvim/plugins.yaml |  3 ++-
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix
index f33fb04..2f4b97a 100644
--- a/home/programs/nvim/default.nix
+++ b/home/programs/nvim/default.nix
@@ -321,6 +321,14 @@ in
           type = "fennel";
         }
 
+        diffview-nvim
+
+        {
+          plugin = neogit;
+          config = builtins.readFile ../../config/nvim/plugins/neogit.fnl;
+          type = "fennel";
+        }
+
         {
           plugin = fidget-nvim;
           config = builtins.readFile ../../config/nvim/plugins/fidget.fnl;
@@ -332,12 +340,6 @@ in
           config = builtins.readFile ../../config/nvim/plugins/which-key.fnl;
           type = "fennel";
         }
-
-        {
-          plugin = neogit;
-          config = builtins.readFile ../../config/nvim/plugins/neogit.fnl;
-          type = "fennel";
-        }
       ] ++ optionals isDarwin [
         {
           plugin = pkgs.vimPlugins.cmp-tabnine;
diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix
index 74c4f77..2867aec 100644
--- a/home/programs/nvim/plugins.nix
+++ b/home/programs/nvim/plugins.nix
@@ -525,6 +525,28 @@ in
       fetchSubmodules = false;
     };
   };
+  neogit = buildVimPlugin {
+    pname = "neogit";
+    version = "2023-12-28";
+    src = fetchFromGitHub {
+      owner = "NeogitOrg";
+      repo = "neogit";
+      rev = "3718664bb62e89930f0c3c836188c2a4f44fa119";
+      sha256 = "09idnas2cnpkbgk685pbk6kpmpj5xm8p622kldak5dq4nlh63zwa";
+      fetchSubmodules = false;
+    };
+  };
+  diffview-nvim = buildVimPlugin {
+    pname = "diffview.nvim";
+    version = "2023-11-20";
+    src = fetchFromGitHub {
+      owner = "sindrets";
+      repo = "diffview.nvim";
+      rev = "3dc498c9777fe79156f3d32dddd483b8b3dbd95f";
+      sha256 = "1zvgm0icmc4z48vnd6pn7pvl6sg89mm4symr0rwiix8s942nfiyw";
+      fetchSubmodules = false;
+    };
+  };
   fidget-nvim = buildVimPlugin {
     pname = "fidget.nvim";
     version = "2023-12-28";
@@ -547,15 +569,4 @@ in
       fetchSubmodules = false;
     };
   };
-  neogit = buildVimPlugin {
-    pname = "neogit";
-    version = "2023-12-28";
-    src = fetchFromGitHub {
-      owner = "NeogitOrg";
-      repo = "neogit";
-      rev = "3718664bb62e89930f0c3c836188c2a4f44fa119";
-      sha256 = "09idnas2cnpkbgk685pbk6kpmpj5xm8p622kldak5dq4nlh63zwa";
-      fetchSubmodules = false;
-    };
-  };
 }
diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml
index bd85be9..86a3a71 100644
--- a/home/programs/nvim/plugins.yaml
+++ b/home/programs/nvim/plugins.yaml
@@ -61,6 +61,7 @@
 - src: lukas-reineke/virt-column.nvim
 - src: axieax/urlview.nvim
 - src: lewis6991/gitsigns.nvim
+- src: sindrets/diffview.nvim
+- src: NeogitOrg/neogit
 - src: j-hui/fidget.nvim
 - src: folke/which-key.nvim
-- src: NeogitOrg/neogit