feature(neogit/diffview): Add diffview to neogit

Author: DashieTM

config/editor/git.nix

@@ -37,6 +37,28 @@ in {
         package = adopure-nvim;
       };
     };
+    utility.diffview-nvim = {
+      enable = true;
+      setupOpts = {
+        keymaps = let
+          movement =
+            lib.generators.mkLuaInline
+            /*
+            lua
+            */
+            ''
+              {
+                { "n", "l",  require("diffview.actions").prev_entry, { desc = "Bring the cursor to the previous file entry" } },
+                { "n", "k",  require("diffview.actions").next_entry, { desc = "Bring the cursor to the next file entry" } },
+              }
+            '';
+        in
+          lib.mkIf config'.useDefaultKeybinds {
+            file_panel = movement;
+            file_history_panel = movement;
+          };
+      };
+    };
     git = mkDashDefault {
       gitsigns = {
         enable = true;
@@ -51,6 +73,10 @@ in {
         enable = true;
         setupOpts = {
           use_default_keymaps = false;
+          integrations = {
+            telescope = true;
+            diffview = true;
+          };
           mappings = lib.mkIf config'.useDefaultKeybinds {
             commit_editor = {
               "q" = "Close";
@@ -107,16 +133,15 @@ in {
               "B" = "BisectPopup";
               "c" = "CommitPopup";
               "f" = "FetchPopup";
-              "l" = "LogPopup";
               "m" = "MergePopup";
               "p" = "PullPopup";
               "r" = "RebasePopup";
               "v" = "RevertPopup";
               "w" = "WorktreePopup";
             };
             status = {
-              l = "MoveUp";
-              k = "MoveDown";
+              "l" = "MoveUp";
+              "k" = "MoveDown";
               "q" = "Close";
               "o" = "OpenTree";
               "I" = "InitRepo";

config/keybinds.nix

@@ -253,12 +253,6 @@
         action = ''<CMD>lua require("telescope.builtin").git_status()<CR>'';
         desc = "Git status";
       }
-      {
-        mode = "n";
-        key = "<leader>gn";
-        action = "<CMD>Neogit <CR>";
-        desc = "Neogit";
-      }
       {
         mode = "n";
         key = "<leader>gg";
@@ -378,6 +372,42 @@
         silent = true;
       }
 
+      # git+diff
+      {
+        mode = [
+          "n"
+          "v"
+        ];
+        key = "<leader>gf";
+        action = "<CMD>DiffviewFileHistory %s<CR>";
+        noremap = true;
+        silent = true;
+        desc = "Diffview File history (current file)";
+      }
+      {
+        mode = [
+          "n"
+          "v"
+        ];
+        key = "<leader>gF";
+        action = "<CMD>DiffviewFileHistory<CR>";
+        noremap = true;
+        silent = true;
+        desc = "Diffview File history (all files)";
+      }
+      {
+        mode = "n";
+        key = "<leader>gn";
+        action = "<CMD>Neogit <CR>";
+        desc = "Neogit dashboard";
+      }
+      {
+        mode = "n";
+        key = "<leader>gd";
+        action = "<CMD>Neogit diff <CR>";
+        desc = "Neogit diff";
+      }
+
       # code action
       {
         mode = [
@@ -591,6 +621,21 @@
         action = ''<CMD>lua require("dap").step_into()<CR>'';
         desc = "Step Into";
       }
+      {
+        mode = "n";
+        key = "<leader>de";
+        action = ''
+          <cmd>lua
+            local dap = require('dap')
+            dap.listeners.after.event_initialized["set_exception_breakpoints"] = function()
+            	dap.set_exception_breakpoints({ "raised", "uncaught" })
+            end
+          <cr>
+        '';
+        noremap = true;
+        silent = true;
+        desc = "Stop on exceptions";
+      }
       {
         mode = "n";
         key = "<leader>dc";

config/languages/lsp.nix

@@ -10,6 +10,16 @@
       "ng.nvim" = mkDashDefault {
         package = ng-nvim;
       };
+      "roslyn.nvim" = mkDashDefault {
+        package = roslyn-nvim;
+        setupModule = "roslyn";
+        event = [
+          {
+            event = "FileType";
+            pattern = "cs";
+          }
+        ];
+      };
     };
     extraPlugins = with pkgs.vimPlugins; {
       "easy-dotnet.nvim" = mkDashDefault {
@@ -54,6 +64,8 @@
               function(client, bufnr)
                 ${(import ../luaFunctions.nix).isAngular}
 
+                -- This shit is the most annoying thing ever
+                client.server_capabilities.textDocument.completion.completionItem.insertReplaceSupport = false
                 local root_dir = client.config.root_dir
                 if is_angular_project(root_dir) then
                   client.server_capabilities.renameProvider = false

flake.lock

@@ -1,8 +1,4 @@
-{
-  pkgs,
-  stable,
-  ...
-}: let
+{pkgs, ...}: let
   easyDotnet = pkgs.buildDotnetGlobalTool {
     pname = "EasyDotnet";
     version = "2.2.28";
@@ -20,4 +16,5 @@ in
     fd
     zoxide
     gh
+    roslyn-ls
   ]

lib/dependencies.nix

@@ -208,8 +208,8 @@
           csharp = {
             enable = true;
             lsp = {
-              enable = true;
-              servers = "omnisharp";
+              enable = false;
+              servers = "roslyn_ls";
             };
           };
           css = {