diff --git a/home/tui/neovim.nix b/home/tui/neovim.nix
index c89d627b..99346dc2 100644
--- a/home/tui/neovim.nix
+++ b/home/tui/neovim.nix
@@ -10,34 +10,35 @@
     withNodeJs = true;
     withRuby = true;
     withPython3 = true;
+    extraPython3Packages = (ps: with ps; [
+      # Extra python packages for magma-nvim
+      jupyter-client
+      ueberzug
+      cairosvg
+      pnglatex
+    ]);
     extraPackages = with pkgs; [
       # Used by installed plugins
       gnumake
       gcc
       fzf
       ripgrep
+      tree-sitter
 
-      # Python
-      mypy
+      # Language servers
+      nodePackages.pyright
+      python3Packages.ruff-lsp
+      nil
+      lua-language-server
+      fortls
+      nodePackages.yaml-language-server
+      nodePackages.vim-language-server
+      nodePackages.bash-language-server
+
+      # Null LSP formatters
       black
       isort
-      ruff
-      python3Packages.jedi-language-server
-
-      # Nix
-      rnix-lsp
-      nil
-
-      # Lua
-      sumneko-lua-language-server
-      stylua
-
-      # Fortran
-      fortran-language-server
-
-      # Misc
       nodePackages.prettier
     ];
   };
-  home.packages = with pkgs; [ tree-sitter ];
 }