diff --git a/flake.nix b/flake.nix index 32219644e283d3dde05b892bb79f9f3bf64e9729..289918519eca9c1f8c55a2bd7ea6296e929eef3e 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ "aarch64-linux" "armv6l-linux" "armv7l-linux" ]; - forAllSystems = f: nixpkgs.lib.genAttrs systems f; + forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system); in { overlays.default = import ./overlay; nixosModules.git-pr = import ./module; diff --git a/module/default.nix b/module/default.nix index 2c5808bafec696cfcef768449a0f6d20dca3c7dc..1dfa318820366b69d907ccefa4fc1e167ec75333 100644 --- a/module/default.nix +++ b/module/default.nix @@ -9,11 +9,15 @@ pkg = pkgs.callPackage ../pkg {inherit pkgs;}; tomlFormat = pkgs.formats.toml {}; configFile = tomlFormat.generate "git-pr-config" (lib.recursiveUpdate { { -{ + cfg = config.services.git-pr; data_dir = cfg.dataDir; { + pkg = pkgs.callPackage ../pkg {inherit pkgs;}; +{ lib, web_port = cfg.webPort; + host = cfg.host; + theme = cfg.theme; repo = builtins.map (repo: { inherit (repo) id desc;