From be61683ae436009d3910746910d0aea3f67bd0ba Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 5 Sep 2023 17:09:03 +0100
Subject: [PATCH] Add some extra packages for emacs, switch default back from
 using server, remove rbw

---
 home/default.nix       |  2 +-
 home/emacs/default.nix | 30 +++++++++++++++++-------------
 home/tui/default.nix   |  1 -
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index d34fce2f..a8309e55 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -12,7 +12,7 @@
     ./alacritty/default.nix
     ./firefox/default.nix
     ./zathura/default.nix
-    ./emacs/server.nix
+    ./emacs/default.nix
   ];
   home.packages = with pkgs; [
     bitwarden
diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index e03d4729..0a3a692a 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -20,37 +20,41 @@
     pandoc
     gfortran
     texlive.combined.scheme-medium
+    imagemagick
+    python3
+    isort
+    python3Packages.cython
+    python3Packages.pyflakes
+    python3Packages.nose
+    python3Packages.pytest
+    nodePackages.stylelint
 
     # Formatters
     nixfmt
     beautysh
+    black
     nodePackages.fixjson
     fprettify
     shellharden
+    shfmt
     stylua
     python3Packages.mdformat
+    html-tidy
+    nodePackages.js-beautify
 
     # LSP servers
     nil
     fortls
-    (python3.withPackages (ps:
-      with ps; [
-        python-lsp-server
-        python-lsp-ruff
-        python-lsp-black
-        pyls-isort
-        pylsp-rope
-        pylsp-mypy
-      ]))
+    shellcheck
+    marksman
+    luajitPackages.lua-lsp
+    texlab
+    nodePackages.pyright
     nodePackages.yaml-language-server
     nodePackages.bash-language-server
     nodePackages.vscode-html-languageserver-bin
     nodePackages.vscode-css-languageserver-bin
     nodePackages.vscode-json-languageserver-bin
     nodePackages.dockerfile-language-server-nodejs
-    shellcheck
-    marksman
-    luajitPackages.lua-lsp
-    texlab
   ];
 }
diff --git a/home/tui/default.nix b/home/tui/default.nix
index b76f97c9..16b37f98 100644
--- a/home/tui/default.nix
+++ b/home/tui/default.nix
@@ -19,6 +19,5 @@
         builtins.readFile "${tokyonight}/extras/gitui/tokyonight_night.ron";
     };
     ncspot.enable = true;
-    rbw.enable = true;
   };
 }