Created build module

modules/plugins/languages/tex/build/builders/custom.nix

@@ -0,0 +1,86 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkOption;
+  inherit (lib.modules) mkIf;
+  inherit
+    (lib.types)
+    bool
+    enum
+    ints
+    listOf
+    package
+    str
+    ;
+  inherit
+    (builtins)
+    attrNames
+    concatLists
+    concatStringsSep
+    elem
+    elemAt
+    filter
+    hasAttr
+    isAttrs
+    length
+    map
+    throw
+    toString
+    ;
+
+  cfg = config.vim.languages.tex;
+
+  # --- Enable Options ---
+  mkEnableDefaultOption = default: description: (mkOption {
+    type = bool;
+    default = default;
+    example = !default;
+    description = description;
+  });
+
+  collateArgs = buildConfig: buildConfig.builders.custom.args;
+in {
+  options.vim.languages.tex.build.builders.custom = {
+    enable = mkEnableDefaultOption false "Whether to enable using a custom build package";
+    package = mkOption {
+      type = package;
+      default = pkgs.tectonic;
+      description = "build/compiler package";
+    };
+    executable = mkOption {
+      type = str;
+      default = "tectonic";
+      description = "The executable name from the build package that will be used to build/compile the tex.";
+    };
+    args = mkOption {
+      type = listOf str;
+      default = [
+        "-X"
+        "compile"
+        "%f"
+        "--synctex"
+        "--keep-logs"
+        "--keep-intermediates"
+      ];
+      description = ''
+        Defines additional arguments that are passed to the configured LaTeX build tool.
+        Note that flags and their arguments need to be separate elements in this array.
+        To pass the arguments -foo bar to a build tool, args needs to be ["-foo" "bar"].
+        The placeholder `%f` will be replaced by the server.
+
+        Placeholders:
+          - `%f`: The path of the TeX file to compile.
+      '';
+    };
+  };
+
+  config = mkIf (cfg.enable && cfg.build.builders.custom.enable) {
+    vim.languages.tex.build.builder = {
+      name = "custom";
+      args = collateArgs cfg.build;
+    };
+  };
+}

modules/plugins/languages/tex/build/builders/default.nix

@@ -0,0 +1,65 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  inherit (lib.options) mkOption mkEnableOption;
+  inherit
+    (lib.types)
+    bool
+    enum
+    ints
+    listOf
+    package
+    str
+    ;
+  inherit
+    (builtins)
+    attrNames
+    concatLists
+    concatStringsSep
+    elem
+    elemAt
+    filter
+    hasAttr
+    isAttrs
+    length
+    map
+    throw
+    toString
+    ;
+
+  cfg = config.vim.languages.tex;
+in
+{
+  imports = [
+    ./custom.nix
+    ./tectonic.nix
+  ];
+
+  options.vim.languages.tex.build.builder = {
+    name = mkOption {
+      type = enum (attrNames cfg.build.builders);
+      default = "tectonic";
+      description = "The tex builder to use";
+    };
+    args = mkOption {
+      type = listOf str;
+      default = [];
+      description = "The list of args to pass to the builder";
+    };
+    package = mkOption {
+      type = package;
+      default = cfg.build.builders.tectonic.package;
+      description = "The tex builder package to use";
+    };
+    executable = mkOption {
+      type = str;
+      default = cfg.build.builders.tectonic.executable;
+      description = "The tex builder executable to use";
+    };
+  };
+}
+

modules/plugins/languages/tex/build/builders/tectonic.nix

