Fixed Discord Bridge and neovim stupid stuff

2026-06-17 13:48:00 +02:00
parent 297589362f
commit 9640b433a4
5 changed files with 117 additions and 110 deletions
@@ -2,12 +2,32 @@ _: {
  programs.nixvim = {
    plugins.diffview = {
      enable = true;
-      keymaps = {
-        "]x" = "<cmd>DiffviewConflictNext<CR>";
-        "[x" = "<cmd>DiffviewConflictPrev<CR>";
-        "do" = "<cmd>DiffviewFocusOurs<CR>";
-        "dt" = "<cmd>DiffviewFocusTheirs<CR>";
-      };
+      settings.keymaps.view = [
+        {
+          mode = "n";
+          key = "]x";
+          action = "<cmd>DiffviewConflictNext<CR>";
+          description = "Next conflict";
+        }
+        {
+          mode = "n";
+          key = "[x";
+          action = "<cmd>DiffviewConflictPrev<CR>";
+          description = "Previous conflict";
+        }
+        {
+          mode = "n";
+          key = "do";
+          action = "<cmd>DiffviewFocusOurs<CR>";
+          description = "Focus ours";
+        }
+        {
+          mode = "n";
+          key = "dt";
+          action = "<cmd>DiffviewFocusTheirs<CR>";
+          description = "Focus theirs";
+        }
+      ];
    };
  };
 }