merge-modules accepts >1 module

This commit is contained in:
Daniel Barlow
2022-09-25 11:22:15 +01:00
parent 887a4ff966
commit c6e56b1637
5 changed files with 32 additions and 20 deletions

View File

@@ -4,15 +4,10 @@
let
overlay = import ./overlay.nix;
nixpkgs = import <nixpkgs> ( device.system // {overlays = [overlay]; });
baseConfig = {
systemPackages = [];
services = {};
kernel = device.kernel;
};
config = baseConfig // (import <liminix-config>) {
config = baseConfig;
inherit (nixpkgs) pkgs;
};
config = (import ./merge-modules.nix) [
(import ./modules/base.nix { inherit device; })
<liminix-config>
] nixpkgs.pkgs;
finalConfig = config // {
packages = (with nixpkgs.pkgs; [ s6-rc ]) ++
config.systemPackages ++