@@ -0,0 +1,231 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.modules) mkIf;
+  inherit
+    (lib.types)
+    bool
+    enum
+    ints
+    listOf
+    package
+    str
+    ;
+  inherit
+    (builtins)
+    attrNames
+    concatLists
+    concatStringsSep
+    elem
+    elemAt
+    filter
+    hasAttr
+    isAttrs
+    length
+    map
+    throw
+    toString
+    ;
+
+  cfg = config.vim.languages.tex;
+
+  # --- Enable Options ---
+  mkEnableDefaultOption = default: description: (mkOption {
+    type = bool;
+    default = default;
+    example = !default;
+    description = description;
+  });
+  mkEnableLspOption = mkEnableDefaultOption config.vim.languages.enableLSP;
+
+  # --- Arg Collation Functions --
+  collateArgs = buildConfig: let
+    selfConfig = buildConfig.builders.tectonic;
+  in (
+    # Base args
+    [
+      "-X"
+      "compile"
+      "%f"
+    ]
+    # Flags
+    ++ (
+      if selfConfig.keepIntermediates
+      then ["--keep-intermediates"]
+      else []
+    )
+    ++ (
+      if selfConfig.keepLogs
+      then ["--keep-logs"]
+      else []
+    )
+    ++ (
+      if selfConfig.onlyCached
+      then ["--only-cached"]
+      else []
+    )
+    ++ (
+      if selfConfig.synctex
+      then ["--synctex"]
+      else []
+    )
+    ++ (
+      if selfConfig.untrustedInput
+      then ["--untrusted"]
+      else []
+    )
+    # Options
+    ++ (
+      if selfConfig.reruns > 0
+      then ["--reruns" "${toString selfConfig.reruns}"]
+      else []
+    )
+    ++ (
+      if selfConfig.bundle != ""
+      then ["--bundle" "${toString selfConfig.bundle}"]
+      else []
+    )
+    ++ (
+      if selfConfig.webBundle != ""
+      then ["--web-bundle" "${toString selfConfig.webBundle}"]
+      else []
+    )
+    ++ (
+      if selfConfig.outfmt != ""
+      then ["--outfmt" "${toString selfConfig.outfmt}"]
+      else []
+    )
+    ++ (concatLists (map (x: ["--hide" x]) selfConfig.hidePaths))
+    ++ (
+      if selfConfig.format != ""
+      then ["--format" "${toString selfConfig.format}"]
+      else []
+    )
+    ++ (
+      if selfConfig.color != ""
+      then ["--color" "${toString selfConfig.color}"]
+      else []
+    )
+    # Still options but these are not defined by builder specific options but
+    # instead synchronize options between the global build options and builder
+    # specific options
+    ++ (
+      if !(elem buildConfig.pdfDirectory ["." ""])
+      then ["--outdir" "${buildConfig.pdfDirectory}"]
+      else []
+    )
+  );
+in {
+  options.vim.languages.tex.build.builders.tectonic = {
+    enable = mkEnableOption "Whether to enable Tex Compilation Via Tectonic";
+
+    package = mkOption {
+      type = package;
+      default = pkgs.tectonic;
+      description = "tectonic package";
+    };
+
+    executable = mkOption {
+      type = str;
+      default = "tectonic";
+      description = "The executable name from the build package that will be used to build/compile the tex.";
+    };
+
+    # -- Flags --
+    keepIntermediates = mkEnableDefaultOption false ''
+      Keep the intermediate files generated during processing.
+
+      If texlab is reporting build errors when there shouldn't be, disable this option.
+    '';
+    keepLogs = mkEnableDefaultOption true ''
+      Keep the log files generated during processing.
+
+      Without the keepLogs flag, texlab won't be able to report compilation warnings.
+    '';
+    onlyCached = mkEnableDefaultOption false "Use only resource files cached locally";
+    synctex = mkEnableDefaultOption true "Generate SyncTeX data";
+    untrustedInput = mkEnableDefaultOption false "Input is untrusted -- disable all known-insecure features";
+
+    # -- Options --
+    reruns = mkOption {
+      type = ints.unsigned;
+      default = 0;
+      example = 2;
+      description = "Rerun the TeX engine exactly this many times after the first";
+    };
+
+    bundle = mkOption {
+      type = str;
+      default = "";
+      description = "Use this directory or Zip-format bundle file to find resource files instead of the default";
+    };
+
+    webBundle = mkOption {
+      type = str;
+      default = "";
+      description = "Use this URL to find resource files instead of the default";
+    };
+
+    outfmt = mkOption {
+      type = enum [
+        "pdf"
+        "html"
+        "xdv"
+        "aux"
+        "fmt"
+        ""
+      ];
+      default = "";
+      description = "The kind of output to generate";
+    };
+
+    hidePaths = mkOption {
+      type = listOf str;
+      default = [];
+      example = [
+        "./secrets.tex"
+        "./passwords.tex"
+      ];
+      description = "Tell the engine that no file at <hide_path> exists, if it tries to read it.";
+    };
+
+    format = mkOption {
+      type = str;
+      default = "";
+      description = "The name of the \"format\" file used to initialize the TeX engine";
+    };
+
+    color = mkOption {
+      type = enum [
+        "always"
+        "auto"
+        "never"
+        ""
+      ];
+      default = "";
+      example = "always";
+      description = "Enable/disable colorful log output";
+    };
+
+    extraOptions = {
+      type = listOf str;
+      default = [];
+      description = ''
+        Add extra command line options to include in the tectonic build command.
+        Extra options added here will not overwrite the options set in as nvf options.
+      '';
+    };
+  };
+
+  config = mkIf (cfg.enable && cfg.build.builders.tectonic.enable) {
+    vim.languages.tex.build.builder = {
+      name = "tectonic";
+      args = collateArgs cfg.build;
+      package = cfg.build.builders.tectonic.package;
+    };
+  };
+}

