abstract out host details

- allow disabling IPv4 or v6 (both enabled by default)
- allow specifying interface (defaults to eth0)

.forgejo/workflows/ci.yaml

@@ -25,13 +25,13 @@ jobs:
     runs-on: native
     steps:
       - uses: actions/checkout@v4
-      - run: nix-build services -A tests.peertube
+      - run: cd services && nix-build -A tests.peertube
 
   check-panel:
     runs-on: native
     steps:
       - uses: actions/checkout@v4
-      - run: nix-build panel -A tests
+      - run: cd panel && nix-build -A tests
 
   check-deployment-basic:
     runs-on: native

.forgejo/workflows/update.yaml

@@ -2,9 +2,8 @@ name: update-dependencies
 
 on:
   workflow_dispatch: # allows manual triggering
-  # FIXME: re-enable when manual run works
+  schedule:
-  # schedule:
+    - cron: '0 0 1 * *' # monthly
-  #   - cron: '0 0 1 * *' # monthly
 
 jobs:
   lockfile:

default.nix

@@ -10,8 +10,6 @@ let
     gitignore
     ;
   inherit (pkgs) lib;
-  inherit (import sources.flake-inputs) import-flake;
-  inherit ((import-flake { src = ./.; }).inputs) nixops4;
   pre-commit-check =
     (import "${git-hooks}/nix" {
       inherit nixpkgs system;
@@ -58,14 +56,8 @@ in
       in
       [
         pkgs.npins
-        pkgs.nil
-        (pkgs.callPackage "${sources.agenix}/pkgs/agenix.nix" { })
-        pkgs.openssh
-        pkgs.httpie
-        pkgs.jq
         pkgs.nix-unit
         test-loop
-        nixops4.packages.${system}.default
       ];
   };
 

deployment/check/basic/flake-part.nix

@@ -2,7 +2,6 @@
   self,
   inputs,
   lib,
-  sources,
   ...
 }:
 
@@ -28,7 +27,7 @@ in
           ../common/nixosTest.nix
           ./nixosTest.nix
         ];
-        _module.args = { inherit inputs sources; };
+        _module.args.inputs = inputs;
         inherit targetMachines pathToRoot pathFromRoot;
       };
     };
@@ -45,7 +44,7 @@ in
           inputs.nixops4-nixos.modules.nixops4Resource.nixos
           ../common/targetResource.nix
         ];
-        _module.args = { inherit inputs sources; };
+        _module.args.inputs = inputs;
         inherit nodeName pathToRoot pathFromRoot;
         nixos.module =
           { pkgs, ... }:

deployment/check/cli/flake-part.nix

@@ -2,7 +2,6 @@
   self,
   inputs,
   lib,
-  sources,
   ...
 }:
 
@@ -31,7 +30,7 @@ in
           ../common/nixosTest.nix
           ./nixosTest.nix
         ];
-        _module.args = { inherit inputs sources; };
+        _module.args.inputs = inputs;
         inherit
           targetMachines
           pathToRoot
@@ -45,7 +44,7 @@ in
     let
       makeTargetResource = nodeName: {
         imports = [ ../common/targetResource.nix ];
-        _module.args = { inherit inputs sources; };
+        _module.args.inputs = inputs;
         inherit
           nodeName
           pathToRoot

deployment/check/common/deployerNode.nix

@@ -3,7 +3,6 @@
   lib,
   pkgs,
   config,
-  sources,
   ...
 }:
 
@@ -15,6 +14,8 @@ let
     types
     ;
 
+  sources = import ../../../npins;
+
 in
 {
   _class = "nixos";
@@ -77,7 +78,7 @@ in
               config.system.extraDependenciesFromModule
               {
                 nixpkgs.hostPlatform = "x86_64-linux";
-                _module.args = { inherit inputs sources; };
+                _module.args.inputs = inputs;
                 enableAcme = config.enableAcme;
                 acmeNodeIP = config.acmeNodeIP;
               }

deployment/check/common/nixosTest.nix

@@ -3,7 +3,6 @@
   lib,
   config,
   hostPkgs,
-  sources,
   ...
 }:
 
