dwinkl/nvimConfig
Watch
1
0
Fork
You've already forked nvimConfig
 0
mirror of https://github.com/dwinkler1/nvimConfig.git synced 2026-10-07 22:07:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Make settings.lang_packages append instead of replace

Browse source 
Downstream modules assign settings.lang_packages.<lang> plainly, which
out-priorities mkOptionDefault and silently dropped the built-in
defaults (e.g. lintr, breaking R linting in downstream wrappers like the
project-template ed flake).

Move the built-in defaults into a separate settings.langPackageDefaults
option and compose defaults ++ lang_packages at the consumption sites
(catPkgs r/python/julia, quarto extraRPackages, neovide R host). A new
append-semantics check fails if defaults migrate back into lang_packages.

Also fix pre-existing inverted assertions in downstream-overrides check:
the override module sets cats.r = true, so assert presence, not absence.
This commit is contained in:
Daniel Winkler 2026-08-25 11:25:05 +10:00
commit 9a6e20110e
6 changed files with 206 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

102
modules/module/settings/lang-packages.nix
View file

@ -5,53 +5,75 @@
...
}:
{
options.settings.lang_packages = lib.mkOption {
type = lib.types.submodule {
options = {
python = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [ ];
description = "Additional Python-related packages appended to the python spec (overlay defaults remain).";
};
r = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [ ];
description = "Additional R-related packages appended to the r spec (overlay defaults remain).";
};
julia = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
description = "Additional Julia packages (names) passed to julia-bin.withPackages.";
options.settings = {
# Built-in language libraries composed into every language spec.
# Consumers extend via settings.lang_packages, which is APPENDED to these.
langPackageDefaults = lib.mkOption {
type = lib.types.submodule {
options = {
python = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [ ];
};
r = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [ ];
};
julia = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
};
};
};
default = { };
};
lang_packages = lib.mkOption {
type = lib.types.submodule {
options = {
python = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [ ];
description = "Additional Python-related packages appended to the python spec (overlay defaults remain).";
};
r = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [ ];
description = "Additional R-related packages appended to the r spec (overlay defaults remain).";
};
julia = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
description = "Additional Julia packages (names) passed to julia-bin.withPackages.";
};
};
};
default = { };
description = ''
Project-specific language libraries. Appended to settings.langPackageDefaults
in each language spec's runtime packages.
'';
};
default = { };
description = ''
Language-specific package defaults and downstream overrides appended to each
language spec's runtime packages.
'';
};
config.settings.lang_packages = {
python = lib.mkDefault (with pkgs.python3Packages; [
config.settings.langPackageDefaults = {
python = with pkgs.python3Packages; [
duckdb
polars
]);
r = lib.mkDefault (
(with pkgs.rpkgs.rPackages; [
arrow
broom
data_table
janitor
styler
# vscDebugger is not on CRAN/Bioconductor, so it is not available in
# pkgs.rpkgs.rPackages. Install it manually in your R library if you
# want to use the nvim-dap R adapter (see plugin/26_dap.lua).
# vscDebugger
lintr
])
);
julia = lib.mkDefault [
];
r = with pkgs.rpkgs.rPackages; [
arrow
broom
data_table
janitor
styler
# vscDebugger is not on CRAN/Bioconductor, so it is not available in
# pkgs.rpkgs.rPackages. Install it manually in your R library if you
# want to use the nvim-dap R adapter (see plugin/26_dap.lua).
# vscDebugger
lintr
];
julia = [
"DataFramesMeta"
"QuackIO"
];