From cb078522bd248c04464fa732f9172429375e0444 Mon Sep 17 00:00:00 2001
From: DerGrumpf <phil.keier@hotmail.com>
Date: Fri, 15 May 2026 15:33:34 +0200
Subject: [PATCH] Installed diffview

---
 home/neovim/default.nix  |  1 +
 home/neovim/diffview.nix | 13 +++++++++++++
 home/ssh.nix             |  9 +++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 home/neovim/diffview.nix

diff --git a/home/neovim/default.nix b/home/neovim/default.nix
index 88af22b..7619c63 100644
--- a/home/neovim/default.nix
+++ b/home/neovim/default.nix
@@ -16,6 +16,7 @@
     #./openscad.nix
     #./molten.nix
     ./which-key.nix
+    ./diffview.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/home/neovim/diffview.nix b/home/neovim/diffview.nix
new file mode 100644
index 0000000..7ad09fb
--- /dev/null
+++ b/home/neovim/diffview.nix
@@ -0,0 +1,13 @@
+_: {
+  programs.nixvim = {
+    plugins.diffview = {
+      enable = true;
+      keymaps = {
+        "]x" = "<cmd>DiffviewConflictNext<CR>";
+        "[x" = "<cmd>DiffviewConflictPrev<CR>";
+        "do" = "<cmd>DiffviewFocusOurs<CR>";
+        "dt" = "<cmd>DiffviewFocusTheirs<CR>";
+      };
+    };
+  };
+}
diff --git a/home/ssh.nix b/home/ssh.nix
index 8ad6abe..3866e96 100644
--- a/home/ssh.nix
+++ b/home/ssh.nix
@@ -7,16 +7,25 @@
       "*" = {
         addKeysToAgent = "yes";
       };
+
       "*.cyperpunk.de" = {
         identityFile =
           if isDarwin then "/Users/${primaryUser}/.ssh/ssh" else "/home/${primaryUser}/.ssh/ssh";
         user = primaryUser;
       };
+
       "github.com" = {
         identityFile =
           if isDarwin then "/Users/${primaryUser}/.ssh/github" else "/home/${primaryUser}/.ssh/github";
         user = "git";
       };
+
+      "git.rz.tu-bs.de" = {
+        identityFile =
+          if isDarwin then "/Users/${primaryUser}/.ssh/github" else "/home/${primaryUser}/.ssh/github";
+
+        user = "git";
+      };
     };
   };
 }