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