modules/plugins/languages/tex/build/default.nix

@@ -0,0 +1,107 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkOption;
+  inherit (lib.modules) mkIf;
+  inherit
+    (lib.types)
+    bool
+    enum
+    ints
+    listOf
+    package
+    str
+    ;
+  inherit
+    (builtins)
+    attrNames
+    concatLists
+    concatStringsSep
+    elem
+    elemAt
+    filter
+    hasAttr
+    isAttrs
+    length
+    map
+    throw
+    toString
+    ;
+
+  cfg = config.vim.languages.tex;
+
+  # --- Enable Options ---
+  mkEnableDefaultOption = default: description: (mkOption {
+    type = bool;
+    default = default;
+    example = !default;
+    description = description;
+  });
+  mkEnableLspOption = mkEnableDefaultOption config.vim.languages.enableLSP;
+in {
+  imports = [
+    ./builders
+  ];
+
+  options.vim.languages.tex.build = {
+    forwardSearchAfter = mkOption {
+      type = bool;
+      default = false;
+      description = "Set this property to true if you want to execute a forward search after a build.";
+    };
+    onSave = mkOption {
+      type = bool;
+      default = false;
+      description = "Set this property to true if you want to compile the project after saving a file.";
+    };
+    useFileList = mkOption {
+      type = bool;
+      default = false;
+      description = ''
+        When set to true, the server will use the .fls files produced by the TeX engine as an additional input for the project detection.
+
+        Note that enabling this property might have an impact on performance.
+      '';
+    };
+    auxDirectory = mkOption {
+      type = str;
+      default = ".";
+      description = ''
+        When not using latexmk, provides a way to define the directory containing the .aux files.
+        Note that you need to set the aux directory in latex.build.args too.
+
+        When using a latexmkrc file, texlab will automatically infer the correct setting.
+      '';
+    };
+    logDirectory = mkOption {
+      type = str;
+      default = ".";
+      description = ''
+        When not using latexmk, provides a way to define the directory containing the build log files.
+        Note that you need to change the output directory in your build arguments too.
+
+        When using a latexmkrc file, texlab will automatically infer the correct setting.
+      '';
+    };
+    pdfDirectory = mkOption {
+      type = str;
+      default = ".";
+      description = ''
+        When not using latexmk, provides a way to define the directory containing the output files.
+        Note that you need to set the output directory in latex.build.args too.
+
+        When using a latexmkrc file, texlab will automatically infer the correct setting.
+      '';
+    };
+    filename = mkOption {
+      type = str;
+      default = "";
+      description = ''
+        Allows overriding the default file name of the build artifact. This setting is used to find the correct PDF file to open during forward search.
+      '';
+    };
+  };
+}

modules/plugins/languages/tex/default.nix

