fixes & cleanup

modules/server/containers/builder.nix

@@ -61,7 +61,7 @@ let
     };
     in lib.recursiveUpdate base overrides;
   vmBuilder = { name, vm }: ((import "${pkgs.path}/nixos/lib/eval-config.nix" {
-      system = "x86_64-linux";
+      system = pkgs.stdenv.hostPlatform.system;
       modules = [ vm.cfg
         ({ config, lib, modulesPath, ... }: {
         imports = [

modules/shared/sops/default.nix

@@ -1,6 +1,8 @@
 { config, lib, pkgs, ... }:
 let
   isCI = builtins.elem config.syscfg.hostname [ "ci" "sandbox" ];
+  defaultUser = config.users.users.${config.syscfg.defaultUser} or { };
+  defaultGroup = if pkgs.stdenv.isDarwin then "staff" else "users";
   keyFilePath = (if isCI then
     "/var/lib/sops-nix/mock-key.txt"
   else
@@ -8,7 +10,7 @@ let
   sopsFilePath = (if isCI then ./mock.yaml else ./common.yaml);
 in {
   environment.systemPackages = with pkgs; [ sops ];
-  environment.sessionVariables.SOPS_AGE_KEY_FILE = keyFilePath;
+  environment.variables.SOPS_AGE_KEY_FILE = keyFilePath;
 
   sops.defaultSopsFile = sopsFilePath;
   sops.age.keyFile = keyFilePath;
@@ -19,8 +21,8 @@ in {
   {
     "${config.syscfg.hostname}_ssh_priv" = {
       mode = "0400";
-      owner = config.users.users.${config.syscfg.defaultUser}.name;
-      group = config.users.users.${config.syscfg.defaultUser}.group;
+      owner = defaultUser.name or config.syscfg.defaultUser;
+      group = defaultUser.group or defaultGroup;
     };
   }
   (lib.mkIf config.syscfg.net.wlp.enable {

modules/shared/syscfg/default.nix

@@ -14,6 +14,11 @@ in with lib; {
       type = types.enum [ "nixos" "macos" "home" ];
       default = "nixos";
     };
+    system = mkOption {
+      type = types.enum [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+      default = "x86_64-linux";
+      description = "Nix platform used to evaluate this host.";
+    };
     defaultUser = mkOption { type = types.str; };
     make = import ./make.nix {inherit lib;};
     net = import ./net.nix {inherit lib;};