diff --git a/flake.nix b/flake.nix index 9306191..909bdf5 100644 --- a/flake.nix +++ b/flake.nix @@ -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 ]; }; diff --git a/module.nix b/module.nix index 7b92bfa..b9fdcc4 100644 --- a/module.nix +++ b/module.nix @@ -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" ]);