From a15b3bc84fd0443d0c853df99ed6e1755b245475 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 14 Jun 2023 16:09:21 +0100
Subject: [PATCH] Add python-lsp-server and magma-nvim packages

---
 home/tui/neovim.nix | 12 +++++++++++-
 nvim                |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/home/tui/neovim.nix b/home/tui/neovim.nix
index 589075f7..2b3171dd 100644
--- a/home/tui/neovim.nix
+++ b/home/tui/neovim.nix
@@ -19,13 +19,23 @@
     withNodeJs = true;
     withRuby = true;
     withPython3 = true;
+    extraPython3Packages = ps: with ps; [
+      # For Magma-nvim
+      jupyter_client
+      ueberzug
+      pillow
+      cairosvg
+      pnglatex
+      plotly
+    ];
     extraPackages = with pkgs; [
       # Language servers
-      nodePackages.pyright
+      python3Packages.python-lsp-server
       python3Packages.ruff-lsp
       nil
       lua-language-server
       fortls
+      # nodePackages.pyright
       nodePackages.yaml-language-server
       nodePackages.vim-language-server
       nodePackages.bash-language-server
diff --git a/nvim b/nvim
index 194130c9..d5bdd20a 160000
--- a/nvim
+++ b/nvim
@@ -1 +1 @@
-Subproject commit 194130c91fb16c79cf68a3e496e7fe043fd4579f
+Subproject commit d5bdd20a446143cd3641d3d9655c077d5d0f6923