From be2828ee2971754896aea433baabdd764790c2bc Mon Sep 17 00:00:00 2001
From: zuckerberg <5-zuckerberg@users.noreply.git.neet.dev>
Date: Fri, 24 Sep 2021 14:11:39 -0400
Subject: [PATCH] container friendly passing of current system

---
 common/server/radio.nix          |  2 +-
 flake.nix                        |  5 +++--
 machines/liza/configuration.nix  | 16 +++++++++------
 machines/mitty/configuration.nix | 34 ++++++++++++++++++--------------
 4 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/common/server/radio.nix b/common/server/radio.nix
index c2a5586..38ccb81 100644
--- a/common/server/radio.nix
+++ b/common/server/radio.nix
@@ -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";
diff --git a/flake.nix b/flake.nix
index 4f5ad00..9ad291b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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 = {};
         };
diff --git a/machines/liza/configuration.nix b/machines/liza/configuration.nix
index 9a5e381..eac25fa 100644
--- a/machines/liza/configuration.nix
+++ b/machines/liza/configuration.nix
@@ -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";
+        };
       };
     };
   };
diff --git a/machines/mitty/configuration.nix b/machines/mitty/configuration.nix
index 23ef50a..4fa301f 100644
--- a/machines/mitty/configuration.nix
+++ b/machines/mitty/configuration.nix
@@ -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;
+      };
     };
   };