From 8b51847ac094f1a8ff8e5d54b215a657cb43d3b3 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 4 Jun 2024 15:43:27 +0100
Subject: [PATCH] Move python and lua config into emacs directory

Change python lsp to use pyright, add lua-language-server
---
 home/default.nix                                    | 2 --
 programs/emacs/default.nix                          | 8 ++++++++
 programs/{ => emacs}/lua/default.nix                | 0
 programs/{ => emacs}/lua/luarocks/graph-toolkit.nix | 0
 programs/{ => emacs}/lua/luarocks/scilua.nix        | 0
 programs/{ => emacs}/lua/luarocks/xsys.nix          | 0
 programs/{ => emacs}/python/default.nix             | 2 --
 programs/{ => emacs}/python/pypoetry.toml           | 0
 programs/{ => emacs}/python/ruff.toml               | 0
 9 files changed, 8 insertions(+), 4 deletions(-)
 rename programs/{ => emacs}/lua/default.nix (100%)
 rename programs/{ => emacs}/lua/luarocks/graph-toolkit.nix (100%)
 rename programs/{ => emacs}/lua/luarocks/scilua.nix (100%)
 rename programs/{ => emacs}/lua/luarocks/xsys.nix (100%)
 rename programs/{ => emacs}/python/default.nix (89%)
 rename programs/{ => emacs}/python/pypoetry.toml (100%)
 rename programs/{ => emacs}/python/ruff.toml (100%)

diff --git a/home/default.nix b/home/default.nix
index b0a78ba..19ac8fd 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -14,8 +14,6 @@
     ../programs/firefox/default.nix
     ../programs/cava/default.nix
     ../programs/obs/default.nix
-    ../programs/python/default.nix
-    ../programs/lua/default.nix
     # Services
     ../services/email/work.nix # TODO combine again at some point
     ../services/password-store/default.nix
diff --git a/programs/emacs/default.nix b/programs/emacs/default.nix
index e678706..0c1695c 100644
--- a/programs/emacs/default.nix
+++ b/programs/emacs/default.nix
@@ -3,6 +3,10 @@
   fonts,
   ...
 }: {
+  imports = [
+    ./python/default.nix
+    ./lua/default.nix
+  ];
   programs.emacs = {
     # Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git
     # git clone https://git.xenia.me.uk/pixelifytica/emacs.git ~/.emacs.d
@@ -153,5 +157,9 @@
     isort
     stylua
     nodePackages.prettier
+
+    ## Language servers
+    pyright
+    lua-language-server
   ];
 }
diff --git a/programs/lua/default.nix b/programs/emacs/lua/default.nix
similarity index 100%
rename from programs/lua/default.nix
rename to programs/emacs/lua/default.nix
diff --git a/programs/lua/luarocks/graph-toolkit.nix b/programs/emacs/lua/luarocks/graph-toolkit.nix
similarity index 100%
rename from programs/lua/luarocks/graph-toolkit.nix
rename to programs/emacs/lua/luarocks/graph-toolkit.nix
diff --git a/programs/lua/luarocks/scilua.nix b/programs/emacs/lua/luarocks/scilua.nix
similarity index 100%
rename from programs/lua/luarocks/scilua.nix
rename to programs/emacs/lua/luarocks/scilua.nix
diff --git a/programs/lua/luarocks/xsys.nix b/programs/emacs/lua/luarocks/xsys.nix
similarity index 100%
rename from programs/lua/luarocks/xsys.nix
rename to programs/emacs/lua/luarocks/xsys.nix
diff --git a/programs/python/default.nix b/programs/emacs/python/default.nix
similarity index 89%
rename from programs/python/default.nix
rename to programs/emacs/python/default.nix
index 7928e7b..b409b00 100644
--- a/programs/python/default.nix
+++ b/programs/emacs/python/default.nix
@@ -4,11 +4,9 @@
     "pypoetry/config.toml".source = ./pypoetry.toml;
   };
   home.packages = with pkgs; [
-    poetry
     (python3.withPackages
       (ps:
         with ps; [
-          python-lsp-server
           mypy
           numpy
           scipy
diff --git a/programs/python/pypoetry.toml b/programs/emacs/python/pypoetry.toml
similarity index 100%
rename from programs/python/pypoetry.toml
rename to programs/emacs/python/pypoetry.toml
diff --git a/programs/python/ruff.toml b/programs/emacs/python/ruff.toml
similarity index 100%
rename from programs/python/ruff.toml
rename to programs/emacs/python/ruff.toml