container friendly passing of current system

This commit is contained in:
zuckerberg 2021-09-24 14:11:39 -04:00
parent b7f6576d64
commit be2828ee29
4 changed files with 33 additions and 24 deletions

View File

@ -2,7 +2,7 @@
let
cfg = config.services.radio;
radioPackage = config.inputs.radio.packages.${builtins.currentSystem}.radio;
radioPackage = config.inputs.radio.packages.${config.currentSystem}.radio;
in {
options.services.radio = {
enable = lib.mkEnableOption "enable radio";

View File

@ -33,12 +33,13 @@
./common/common.nix
inputs.simple-nixos-mailserver.nixosModule
inputs.agenix.nixosModules.age
{
({ lib, ... }: {
environment.systemPackages = [ inputs.agenix.defaultPackage.${system} ];
# because nixos specialArgs doesn't work for containers... need to pass in inputs a different way
options.inputs = lib.mkOption { default = inputs; };
}
options.currentSystem = lib.mkOption { default = system; };
})
];
# specialArgs = {};
};

View File

@ -147,16 +147,20 @@ in {
../../common/common.nix
config.inputs.agenix.nixosModules.age
];
pia.enable = true;
nixpkgs.pkgs = pkgs;
# because nixos specialArgs doesn't work for containers... need to pass in inputs a different way
options.inputs = lib.mkOption { default = config.inputs; };
options.currentSystem = lib.mkOption { default = currentSystem; };
services.drastikbot.enable = true;
services.radio = {
enable = true;
host = "radio.neet.space";
config = {
pia.enable = true;
nixpkgs.pkgs = pkgs;
services.drastikbot.enable = true;
services.radio = {
enable = true;
host = "radio.neet.space";
};
};
};
};

View File

@ -49,25 +49,29 @@
../../common/common.nix
config.inputs.agenix.nixosModules.age
];
pia.enable = true;
nixpkgs.pkgs = pkgs;
# because nixos specialArgs doesn't work for containers... need to pass in inputs a different way
options.inputs = lib.mkOption { default = config.inputs; };
options.currentSystem = lib.mkOption { default = currentSystem; };
services.radarr.enable = true;
services.radarr.openFirewall = true;
services.bazarr.enable = true;
services.bazarr.openFirewall = true;
services.sonarr.enable = true;
services.sonarr.openFirewall = true;
services.jackett.enable = true;
services.jackett.openFirewall = true;
services.jellyfin.enable = true;
services.jellyfin.openFirewall = true;
services.deluge.enable = true;
services.deluge.web.enable = true;
services.deluge.web.openFirewall = true;
config = {
pia.enable = true;
nixpkgs.pkgs = pkgs;
services.radarr.enable = true;
services.radarr.openFirewall = true;
services.bazarr.enable = true;
services.bazarr.openFirewall = true;
services.sonarr.enable = true;
services.sonarr.openFirewall = true;
services.jackett.enable = true;
services.jackett.openFirewall = true;
services.jellyfin.enable = true;
services.jellyfin.openFirewall = true;
services.deluge.enable = true;
services.deluge.web.enable = true;
services.deluge.web.openFirewall = true;
};
};
};