Installed diffview

home/neovim/default.nix

@@ -16,6 +16,7 @@
     #./openscad.nix
     #./molten.nix
     ./which-key.nix
+    ./diffview.nix
   ];
 
   home.packages = with pkgs; [

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>";
+      };
+    };
+  };
+}

home/ssh.nix

@@ -7,16 +7,26 @@
       "*" = {
         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";
+      };
+
       "git.cyperpunk.de" = {
         hostname = "git.cyperpunk.de";
         port = 12222;