From 1cbfff30242973452349fd0bc0d3e7e5e83f1c23 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sun, 15 Sep 2024 22:06:22 -0400
Subject: [PATCH] global/neovim: switch from pyright to pylsp+ruff

---
 users/modules/global/neovim.nix      | 19 ++++++++++++++++++-
 users/modules/global/programming.nix |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/users/modules/global/neovim.nix b/users/modules/global/neovim.nix
index 05a99fa..78a4610 100644
--- a/users/modules/global/neovim.nix
+++ b/users/modules/global/neovim.nix
@@ -41,6 +41,11 @@
         action = "<C-\\><C-n>";
         mode = "t";
       }
+      {
+        key = "<M-CR>";
+        action.__raw = "vim.lsp.buf.code_action";
+        mode = [ "n" "i" "v" "s" ];
+      }
     ];
 
     plugins = {
@@ -83,7 +88,19 @@
             };
           };
           nimls.enable = true;
-          pyright.enable = true;
+          pylsp = {
+            enable = true;
+            settings = {
+              plugins = {
+                ruff = {
+                  formatEnabled = true;
+                  enable = true;
+                  format = [ "I" ];
+                };
+                rope.enable = true;
+              };
+            };
+          };
           rust-analyzer = {
             enable = true;
             installRustc = false;
diff --git a/users/modules/global/programming.nix b/users/modules/global/programming.nix
index 15180d8..307c119 100644
--- a/users/modules/global/programming.nix
+++ b/users/modules/global/programming.nix
@@ -53,8 +53,8 @@ in
       pyls-isort
       pytest
     ])
-    pyright
     pipenv
+    ruff
 
     # Racket
     racket