noe/pihole-flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flake/modules/lib: import lib in modules directly instead of passing it from the flake

Browse source
This commit is contained in:
Christopher Bacher 2022-10-29 13:39:02 +02:00
parent 428baed6cf
commit f734aea139
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -11,7 +11,6 @@
outputs = { self, nixpkgs, flake-utils, linger }: with flake-utils.lib; eachSystem (with system; [ x86_64-linux aarch64-linux ]) (curSystem: outputs = { self, nixpkgs, flake-utils, linger }: with flake-utils.lib; eachSystem (with system; [ x86_64-linux aarch64-linux ]) (curSystem:
let let
util = import ./lib/util.nix;
pkgs = nixpkgs.legacyPackages.${curSystem}; pkgs = nixpkgs.legacyPackages.${curSystem};
imageName = "pihole/pihole"; imageName = "pihole/pihole";
@ -39,7 +38,6 @@
nixosModules.default = (import ./modules/pihole-container.factory.nix) { nixosModules.default = (import ./modules/pihole-container.factory.nix) {
piholeFlake = self; piholeFlake = self;
lingerFlake = linger; lingerFlake = linger;
inherit util;
}; };
devShells.default = let devShells.default = let

4
modules/pihole-container.factory.nix
View file

@ -1,5 +1,5 @@
{ piholeFlake, lingerFlake, util }: { config, pkgs, lib, ... }: with lib; with builtins; let { piholeFlake, lingerFlake }: { config, pkgs, lib, ... }: with lib; with builtins; let
inherit (util) collectAttrFragments accessValueOfFragment toEnvValue; inherit (import ../lib/util.nix) collectAttrFragments accessValueOfFragment toEnvValue;
cfg = config.services.pihole; cfg = config.services.pihole;
hostUserCfg = config.users.users.${cfg.hostConfig.user}; hostUserCfg = config.users.users.${cfg.hostConfig.user};