Pass flake into module again
There doesn't seem to be a better way at present to get the overlay to the module
This commit is contained in:
parent
7b7936cabc
commit
c5778513e2
|
@ -59,19 +59,13 @@
|
|||
description = "A basic intake source config";
|
||||
};
|
||||
|
||||
nixosModules.default = {
|
||||
options = {};
|
||||
config.nixpkgs.overlays = [ self.overlays.default ];
|
||||
};
|
||||
|
||||
nixosModules.intake = import ./module.nix;
|
||||
nixosModules.default = import ./module.nix self;
|
||||
|
||||
nixosConfigurations."demo" = makeOverridable nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
nixos-shell.nixosModules.nixos-shell
|
||||
self.nixosModules.default
|
||||
self.nixosModules.intake
|
||||
./demo
|
||||
];
|
||||
};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
flake: { config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) filterAttrs foldl imap1 mapAttrsToList mkEnableOption mkIf mkMerge mkOption mkPackageOption types;
|
||||
|
@ -68,6 +68,9 @@ in {
|
|||
intakeDir = "/etc/intake";
|
||||
intakePwd = "${intakeDir}/htpasswd";
|
||||
in {
|
||||
# Apply the overlay so intake is included inpkgs.
|
||||
nixpkgs.overlays = [ flake.overlays.default ];
|
||||
|
||||
# Define a user group for access to the htpasswd file.
|
||||
users.groups.intake.members = mkIf (enabledUsers != {}) (enabledUserNames ++ [ "nginx" ]);
|
||||
|
||||
|
|
Loading…
Reference in New Issue