diff --git a/home/emacs.nix b/home/emacs.nix
index 4cc3855d..58f5b249 100644
--- a/home/emacs.nix
+++ b/home/emacs.nix
@@ -40,6 +40,7 @@
         treesit-grammars.with-all-grammars
         treesit-auto
         flymake-popon
+        flymake-shellcheck
         apheleia
         direnv
         goto-chg
diff --git a/system/emacs.nix b/system/emacs.nix
index 73f17938..a80ea6a3 100644
--- a/system/emacs.nix
+++ b/system/emacs.nix
@@ -23,7 +23,11 @@
     mupdf
     poppler_utils
 
+    # Linters
+    shellcheck
+
     # Formatters
+    nodePackages.prettier
     nixfmt
     ruff
     isort
@@ -35,9 +39,8 @@
     # LSP Servers
     nil
     fortls
-    shellcheck
     rust-analyzer
     luajitPackages.lua-lsp
-    (python3.withPackages (ps: with ps; [ python-lsp-server python-lsp-ruff ]))
+    nodePackages.pyright
   ];
 }