@@ -62,7 +61,7 @@ in
       {
         deployer = {
           imports = [ ./deployerNode.nix ];
-          _module.args = { inherit inputs sources; };
+          _module.args.inputs = inputs;
           enableAcme = config.enableAcme;
           acmeNodeIP = config.nodes.acme.networking.primaryIPAddress;
         };
@@ -89,7 +88,7 @@ in
 
         genAttrs config.targetMachines (_: {
           imports = [ ./targetNode.nix ];
-          _module.args = { inherit inputs sources; };
+          _module.args.inputs = inputs;
           enableAcme = config.enableAcme;
           acmeNodeIP = if config.enableAcme then config.nodes.acme.networking.primaryIPAddress else null;
         });

deployment/check/common/targetResource.nix

@@ -2,7 +2,6 @@
   inputs,
   lib,
   config,
-  sources,
   ...
 }:
 
@@ -41,7 +40,7 @@ in
         (lib.modules.importJSON (config.pathToCwd + "/${config.nodeName}-network.json"))
       ];
 
-      _module.args = { inherit inputs sources; };
+      _module.args.inputs = inputs;
       enableAcme = config.enableAcme;
       acmeNodeIP = trim (readFile (config.pathToCwd + "/acme_server_ip"));
 

deployment/check/panel/flake-part.nix

@@ -2,7 +2,6 @@
   self,
   inputs,
   lib,
-  sources,
   ...
 }:
 
@@ -34,7 +33,7 @@ in
           ../common/nixosTest.nix
           ./nixosTest.nix
         ];
-        _module.args = { inherit inputs sources; };
+        _module.args.inputs = inputs;
         inherit
           targetMachines
           pathToRoot
@@ -48,7 +47,7 @@ in
     let
       makeTargetResource = nodeName: {
         imports = [ ../common/targetResource.nix ];
-        _module.args = { inherit inputs sources; };
+        _module.args.inputs = inputs;
         inherit
           nodeName
           pathToRoot

deployment/check/panel/nixosTest.nix

@@ -155,6 +155,7 @@ in
           SECRET_KEY = dummyFile;
         };
         port = panelPort;
+        nixops4Package = inputs.nixops4.packages.${pkgs.system}.default;
 
         deployment = {
           flake = "/run/fedipanel/flake";

flake.nix

@@ -11,7 +11,7 @@
     let
       sources = import ./npins;
       inherit (import sources.flake-inputs) import-flake;
-      inherit (sources) git-hooks;
+      inherit (sources) git-hooks agenix;
       # XXX(@fricklerhandwerk): this atrocity is required to splice in a foreign Nixpkgs via flake-parts
       # XXX - this is just importing a flake
       nixpkgs = import-flake { src = sources.nixpkgs; };
@@ -31,9 +31,6 @@
           inherit nixpkgs;
         };
         self = self';
-        specialArgs = {
-          inherit sources;
-        };
       }
       (
         { inputs, ... }:
@@ -46,19 +43,18 @@
           ];
 
           imports = [
-            "${git-hooks}/flake-module.nix"
+            (import "${git-hooks}/flake-module.nix")
             inputs.nixops4.modules.flake.default
 
             ./deployment/flake-part.nix
             ./infra/flake-part.nix
-            ./keys/flake-part.nix
-            ./secrets/flake-part.nix
           ];
 
           perSystem =
             {
               pkgs,
               lib,
+              inputs',
               ...
             }:
             {
@@ -77,6 +73,21 @@
                   trim-trailing-whitespace.enable = true;
                   shellcheck.enable = true;
                 };
+
+              devShells.default = pkgs.mkShell {
+                packages = [
+                  pkgs.npins
+                  pkgs.nil
+                  (pkgs.callPackage "${agenix}/pkgs/agenix.nix" { })
+                  pkgs.openssh
+                  pkgs.httpie
+                  pkgs.jq
+                  # exposing this env var as a hack to pass info in from form
+                  (inputs'.nixops4.packages.default.overrideAttrs {
+                    impureEnvVars = [ "DEPLOYMENT" ];
+                  })
+                ];
+              };
             };
         }
       );

infra/common/nixos/default.nix

@@ -8,6 +8,7 @@ in
   _class = "nixos";
 
   imports = [
+    ./hardware.nix
     ./networking.nix
     ./users.nix
   ];

infra/common/nixos/hardware.nix

