From d062732ca06ddb03043e9b27674dad01f0907e0f Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 26 Jun 2024 13:38:34 +0100
Subject: [PATCH] Switch python to use pylsp again

Add typescript LSP, add nil to Emacs configuration
---
 programs/emacs/default.nix        | 3 ++-
 programs/emacs/python/default.nix | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/programs/emacs/default.nix b/programs/emacs/default.nix
index 5aee806..b0fc005 100644
--- a/programs/emacs/default.nix
+++ b/programs/emacs/default.nix
@@ -186,7 +186,8 @@
     nodePackages.prettier
 
     ## Language servers
-    pyright
+    nil # Nix lsp
     lua-language-server
+    typescript-language-server
   ];
 }
diff --git a/programs/emacs/python/default.nix b/programs/emacs/python/default.nix
index b409b00..0e282f1 100644
--- a/programs/emacs/python/default.nix
+++ b/programs/emacs/python/default.nix
@@ -7,6 +7,8 @@
     (python3.withPackages
       (ps:
         with ps; [
+          python-lsp-server
+          isort
           mypy
           numpy
           scipy