From bbe6825ceb31014af176c893a2a493a8b0348616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Tue, 16 Jul 2024 22:42:39 +0200
Subject: [PATCH 1/2] [fix] nvim: trouble API changed

---
 nvim/mappings.nix | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/nvim/mappings.nix b/nvim/mappings.nix
index 6bcc398..ad99182 100644
--- a/nvim/mappings.nix
+++ b/nvim/mappings.nix
@@ -74,25 +74,14 @@ in
     }
     {
       mode = "n";
-      key = "<leader>xx";
+      key = "<leader>xs";
       action =
         mkRaw
           # lua
           ''
-            require('trouble').toggle
+            function() require('trouble').toggle_preview('symbols') end
           '';
-      options.desc = "Toggle trouble";
-    }
-    {
-      mode = "n";
-      key = "<leader>xw";
-      action =
-        mkRaw
-          # lua
-          ''
-            function() require('trouble').toggle('workspace_diagnostics') end
-          '';
-      options.desc = "Toggle Workspace trouble";
+      options.desc = "Toggle Diagnostics trouble";
     }
     {
       mode = "n";
@@ -101,9 +90,9 @@ in
         mkRaw
           # lua
           ''
-            function() require('trouble').toggle('document_diagnostics') end
+            function() require('trouble').toggle_preview('diagnostics') end
           '';
-      options.desc = "Toggle Document trouble";
+      options.desc = "Toggle Diagnostics trouble";
     }
     {
       mode = "n";
@@ -112,7 +101,7 @@ in
         mkRaw
           # lua
           ''
-            function() require('trouble').toggle('quickfix') end
+            function() require('trouble').toggle_preview('quickfix') end
           '';
       options.desc = "Toggle Quickfix trouble";
     }
@@ -123,7 +112,7 @@ in
         mkRaw
           # lua
           ''
-            function() require('trouble').toggle('loclist') end
+            function() require('trouble').toggle_preview('loclist') end
           '';
       options.desc = "Toggle Loclist trouble";
     }
@@ -134,7 +123,7 @@ in
         mkRaw
           # lua
           ''
-            function() require('trouble').toggle('lsp_references') end
+            function() require('trouble').toggle_preview('lsp_references') end
           '';
       options.desc = "Toggle lsp References trouble";
     }
-- 
2.47.0


From 854e7d6af093631bf7e5d91552ceb94f5f8b3e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Tue, 16 Jul 2024 22:42:39 +0200
Subject: [PATCH 2/2] [fix] nvim: re-enable pylance

Also switch to the ruff beta lsp server
---
 nvim/plugins.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nvim/plugins.nix b/nvim/plugins.nix
index d97f815..9df1d6b 100644
--- a/nvim/plugins.nix
+++ b/nvim/plugins.nix
@@ -189,7 +189,9 @@ in
             autoEvalInputs = true;
           };
         };
-        ruff-lsp.enable = true;
+        pyright.enable = true;
+        # ruff-lsp.enable = true;
+        ruff.enable = true;
         taplo.enable = true;
         # texlab.enable = true; # Not writing TeX rn
         typos-lsp.enable = true;
-- 
2.47.0