@@ -0,0 +1,86 @@
+{ config, lib, ... }:
+
+let
+  inherit (lib) mkIf mkMerge;
+
+in
+{
+  _class = "nixos";
+
+  config = mkMerge [
+    {
+      boot.loader = {
+        systemd-boot.enable = true;
+        efi.canTouchEfiVariables = true;
+      };
+    }
+
+    (mkIf config.fediversityVm.isQemuVm {
+
+      boot.initrd = {
+        availableKernelModules = [
+          "ata_piix"
+          "uhci_hcd"
+          "sd_mod"
+          "sr_mod"
+
+          # from `/profiles/qemu-guest.nix`
+          "virtio_net"
+          "virtio_pci"
+          "virtio_mmio"
+          "virtio_blk"
+          "virtio_scsi"
+          "9p"
+          "9pnet_virtio"
+        ];
+        kernelModules = [
+          "dm-snapshot"
+
+          # from `/profiles/qemu-guest.nix`
+          "virtio_balloon"
+          "virtio_console"
+          "virtio_rng"
+          "virtio_gpu"
+        ];
+      };
+
+      disko.devices.disk.main = {
+        device = "/dev/sda";
+        type = "disk";
+
+        content = {
+          type = "gpt";
+
+          partitions = {
+            MBR = {
+              priority = 0;
+              size = "1M";
+              type = "EF02";
+            };
+
+            ESP = {
+              priority = 1;
+              size = "500M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+              };
+            };
+
+            root = {
+              priority = 2;
+              size = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/";
+              };
+            };
+          };
+        };
+      };
+    })
+  ];
+}

infra/common/nixos/networking.nix

@@ -21,8 +21,13 @@ in
         ## REVIEW: Do we actually need that, considering that we have static IPs?
         useDHCP = mkDefault true;
 
-        ## Disable the default firewall and use nftables instead, with a custom
+        nameservers = [
-        ## Procolix-made ruleset.
+          "95.215.185.6"
+          "95.215.185.7"
+          "2a00:51c0::5fd7:b906"
+          "2a00:51c0::5fd7:b907"
+        ];
+
         firewall.enable = false;
         nftables = {
           enable = true;
@@ -39,10 +44,6 @@ in
           address = config.fediversityVm.ipv4.gateway;
           interface = config.fediversityVm.ipv4.interface;
         };
-        nameservers = [
-          "95.215.185.6"
-          "95.215.185.7"
-        ];
       })
 
       ## IPv6
@@ -54,10 +55,6 @@ in
           address = config.fediversityVm.ipv6.gateway;
           interface = config.fediversityVm.ipv6.interface;
         };
-        nameservers = [
-          "2a00:51c0::5fd7:b906"
-          "2a00:51c0::5fd7:b907"
-        ];
       })
     ];
   };

infra/common/options.nix

@@ -6,7 +6,7 @@ let
 
 in
 {
-  # `config` not set and imported from multiple places: no fixed module class
+  _class = "nixops4Resource";
 
   options.fediversityVm = {
 
@@ -177,5 +177,13 @@ in
         this for testing machines, as it is a security hole for so many reasons.
       '';
     };
+
+    isQemuVm = mkOption {
+      description = ''
+        Whether the machine is a QEMU VM. This will import all the necessary
+        things.
+      '';
+      default = true;
+    };
   };
 }

infra/common/proxmox-qemu-vm.nix

@@ -1,62 +0,0 @@
-{ modulesPath, ... }:
-
-{
-  _class = "nixos";
-
-  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-
-    initrd = {
-      availableKernelModules = [
-        "ata_piix"
-        "uhci_hcd"
-        "sd_mod"
-        "sr_mod"
-      ];
-      kernelModules = [ "dm-snapshot" ];
-    };
-  };
-
-  disko.devices.disk.main = {
-    device = "/dev/sda";
-    type = "disk";
-
-    content = {
-      type = "gpt";
-
-      partitions = {
-        MBR = {
-          priority = 0;
-          size = "1M";
-          type = "EF02";
-        };
-
-        ESP = {
-          priority = 1;
-          size = "500M";
-          type = "EF00";
-          content = {
-            type = "filesystem";
-            format = "vfat";
-            mountpoint = "/boot";
-          };
-        };
-
-        root = {
-          priority = 2;
-          size = "100%";
-          content = {
-            type = "filesystem";
-            format = "ext4";
-            mountpoint = "/";
-          };
-        };
-      };
-    };
-  };
-}

