Jaculabilis
/
intake
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Tim Van Baak 2023-06-20 14:26:40 -07:00
parent 7b7936cabc
commit c5778513e2
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@ -59,19 +59,13 @@
description = "A basic intake source config"; description = "A basic intake source config";
}; };
nixosModules.default = { nixosModules.default = import ./module.nix self;
options = {};
config.nixpkgs.overlays = [ self.overlays.default ];
};
nixosModules.intake = import ./module.nix;
nixosConfigurations."demo" = makeOverridable nixosSystem { nixosConfigurations."demo" = makeOverridable nixosSystem {
inherit system; inherit system;
modules = [ modules = [
nixos-shell.nixosModules.nixos-shell nixos-shell.nixosModules.nixos-shell
self.nixosModules.default self.nixosModules.default
self.nixosModules.intake
./demo ./demo
]; ];
}; };

5
module.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: flake: { config, lib, pkgs, ... }:
let let
inherit (lib) filterAttrs foldl imap1 mapAttrsToList mkEnableOption mkIf mkMerge mkOption mkPackageOption types; inherit (lib) filterAttrs foldl imap1 mapAttrsToList mkEnableOption mkIf mkMerge mkOption mkPackageOption types;
@ -68,6 +68,9 @@ in {
intakeDir = "/etc/intake"; intakeDir = "/etc/intake";
intakePwd = "${intakeDir}/htpasswd"; intakePwd = "${intakeDir}/htpasswd";
in { in {
# Apply the overlay so intake is included inpkgs.
nixpkgs.overlays = [ flake.overlays.default ];
# Define a user group for access to the htpasswd file. # Define a user group for access to the htpasswd file.
users.groups.intake.members = mkIf (enabledUsers != {}) (enabledUserNames ++ [ "nginx" ]); users.groups.intake.members = mkIf (enabledUsers != {}) (enabledUserNames ++ [ "nginx" ]);