diff --git a/home/emacs.nix b/home/emacs.nix
index 57bfb1d4..9d12ea3e 100644
--- a/home/emacs.nix
+++ b/home/emacs.nix
@@ -149,18 +149,17 @@
     mupdf
 
     # Linters
-    nodePackages.stylelint
 
-    # Formatters
-    nodePackages.prettier
+    # Stand-alone formatters / linters
     nixfmt
+    rustfmt
+    fprettify
     black
     isort
-    fprettify
     ruff
-    rustfmt
     stylua
     shfmt
+    nodePackages.stylelint
 
     # LSP Servers
     nil
@@ -168,7 +167,7 @@
     shellcheck
     rust-analyzer
     luajitPackages.lua-lsp
-    nodePackages.pyright
+    python3Packages.python-lsp-server
     nodePackages.yaml-language-server
     nodePackages.bash-language-server
   ];