infra/common/resource.nix

@@ -2,9 +2,6 @@
   inputs,
   lib,
   config,
-  sources,
-  keys,
-  secrets,
   ...
 }:
 
@@ -12,6 +9,12 @@ let
   inherit (lib) attrValues elem mkDefault;
   inherit (lib.attrsets) concatMapAttrs optionalAttrs;
   inherit (lib.strings) removeSuffix;
+  sources = import ../../npins;
+  inherit (sources) agenix disko;
+
+  secretsPrefix = ../../secrets;
+  secrets = import (secretsPrefix + "/secrets.nix");
+  keys = import ../../keys;
 
 in
 {
@@ -33,8 +36,8 @@ in
   ## should go into the `./nixos` subdirectory.
   nixos.module = {
     imports = [
-      "${sources.agenix}/modules/age.nix"
+      "${agenix}/modules/age.nix"
-      "${sources.disko}/module.nix"
+      "${disko}/module.nix"
       ./options.nix
       ./nixos
     ];
@@ -43,15 +46,15 @@ in
     ## configuration.
     fediversityVm = config.fediversityVm;
 
-    ## Read all the secrets, filter the ones that are supposed to be readable with
+    ## Read all the secrets, filter the ones that are supposed to be readable
-    ## public key, and create a mapping from `<name>.file` to the absolute path of
+    ## with this host's public key, and add them correctly to the configuration
-    ## the secret's file.
+    ## as `age.secrets.<name>.file`.
     age.secrets = concatMapAttrs (
       name: secret:
       optionalAttrs (elem config.fediversityVm.hostPublicKey secret.publicKeys) ({
-        ${removeSuffix ".age" name}.file = secrets.rootPath + "/${name}";
+        ${removeSuffix ".age" name}.file = secretsPrefix + "/${name}";
       })
-    ) secrets.mapping;
+    ) secrets;
 
     ## FIXME: Remove direct root authentication once the NixOps4 NixOS provider
     ## supports users with password-less sudo.

infra/flake-part.nix

@@ -1,9 +1,6 @@
 {
   inputs,
   lib,
-  sources,
-  keys,
-  secrets,
   ...
 }:
 
@@ -16,6 +13,7 @@ let
     filterAttrs
     ;
   inherit (lib.attrsets) genAttrs;
+  sources = import ../../npins;
 
   ## Given a machine's name and whether it is a test VM, make a resource module,
   ## except for its missing provider. (Depending on the use of that resource, we
@@ -24,14 +22,7 @@ let
     { vmName, isTestVm }:
     {
       # TODO(@fricklerhandwerk): this is terrible but IMO we should just ditch flake-parts and have our own data model for how the project is organised internally
-      _module.args = {
+      _module.args = { inherit inputs; };
-        inherit
-          inputs
-          sources
-          keys
-          secrets
-          ;
-      };
 
       imports =
         [
@@ -40,12 +31,11 @@ let
         ++ (
           if isTestVm then
             [
-              ./common/proxmox-qemu-vm.nix
               ../machines/operator/${vmName}
               {
                 nixos.module.users.users.root.openssh.authorizedKeys.keys = [
                   # allow our panel vm access to the test machines
-                  keys.panel
+                  (import ../keys).panel
                 ];
               }
             ]

infra/forgejo-ci/configuration.nix

@@ -1,15 +1,10 @@
-{
+{ config, lib, ... }:
-  config,
-  lib,
-  ...
-}:
 
 let
   inherit (lib) mkDefault mkForce;
+
 in
 {
-  _class = "nixos";
-
   imports = [
     ../common/options.nix
     ../common/nixos
@@ -17,7 +12,6 @@ in
   ];
 
   fediversityVm = {
-    # XXX this needs an SSH config entry to locate and access the machine
     name = "forgejo-ci";
     domain = "procolix.com";
 
@@ -28,6 +22,10 @@ in
       gateway = "192.168.201.1";
     };
     ipv6.enable = false;
+
+    # Most Procolix machines are QEMU VMs so the options are tailored to them by
+    # default. `forgejo-ci` is not, so we need to explicitly disable them.
+    isQemuVm = false;
   };
 
   networking = {
@@ -37,6 +35,26 @@ in
 
   hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
 
+  boot = {
+    ## In an initial version, we used `mkForce` to remove QEMU VM-specific
+    ## kernel modules. This is a terrible idea as it will also remove other
+    ## kernel modules, for instance the ones added for ZFS.
+    initrd = {
+      availableKernelModules = [
+        "ahci"
+        "xhci_pci"
+        "ehci_pci"
+        "nvme"
+        "megaraid_sas"
+        "usbhid"
+        "usb_storage"
+        "sd_mod"
+      ];
+      kernelModules = [ ];
+    };
+    kernelModules = [ "kvm-intel" ];
+  };
+
   fileSystems."/" = {
     device = "rpool/root";
     fsType = "zfs";

infra/forgejo-ci/flake-part.nix

@@ -1,11 +1,4 @@
-{
+{ lib, inputs, ... }:
-  lib,
-  inputs,
-  sources,
-  keys,
-  secrets,
-  ...
-}:
 
 ## NOTE: Hackish solution mostly taken from `../common/resource.nix`.
 ## Eventually, `forgejo-ci` should move to a datacentre somewhere and this code
@@ -16,11 +9,14 @@ let
   inherit (lib.attrsets) concatMapAttrs optionalAttrs;
   inherit (lib.strings) removeSuffix;
 
+  secretsPrefix = ../../secrets;
+  secrets = import (secretsPrefix + "/secrets.nix");
+  keys = import ../../keys;
   hostPublicKey = keys.systems.forgejo-ci;
+
+  sources = import ../../npins;
 in
 {
-  _class = "flake";
-
   nixops4Deployments.forgejo-ci =
     { providers, ... }:
     {
@@ -47,7 +43,7 @@ in
           age.secrets = concatMapAttrs (
             name: secret:
             optionalAttrs (elem hostPublicKey secret.publicKeys) ({
-              ${removeSuffix ".age" name}.file = ../../secrets/${name};
+              ${removeSuffix ".age" name}.file = secretsPrefix + "/${name}";
             })
           ) secrets;
 

infra/forgejo-ci/forgejo-actions-runner.nix

@@ -1,8 +1,6 @@
 { pkgs, config, ... }:
 
 {
-  _class = "nixos";
-
   services.gitea-actions-runner = {
     package = pkgs.forgejo-actions-runner;
 
@@ -17,7 +15,6 @@
         log.level = "info";
         runner = {
           file = ".runner";
-          # Take only 1 job at a time to avoid clashing NixOS tests, see #362
           capacity = 1;
           timeout = "3h";
           insecure = false;

keys/flake-part.nix

@@ -1 +0,0 @@
-{ _module.args.keys = import ./.; }

machines/dev/fedi200/default.nix

@@ -16,10 +16,4 @@
       gateway = "2a00:51c0:13:1305::1";
     };
   };
-
-  nixos.module = {
-    imports = [
-      ../../../infra/common/proxmox-qemu-vm.nix
-    ];
-  };
 }

machines/dev/fedi201/default.nix

@@ -19,7 +19,6 @@
 
   nixos.module = {
     imports = [
-      ../../../infra/common/proxmox-qemu-vm.nix
       ./fedipanel.nix
     ];
   };

machines/dev/fedi201/fedipanel.nix

@@ -4,12 +4,14 @@
 }:
 let
   name = "panel";
+  sources = import ../../../npins;
 in
 {
   _class = "nixos";
 
   imports = [
     (import ../../../panel { }).module
+    (import "${sources.home-manager}/nixos")
   ];
 
   security.acme = {

machines/dev/vm02116/default.nix

@@ -14,7 +14,6 @@
     { lib, ... }:
     {
       imports = [
-        ../../../infra/common/proxmox-qemu-vm.nix
         ./forgejo.nix
       ];
 

machines/dev/vm02187/default.nix

@@ -14,7 +14,6 @@
     { lib, ... }:
     {
       imports = [
-        ../../../infra/common/proxmox-qemu-vm.nix
         ./wiki.nix
       ];
 

machines/machines.md

@@ -7,10 +7,10 @@ Currently, this repository keeps track of the following VMs:
 
 Machine | Proxmox | Description
 --------|---------|-------------
-[`fedi200`](./fedi200) | fediversity | Testing machine for Hans
+[`fedi200`](./dev/fedi200) | fediversity | Testing machine for Hans
-[`fedi201`](./fedi201) | fediversity | FediPanel
+[`fedi201`](./dev/fedi201) | fediversity | FediPanel
-[`vm02116`](./vm02116) | procolix | Forgejo
+[`vm02116`](./dev/vm02116) | procolix | Forgejo
-[`vm02187`](./vm02187) | procolix | Wiki
+[`vm02187`](./dev/vm02187) | procolix | Wiki
 | `forgejo-ci` | n/a (physical) | Forgejo actions runner |
 
 This table excludes all machines with names starting with `test`.

machines/machines.md.sh

@@ -32,7 +32,7 @@ for machine in $(echo "$vmOptions" | jq -r 'keys[]'); do
     description=$(echo "$vmOptions" | jq -r ".$machine.description" | head -n 1)
 
     # shellcheck disable=SC2016
-    printf '[`%s`](./%s) | %s | %s\n' "$machine" "$machine" "$proxmox" "$description"
+    printf '[`%s`](./dev/%s) | %s | %s\n' "$machine" "$machine" "$proxmox" "$description"
   fi
 done
 

npins/sources.json

@@ -96,6 +96,19 @@
       "url": "https://github.com/hercules-ci/gitignore.nix/archive/637db329424fd7e46cf4185293b9cc8c88c95394.tar.gz",
       "hash": "02wxkdpbhlm3yk5mhkhsp3kwakc16xpmsf2baw57nz1dg459qv8w"
     },
+    "home-manager": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nix-community",
+        "repo": "home-manager"
+      },
+      "branch": "master",
+      "submodules": false,
+      "revision": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
+      "url": "https://github.com/nix-community/home-manager/archive/863842639722dd12ae9e37ca83bcb61a63b36f6c.tar.gz",
+      "hash": "0rw9n8d4v87pzlmw7ws15f0sldb51fd9528skpbzmrzl4pinsgij"
+    },
     "htmx": {
       "type": "GitRelease",
       "repository": {

panel/default.nix

@@ -22,7 +22,7 @@ in
       manage
 
       # NixOps4 and its dependencies
-      pkgs.nixops4
+      # FIXME: grab NixOps4 and add it here
       pkgs.nix
       pkgs.openssh
     ];

panel/nix/configuration.nix

@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  inputs,
   ...
 }:
 let
@@ -147,7 +148,19 @@ in
         NixOps4 from the package's npins-based code, we will have to do with
         this workaround.
       '';
-      default = pkgs.nixops4;
+      default =
+        let
+          sources = import ../../npins;
+          inherit (import sources.flake-inputs) import-flake load-flake;
+          inherit
+            (import-flake {
+              src = ../../.;
+            })
+            inputs
+            ;
+          inherit (inputs) nixops4;
+        in
+        (load-flake nixops4).packages.${pkgs.system}.default;
     };
 
     deployment = {

panel/nix/overlay.nix

@@ -8,17 +8,4 @@ let
 in
 {
   python3 = prev.lib.attrsets.recursiveUpdate prev.python3 { pkgs = extraPython3Packages; };
-  nixops4 =
-    let
-      sources = import ../../npins;
-      inherit (import sources.flake-inputs) import-flake;
-      inherit
-        (import-flake {
-          src = ../../.;
-        })
-        inputs
-        ;
-      inherit (inputs) nixops4;
-    in
-    nixops4.packages.${prev.system}.default;
 }

panel/nix/tests.nix

@@ -13,6 +13,7 @@ let
       secrets = {
         SECRET_KEY = pkgs.writeText "SECRET_KEY" "secret";
       };
+      nixops4Package = pkgs.hello; # FIXME: actually pass NixOps4
     };
 
     virtualisation = {

secrets/default.nix

@@ -1,4 +0,0 @@
-{
-  mapping = import ./secrets.nix;
-  rootPath = ./.;
-}

secrets/flake-part.nix

@@ -1 +0,0 @@
-{ _module.args.secrets = import ./.; }