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.
This commit is contained in:
Evie Litherland-Smith 2024-07-15 06:58:00 +01:00
parent 319c25fc17
commit 3342a6d943
9 changed files with 11 additions and 37 deletions

View file

@ -4,12 +4,7 @@
fonts, fonts,
... ...
}: { }: {
imports = [ imports = [../shell/default.nix];
../shell/default.nix
./python/default.nix
./lua/default.nix
./javascript/default.nix
];
services.emacs = { services.emacs = {
enable = true; enable = true;
package = config.programs.emacs.finalPackage; package = config.programs.emacs.finalPackage;
@ -167,5 +162,15 @@
lua-language-server lua-language-server
nodePackages.pyright nodePackages.pyright
nodePackages.typescript-language-server 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;
};
} }

View file

@ -1,7 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs;
with nodePackages; [
nodejs
typescript
];
}

View file

@ -1,7 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [
(luajit.withPackages (ps: [
(ps.callPackage ./luarocks/scilua.nix {})
]))
];
}

View file

@ -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
]))
];
}