mirror of
https://github.com/dwinkler1/nvimConfig.git
synced 2026-08-22 17:43:13 -04:00
Simplified codebase
This commit is contained in:
parent
ad9473a916
commit
74600519a5
15 changed files with 83 additions and 280 deletions
|
|
@ -4,9 +4,8 @@ let
|
|||
|
||||
rOverlay = import ./r.nix {inherit inputs;};
|
||||
rNvimNixOverlay = inputs.r-nvim-nix.overlays.default;
|
||||
franOverlay = inputs.fran.overlays.default;
|
||||
pythonOverlay = import ./python.nix inputs;
|
||||
pluginsOverlay = import ./plugins.nix inputs;
|
||||
pythonOverlay = import ./python.nix {inherit inputs;};
|
||||
pluginsOverlay = import ./plugins.nix {inherit inputs;};
|
||||
|
||||
dependencyOverlays = [
|
||||
rOverlay
|
||||
|
|
@ -15,6 +14,11 @@ let
|
|||
pluginsOverlay
|
||||
];
|
||||
dependencyOverlay = lib.composeManyExtensions dependencyOverlays;
|
||||
|
||||
# franOverlay provides R-specific tooling (radianWrapper, air-formatter).
|
||||
# It is scoped to rixpkgs (via overlays/r.nix) rather than the global
|
||||
# package set, since it only applies to R package derivations.
|
||||
franOverlay = inputs.fran.overlays.default;
|
||||
in
|
||||
{
|
||||
inherit
|
||||
|
|
@ -26,20 +30,6 @@ in
|
|||
dependencyOverlays
|
||||
dependencyOverlay;
|
||||
|
||||
# Named exports for downstream composition.
|
||||
default = dependencyOverlay;
|
||||
dependencies = dependencyOverlays;
|
||||
|
||||
overlays = {
|
||||
inherit
|
||||
rOverlay
|
||||
rNvimNixOverlay
|
||||
franOverlay
|
||||
pythonOverlay
|
||||
pluginsOverlay
|
||||
dependencyOverlays
|
||||
dependencyOverlay;
|
||||
default = dependencyOverlay;
|
||||
dependencies = dependencyOverlays;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue