mirror of
https://github.com/dwinkler1/nvimConfig.git
synced 2026-08-22 17:43:13 -04:00
Merge remote-tracking branch 'origin/refactor/quant-eco-workflow-improvements' into refactor/quant-eco-workflow-improvements
This commit is contained in:
commit
c85925b4f7
2 changed files with 7 additions and 7 deletions
|
|
@ -5,10 +5,10 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
-- Include packages from a category only if that category is enabled.
|
# Include packages from a category only if that category is enabled.
|
||||||
-- NOTE: The package list expression is still evaluated (packages in Nix are
|
# NOTE: Package list expressions are lazily evaluated, and derivations are
|
||||||
-- lazy by default, so derivations are not built), so keep side-effecting
|
# not built until needed, so keep side-effecting expressions out of these
|
||||||
-- expressions out of these lists.
|
# lists.
|
||||||
maybe = cat: pkgsList:
|
maybe = cat: pkgsList:
|
||||||
lib.optionals (config.cats.${cat} or false) pkgsList;
|
lib.optionals (config.cats.${cat} or false) pkgsList;
|
||||||
rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r;
|
rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r;
|
||||||
|
|
|
||||||
|
|
@ -189,9 +189,9 @@ in {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
-- Lazy-loaded plugins needed when the `r` cat is on. Kept separate from
|
# Lazy-loaded plugins needed when the `r` cat is on. Kept separate from
|
||||||
-- `utils-lazy` so users with `r=true` and `utils=false` still get the
|
# `utils-lazy` so users with `r=true` and `utils=false` still get the
|
||||||
-- R debugger (via vscDebugger) and in-buffer image rendering for plots.
|
# R debugger (via vscDebugger) and in-buffer image rendering for plots.
|
||||||
config.specs.r-lazy = lib.mkIf (config.cats.r or false) {
|
config.specs.r-lazy = lib.mkIf (config.cats.r or false) {
|
||||||
lazy = true;
|
lazy = true;
|
||||||
data = with pkgs.vimPlugins; [
|
data = with pkgs.vimPlugins; [
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue