From 3342a6d943d68108136aab54c469efeb2d6e7df8 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Mon, 15 Jul 2024 06:58:00 +0100
Subject: [PATCH] Slightly flatten Emacs / language expressions

Move Python and Lua interpreter config up into Emacs default.nix, move
associated files (python external configs, scilua) up a level as
well. Remove JavaScript default install.

Add tkinter to default Python packages to fix plotting.
---
 home/emacs/default.nix                          | 17 +++++++++++------
 home/emacs/javascript/default.nix               |  7 -------
 home/emacs/lua/default.nix                      |  7 -------
 home/emacs/{lua => }/luarocks/graph-toolkit.nix |  0
 home/emacs/{lua => }/luarocks/scilua.nix        |  0
 home/emacs/{lua => }/luarocks/xsys.nix          |  0
 home/emacs/{python => }/pypoetry.toml           |  0
 home/emacs/python/default.nix                   | 17 -----------------
 home/emacs/{python => }/ruff.toml               |  0
 9 files changed, 11 insertions(+), 37 deletions(-)
 delete mode 100644 home/emacs/javascript/default.nix
 delete mode 100644 home/emacs/lua/default.nix
 rename home/emacs/{lua => }/luarocks/graph-toolkit.nix (100%)
 rename home/emacs/{lua => }/luarocks/scilua.nix (100%)
 rename home/emacs/{lua => }/luarocks/xsys.nix (100%)
 rename home/emacs/{python => }/pypoetry.toml (100%)
 delete mode 100644 home/emacs/python/default.nix
 rename home/emacs/{python => }/ruff.toml (100%)

diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index e8377991..a0c4a0f6 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -4,12 +4,7 @@
   fonts,
   ...
 }: {
-  imports = [
-    ../shell/default.nix
-    ./python/default.nix
-    ./lua/default.nix
-    ./javascript/default.nix
-  ];
+  imports = [../shell/default.nix];
   services.emacs = {
     enable = true;
     package = config.programs.emacs.finalPackage;
@@ -167,5 +162,15 @@
     lua-language-server
     nodePackages.pyright
     nodePackages.typescript-language-server
+
+    ## Interpreters
+    (python3.withPackages
+      (ps: with ps; [tkinter numpy scipy xarray matplotlib]))
+    (luajit.withPackages
+      (ps: [(ps.callPackage ./luarocks/scilua.nix {})]))
   ];
+  xdg.configFile = {
+    "ruff/pyproject.toml".source = ./ruff.toml;
+    "pypoetry/config.toml".source = ./pypoetry.toml;
+  };
 }
diff --git a/home/emacs/javascript/default.nix b/home/emacs/javascript/default.nix
deleted file mode 100644
index ecea0dfb..00000000
--- a/home/emacs/javascript/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs;
-  with nodePackages; [
-    nodejs
-    typescript
-  ];
-}
diff --git a/home/emacs/lua/default.nix b/home/emacs/lua/default.nix
deleted file mode 100644
index ce6919e2..00000000
--- a/home/emacs/lua/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    (luajit.withPackages (ps: [
-      (ps.callPackage ./luarocks/scilua.nix {})
-    ]))
-  ];
-}
diff --git a/home/emacs/lua/luarocks/graph-toolkit.nix b/home/emacs/luarocks/graph-toolkit.nix
similarity index 100%
rename from home/emacs/lua/luarocks/graph-toolkit.nix
rename to home/emacs/luarocks/graph-toolkit.nix
diff --git a/home/emacs/lua/luarocks/scilua.nix b/home/emacs/luarocks/scilua.nix
similarity index 100%
rename from home/emacs/lua/luarocks/scilua.nix
rename to home/emacs/luarocks/scilua.nix
diff --git a/home/emacs/lua/luarocks/xsys.nix b/home/emacs/luarocks/xsys.nix
similarity index 100%
rename from home/emacs/lua/luarocks/xsys.nix
rename to home/emacs/luarocks/xsys.nix
diff --git a/home/emacs/python/pypoetry.toml b/home/emacs/pypoetry.toml
similarity index 100%
rename from home/emacs/python/pypoetry.toml
rename to home/emacs/pypoetry.toml
diff --git a/home/emacs/python/default.nix b/home/emacs/python/default.nix
deleted file mode 100644
index e1386028..00000000
--- a/home/emacs/python/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{pkgs, ...}: {
-  xdg.configFile = {
-    "ruff/pyproject.toml".source = ./ruff.toml;
-    "pypoetry/config.toml".source = ./pypoetry.toml;
-  };
-  home.packages = with pkgs; [
-    poetry
-    (python3.withPackages
-      (ps:
-        with ps; [
-          numpy
-          scipy
-          xarray
-          matplotlib
-        ]))
-  ];
-}
diff --git a/home/emacs/python/ruff.toml b/home/emacs/ruff.toml
similarity index 100%
rename from home/emacs/python/ruff.toml
rename to home/emacs/ruff.toml