integrate overlays
This commit is contained in:
parent
00e0fae167
commit
a603eb08a4
2 changed files with 2 additions and 7 deletions
|
@ -16,11 +16,6 @@ in
|
||||||
]
|
]
|
||||||
++ (mapModulesRec' (toString ./modules) import);
|
++ (mapModulesRec' (toString ./modules) import);
|
||||||
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
inputs.nix-minecraft.overlay
|
|
||||||
inputs.flux.overlays.default
|
|
||||||
];
|
|
||||||
|
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
|
|
||||||
environment.variables = {
|
environment.variables = {
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
sops-nix.url = "github:Mic92/sops-nix";
|
sops-nix.url = "github:Mic92/sops-nix";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, ... }:
|
outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nix-minecraft, flux, ... }:
|
||||||
let
|
let
|
||||||
inherit (lib.my) mapModules mapModulesRec mapHosts;
|
inherit (lib.my) mapModules mapModulesRec mapHosts;
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@
|
||||||
];
|
];
|
||||||
overlays = extraOverlays ++ (lib.attrValues self.overlays);
|
overlays = extraOverlays ++ (lib.attrValues self.overlays);
|
||||||
};
|
};
|
||||||
pkgs = mkPkgs nixpkgs [self.overlays.default];
|
pkgs = mkPkgs nixpkgs [self.overlays.default nix-minecraft.overlay flux.overlays.default];
|
||||||
pkgs-unstable = mkPkgs nixpkgs-unstable [];
|
pkgs-unstable = mkPkgs nixpkgs-unstable [];
|
||||||
|
|
||||||
lib = nixpkgs.lib.extend (final: prev: {
|
lib = nixpkgs.lib.extend (final: prev: {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue