diff options
| -rw-r--r-- | modules/devenv/languages/latex.nix | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/modules/devenv/languages/latex.nix b/modules/devenv/languages/latex.nix index 40dcc7a..0b1b790 100644 --- a/modules/devenv/languages/latex.nix +++ b/modules/devenv/languages/latex.nix @@ -38,9 +38,7 @@ let ${extraConfig} ''; - packages = cfg.packages cfg.base; - packagesRequireShellEscape = packages ? minted; - texlive = cfg.base.combine packages; + texlive = cfg.base.withPackages cfg.packages; in { disabledModules = [ (devenv.modules + "/languages/texlive.nix") ]; @@ -48,21 +46,13 @@ in options.languages.texlive = { enable = lib.mkEnableOption "TeX Live"; base = lib.mkOption { - default = pkgs.texlive; - description = "TeX Live package set to use"; + default = pkgs.texliveMedium; + description = "TeX Live base scheme abto use"; }; packages = lib.mkOption { - type = - with lib.types; - functionTo ( - attrsOf (submodule { - options.pkgs = lib.mkOption { - type = listOf (either package (attrsOf anything)); - }; - }) - ); - default = tl: { inherit (tl) scheme-medium; }; - description = "Packages available to TeX Live."; + type = with lib.types; functionTo (listOf package); + default = _: [ ]; + description = "Extra TexLive packages."; }; latexmk = { @@ -142,11 +132,8 @@ in } (lib.mkIf cfg.latexmk.enable { languages.texlive = { - packages = tl: { inherit (tl) latexmk; }; - latexmk = { - shellEscape.enable = lib.mkDefault packagesRequireShellEscape; - extraFlags = lib.optional cfg.latexmk.shellEscape.enable "-shell-escape"; - }; + packages = tlpkgs: with tlpkgs; [ latexmk ]; + latexmk.extraFlags = lib.optional cfg.latexmk.shellEscape.enable "-shell-escape"; }; scripts.latexmk.exec = '' |