@@ -12,6 +12,7 @@ in {
   imports = [
     ./treesitter.nix
     ./lsp
+    ./build
   ];
 
   options.vim.languages.tex = {

modules/plugins/languages/tex/lsp/texlab.nix

@@ -56,85 +56,85 @@
   mkEnableLspOption = mkEnableDefaultOption config.vim.languages.enableLSP;
 
   # --- Arg Collation Functions --
-  collateArgs.lsp.texlab.build = {
+  # collateArgs.lsp.texlab.build = {
-    tectonic = buildConfig: let
+  #   tectonic = buildConfig: let
-      selfConfig = buildConfig.tectonic;
+  #     selfConfig = buildConfig.tectonic;
-    in (
+  #   in (
-      # Base args
+  #     # Base args
-      [
+  #     [
-        "-X"
+  #       "-X"
-        "compile"
+  #       "compile"
-        "%f"
+  #       "%f"
-      ]
+  #     ]
-      # Flags
+  #     # Flags
-      ++ (
+  #     ++ (
-        if selfConfig.keepIntermediates
+  #       if selfConfig.keepIntermediates
-        then ["--keep-intermediates"]
+  #       then ["--keep-intermediates"]
-        else []
+  #       else []
-      )
+  #     )
-      ++ (
+  #     ++ (
-        if selfConfig.keepLogs
+  #       if selfConfig.keepLogs
-        then ["--keep-logs"]
+  #       then ["--keep-logs"]
-        else []
+  #       else []
-      )
+  #     )
-      ++ (
+  #     ++ (
-        if selfConfig.onlyCached
+  #       if selfConfig.onlyCached
-        then ["--only-cached"]
+  #       then ["--only-cached"]
-        else []
+  #       else []
-      )
+  #     )
-      ++ (
+  #     ++ (
-        if selfConfig.synctex
+  #       if selfConfig.synctex
-        then ["--synctex"]
+  #       then ["--synctex"]
-        else []
+  #       else []
-      )
+  #     )
-      ++ (
+  #     ++ (
-        if selfConfig.untrustedInput
+  #       if selfConfig.untrustedInput
-        then ["--untrusted"]
+  #       then ["--untrusted"]
-        else []
+  #       else []
-      )
+  #     )
-      # Options
+  #     # Options
-      ++ (
+  #     ++ (
-        if selfConfig.reruns > 0
+  #       if selfConfig.reruns > 0
-        then ["--reruns" "${toString selfConfig.reruns}"]
+  #       then ["--reruns" "${toString selfConfig.reruns}"]
-        else []
+  #       else []
-      )
+  #     )
-      ++ (
+  #     ++ (
-        if selfConfig.bundle != ""
+  #       if selfConfig.bundle != ""
-        then ["--bundle" "${toString selfConfig.bundle}"]
+  #       then ["--bundle" "${toString selfConfig.bundle}"]
-        else []
+  #       else []
-      )
+  #     )
-      ++ (
+  #     ++ (
-        if selfConfig.webBundle != ""
+  #       if selfConfig.webBundle != ""
-        then ["--web-bundle" "${toString selfConfig.webBundle}"]
+  #       then ["--web-bundle" "${toString selfConfig.webBundle}"]
-        else []
+  #       else []
-      )
+  #     )
-      ++ (
+  #     ++ (
-        if selfConfig.outfmt != ""
+  #       if selfConfig.outfmt != ""
-        then ["--outfmt" "${toString selfConfig.outfmt}"]
+  #       then ["--outfmt" "${toString selfConfig.outfmt}"]
-        else []
+  #       else []
-      )
+  #     )
-      ++ (concatLists (map (x: ["--hide" x]) selfConfig.hidePaths))
+  #     ++ (concatLists (map (x: ["--hide" x]) selfConfig.hidePaths))
-      ++ (
+  #     ++ (
-        if selfConfig.format != ""
+  #       if selfConfig.format != ""
-        then ["--format" "${toString selfConfig.format}"]
+  #       then ["--format" "${toString selfConfig.format}"]
-        else []
+  #       else []
-      )
+  #     )
-      ++ (
+  #     ++ (
-        if selfConfig.color != ""
+  #       if selfConfig.color != ""
-        then ["--color" "${toString selfConfig.color}"]
+  #       then ["--color" "${toString selfConfig.color}"]
-        else []
+  #       else []
-      )
+  #     )
-      # Still options but these are not defined by builder specific options but
+  #     # Still options but these are not defined by builder specific options but
-      # instead synchronize options between the global build options and builder
+  #     # instead synchronize options between the global build options and builder
-      # specific options
+  #     # specific options
-      ++ (
+  #     ++ (
-        if !(elem buildConfig.pdfDirectory ["." ""])
+  #       if !(elem buildConfig.pdfDirectory ["." ""])
-        then ["--outdir" "${buildConfig.pdfDirectory}"]
+  #       then ["--outdir" "${buildConfig.pdfDirectory}"]
-        else []
+  #       else []
-      )
+  #     )
-    );
+  #   );
-    custom = buildConfig: buildConfig.custom.args;
+  #   custom = buildConfig: buildConfig.custom.args; # Moved
-  };
+  # };
 in {
   options.vim.languages.tex.lsp.texlab = {
     enable = mkEnableLspOption "Whether to enable Tex LSP support (texlab)";
@@ -145,199 +145,200 @@ in {
       description = "texlab package";
     };
 
-    build = {
+    # build = {
-      tectonic = {
+      # tectonic = {
-        enable = mkEnableDefaultOption true "Whether to enable Tex Compilation Via Tectonic";
+      #   enable = mkEnableDefaultOption true "Whether to enable Tex Compilation Via Tectonic";
+      #
+      #   package = mkOption {
+      #     type = package;
+      #     default = pkgs.tectonic;
+      #     description = "tectonic package";
+      #   };
+      #
+      #   executable = mkOption {
+      #     type = str;
+      #     default = "tectonic";
+      #     description = "The executable name from the build package that will be used to build/compile the tex.";
+      #   };
+      #
+      #   # -- Flags --
+      #   keepIntermediates = mkEnableDefaultOption false ''
+      #     Keep the intermediate files generated during processing.
+      #
+      #     If texlab is reporting build errors when there shouldn't be, disable this option.
+      #   '';
+      #   keepLogs = mkEnableDefaultOption true ''
+      #     Keep the log files generated during processing.
+      #
+      #     Without the keepLogs flag, texlab won't be able to report compilation warnings.
+      #   '';
+      #   onlyCached = mkEnableDefaultOption false "Use only resource files cached locally";
+      #   synctex = mkEnableDefaultOption true "Generate SyncTeX data";
+      #   untrustedInput = mkEnableDefaultOption false "Input is untrusted -- disable all known-insecure features";
+      #
+      #   # -- Options --
+      #   reruns = mkOption {
+      #     type = ints.unsigned;
+      #     default = 0;
+      #     example = 2;
+      #     description = "Rerun the TeX engine exactly this many times after the first";
+      #   };
+      #
+      #   bundle = mkOption {
+      #     type = str;
+      #     default = "";
+      #     description = "Use this directory or Zip-format bundle file to find resource files instead of the default";
+      #   };
+      #
+      #   webBundle = mkOption {
+      #     type = str;
+      #     default = "";
+      #     description = "Use this URL to find resource files instead of the default";
+      #   };
+      #
+      #   outfmt = mkOption {
+      #     type = enum [
+      #       "pdf"
+      #       "html"
+      #       "xdv"
+      #       "aux"
+      #       "fmt"
+      #       ""
+      #     ];
+      #     default = "";
+      #     description = "The kind of output to generate";
+      #   };
+      #
+      #   hidePaths = mkOption {
+      #     type = listOf str;
+      #     default = [];
+      #     example = [
+      #       "./secrets.tex"
+      #       "./passwords.tex"
+      #     ];
+      #     description = "Tell the engine that no file at <hide_path> exists, if it tries to read it.";
+      #   };
+      #
+      #   format = mkOption {
+      #     type = str;
+      #     default = "";
+      #     description = "The name of the \"format\" file used to initialize the TeX engine";
+      #   };
+      #
+      #   color = mkOption {
+      #     type = enum [
+      #       "always"
+      #       "auto"
+      #       "never"
+      #       ""
+      #     ];
+      #     default = "";
+      #     example = "always";
+      #     description = "Enable/disable colorful log output";
+      #   };
+      #
+      #   extraOptions = {
+      #     type = listOf str;
+      #     default = [];
+      #     description = ''
+      #       Add extra command line options to include in the tectonic build command.
+      #       Extra options added here will not overwrite the options set in as nvf options.
+      #     '';
+      #   };
+      # };
 
-        package = mkOption {
+      # # Moved
-          type = package;
+      # custom = {
-          default = pkgs.tectonic;
+      #   enable = mkEnableDefaultOption false "Whether to enable using a custom build package";
-          description = "tectonic package";
+      #   package = mkOption {
-        };
+      #     type = package;
+      #     default = pkgs.tectonic;
+      #     description = "build/compiler package";
+      #   };
+      #   executable = mkOption {
+      #     type = str;
+      #     default = "tectonic";
+      #     description = "The executable name from the build package that will be used to build/compile the tex.";
+      #   };
+      #   args = mkOption {
+      #     type = listOf str;
+      #     default = [
+      #       "-X"
+      #       "compile"
+      #       "%f"
+      #       "--synctex"
+      #       "--keep-logs"
+      #       "--keep-intermediates"
+      #     ];
+      #     description = ''
+      #       Defines additional arguments that are passed to the configured LaTeX build tool.
+      #       Note that flags and their arguments need to be separate elements in this array.
+      #       To pass the arguments -foo bar to a build tool, args needs to be ["-foo" "bar"].
+      #       The placeholder `%f` will be replaced by the server.
+      #
+      #       Placeholders:
+      #         - `%f`: The path of the TeX file to compile.
+      #     '';
+      #   };
+      # };
 
-        executable = mkOption {
+      # forwardSearchAfter = mkOption {
-          type = str;
+      #   type = bool;
-          default = "tectonic";
+      #   default = false;
-          description = "The executable name from the build package that will be used to build/compile the tex.";
+      #   description = "Set this property to true if you want to execute a forward search after a build.";
-        };
+      # };
-
+      # onSave = mkOption {
-        # -- Flags --
+      #   type = bool;
-        keepIntermediates = mkEnableDefaultOption false ''
+      #   default = false;
-          Keep the intermediate files generated during processing.
+      #   description = "Set this property to true if you want to compile the project after saving a file.";
-
+      # };
-          If texlab is reporting build errors when there shouldn't be, disable this option.
+      # useFileList = mkOption {
-        '';
+      #   type = bool;
-        keepLogs = mkEnableDefaultOption true ''
+      #   default = false;
-          Keep the log files generated during processing.
+      #   description = ''
-
+      #     When set to true, the server will use the .fls files produced by the TeX engine as an additional input for the project detection.
-          Without the keepLogs flag, texlab won't be able to report compilation warnings.
+      #
-        '';
+      #     Note that enabling this property might have an impact on performance.
-        onlyCached = mkEnableDefaultOption false "Use only resource files cached locally";
+      #   '';
-        synctex = mkEnableDefaultOption true "Generate SyncTeX data";
+      # };
-        untrustedInput = mkEnableDefaultOption false "Input is untrusted -- disable all known-insecure features";
+      # auxDirectory = mkOption {
-
+      #   type = str;
-        # -- Options --
+      #   default = ".";
-        reruns = mkOption {
+      #   description = ''
-          type = ints.unsigned;
+      #     When not using latexmk, provides a way to define the directory containing the .aux files.
-          default = 0;
+      #     Note that you need to set the aux directory in latex.build.args too.
-          example = 2;
+      #
-          description = "Rerun the TeX engine exactly this many times after the first";
+      #     When using a latexmkrc file, texlab will automatically infer the correct setting.
-        };
+      #   '';
-
+      # };
-        bundle = mkOption {
+      # logDirectory = mkOption {
-          type = str;
+      #   type = str;
-          default = "";
+      #   default = ".";
-          description = "Use this directory or Zip-format bundle file to find resource files instead of the default";
+      #   description = ''
-        };
+      #     When not using latexmk, provides a way to define the directory containing the build log files.
-
+      #     Note that you need to change the output directory in your build arguments too.
-        webBundle = mkOption {
+      #
-          type = str;
+      #     When using a latexmkrc file, texlab will automatically infer the correct setting.
-          default = "";
+      #   '';
-          description = "Use this URL to find resource files instead of the default";
+      # };
-        };
+      # pdfDirectory = mkOption {
-
+      #   type = str;
-        outfmt = mkOption {
+      #   default = ".";
-          type = enum [
+      #   description = ''
-            "pdf"
+      #     When not using latexmk, provides a way to define the directory containing the output files.
-            "html"
+      #     Note that you need to set the output directory in latex.build.args too.
-            "xdv"
+      #
-            "aux"
+      #     When using a latexmkrc file, texlab will automatically infer the correct setting.
-            "fmt"
+      #   '';
-            ""
+      # };
-          ];
+      # filename = mkOption {
-          default = "";
+      #   type = str;
-          description = "The kind of output to generate";
+      #   default = "";
-        };
+      #   description = ''
-
+      #     Allows overriding the default file name of the build artifact. This setting is used to find the correct PDF file to open during forward search.
-        hidePaths = mkOption {
+      #   '';
-          type = listOf str;
+      # };
-          default = [];
+    # };
-          example = [
-            "./secrets.tex"
-            "./passwords.tex"
-          ];
-          description = "Tell the engine that no file at <hide_path> exists, if it tries to read it.";
-        };
-
-        format = mkOption {
-          type = str;
-          default = "";
-          description = "The name of the \"format\" file used to initialize the TeX engine";
-        };
-
-        color = mkOption {
-          type = enum [
-            "always"
-            "auto"
-            "never"
-            ""
-          ];
-          default = "";
-          example = "always";
-          description = "Enable/disable colorful log output";
-        };
-
-        extraOptions = {
-          type = listOf str;
-          default = [];
-          description = ''
-            Add extra command line options to include in the tectonic build command.
-            Extra options added here will not overwrite the options set in as nvf options.
-          '';
-        };
-      };
-
-      custom = {
-        enable = mkEnableDefaultOption false "Whether to enable using a custom build package";
-        package = mkOption {
-          type = package;
-          default = pkgs.tectonic;
-          description = "build/compiler package";
-        };
-        executable = mkOption {
-          type = str;
-          default = "tectonic";
-          description = "The executable name from the build package that will be used to build/compile the tex.";
-        };
-        args = mkOption {
-          type = listOf str;
-          default = [
-            "-X"
-            "compile"
-            "%f"
-            "--synctex"
-            "--keep-logs"
-            "--keep-intermediates"
-          ];
-          description = ''
-            Defines additional arguments that are passed to the configured LaTeX build tool.
-            Note that flags and their arguments need to be separate elements in this array.
-            To pass the arguments -foo bar to a build tool, args needs to be ["-foo" "bar"].
-            The placeholder `%f` will be replaced by the server.
-
-            Placeholders:
-              - `%f`: The path of the TeX file to compile.
-          '';
-        };
-      };
-
-      forwardSearchAfter = mkOption {
-        type = bool;
-        default = false;
-        description = "Set this property to true if you want to execute a forward search after a build.";
-      };
-      onSave = mkOption {
-        type = bool;
-        default = false;
-        description = "Set this property to true if you want to compile the project after saving a file.";
-      };
-      useFileList = mkOption {
-        type = bool;
-        default = false;
-        description = ''
-          When set to true, the server will use the .fls files produced by the TeX engine as an additional input for the project detection.
-
-          Note that enabling this property might have an impact on performance.
-        '';
-      };
-      auxDirectory = mkOption {
-        type = str;
-        default = ".";
-        description = ''
-          When not using latexmk, provides a way to define the directory containing the .aux files.
-          Note that you need to set the aux directory in latex.build.args too.
-
-          When using a latexmkrc file, texlab will automatically infer the correct setting.
-        '';
-      };
-      logDirectory = mkOption {
-        type = str;
-        default = ".";
-        description = ''
-          When not using latexmk, provides a way to define the directory containing the build log files.
-          Note that you need to change the output directory in your build arguments too.
-
-          When using a latexmkrc file, texlab will automatically infer the correct setting.
-        '';
-      };
-      pdfDirectory = mkOption {
-        type = str;
-        default = ".";
-        description = ''
-          When not using latexmk, provides a way to define the directory containing the output files.
-          Note that you need to set the output directory in latex.build.args too.
-
-          When using a latexmkrc file, texlab will automatically infer the correct setting.
-        '';
-      };
-      filename = mkOption {
-        type = str;
-        default = "";
-        description = ''
-          Allows overriding the default file name of the build artifact. This setting is used to find the correct PDF file to open during forward search.
-        '';
-      };
-    };
 
     forwardSearch = {
       enable = mkOption {
@@ -416,7 +417,7 @@ in {
   config = mkIf (cfg.enable && (cfg.lsp.texlab.enable)) (
     let
       tl = cfg.lsp.texlab;
-      build = tl.build;
+      builder = cfg.build.builder;
 
       listToLua = list: nullOnEmpty:
         if length list == 0
@@ -443,60 +444,87 @@ in {
       buildConfig = let
         # This function will sort through the builder options of ...texlab.build and count how many
         # builders have been enabled and get the attrs of the last enabled builder.
-        getBuilder = {
+        # getBuilder = {
+        #   enabledBuildersCount ? 0,
+        #   enabledBuilderName ? "",
+        #   index ? 0,
+        #   builderNamesList ? (
+        #     filter (
+        #       x: let
+        #         y = cfg.build.builders.${x};
+        #       in (isAttrs y && hasAttr "enable" y)
+        #     ) (attrNames cfg.build.builders)
+        #   ),
+        # }: let
+        #   currentBuilderName = elemAt builderNamesList index;
+        #   currentBuilder = tl.build.${currentBuilderName};
+        #   nextIndex = index + 1;
+        #   currentState = {
+        #     enabledBuildersCount =
+        #       if currentBuilder.enable
+        #       then enabledBuildersCount + 1
+        #       else enabledBuildersCount;
+        #     enabledBuilderName =
+        #       if currentBuilder.enable
+        #       then currentBuilderName
+        #       else enabledBuilderName;
+        #   };
+        # in
+        #   if length builderNamesList > nextIndex
+        #   then
+        #     getBuilder ({
+        #         inherit builderNamesList;
+        #         index = nextIndex;
+        #       }
+        #       // currentState)
+        #   else currentState;
+        getEnabledBuildersCount = {
           enabledBuildersCount ? 0,
-          enabledBuilderName ? "",
           index ? 0,
           builderNamesList ? (
             filter (
               x: let
-                y = tl.build.${x};
+                y = cfg.build.builders.${x};
               in (isAttrs y && hasAttr "enable" y)
-            ) (attrNames tl.build)
+            ) (attrNames cfg.build.builders)
           ),
         }: let
           currentBuilderName = elemAt builderNamesList index;
-          currentBuilder = tl.build.${currentBuilderName};
+          currentBuilder = cfg.build.builders.${currentBuilderName};
           nextIndex = index + 1;
-          currentState = {
+          newEnabledBuildersCount =
-            enabledBuildersCount =
             if currentBuilder.enable
             then enabledBuildersCount + 1
             else enabledBuildersCount;
-            enabledBuilderName =
-              if currentBuilder.enable
-              then currentBuilderName
-              else enabledBuilderName;
-          };
         in
           if length builderNamesList > nextIndex
           then
-            getBuilder ({
+            getEnabledBuildersCount {
                 inherit builderNamesList;
+                enabledBuildersCount = newEnabledBuildersCount;
                 index = nextIndex;
               }
-              // currentState)
+          else newEnabledBuildersCount;
-          else currentState;
 
-        getBuilderResults = getBuilder {};
+        enabledBuildersCount = getEnabledBuildersCount {};
-        builder = tl.build.${getBuilderResults.enabledBuilderName};
+        # builder = tl.build.${getBuilderResults.enabledBuilderName};
-        builderArgs = collateArgs.lsp.texlab.build.${getBuilderResults.enabledBuilderName} tl.build;
+        # builderArgs = collateArgs.lsp.texlab.build.${getBuilderResults.enabledBuilderName} tl.build;
       in
-        if getBuilderResults.enabledBuildersCount == 0
+        if enabledBuildersCount == 0
         then ""
-        else if getBuilderResults.enabledBuildersCount > 1
+        else if enabledBuildersCount > 1
         then throw "Texlab does not support having more than 1 builders enabled!"
         else ''
           build = {
                   executable = "${builder.package}/bin/${builder.executable}",
-                  args = ${listToLua builderArgs false},
+                  args = ${listToLua builder.args false},
-                  forwardSearchAfter = ${boolToLua build.forwardSearchAfter},
+                  forwardSearchAfter = ${boolToLua cfg.build.forwardSearchAfter},
-                  onSave = ${boolToLua build.onSave},
+                  onSave = ${boolToLua cfg.build.onSave},
-                  useFileList = ${boolToLua build.useFileList},
+                  useFileList = ${boolToLua cfg.build.useFileList},
-                  auxDirectory = ${stringToLua build.auxDirectory true},
+                  auxDirectory = ${stringToLua cfg.build.auxDirectory true},
-                  logDirectory = ${stringToLua build.logDirectory true},
+                  logDirectory = ${stringToLua cfg.build.logDirectory true},
-                  pdfDirectory = ${stringToLua build.pdfDirectory true},
+                  pdfDirectory = ${stringToLua cfg.build.pdfDirectory true},
-                  filename = ${stringToLua build.filename true},
+                  filename = ${stringToLua cfg.build.filename true},
                 },
         '';
     in {