move arguments from _module.args to specialArgs

Reviewed-on: Fediversity/Fediversity#475
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>

.forgejo/workflows/cd.yaml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch: # allows manual triggering
   push:
     branches:
-      # - main
+      - main
 
 jobs:
   deploy:

.forgejo/workflows/ci.yaml

@@ -27,12 +27,6 @@ jobs:
       - uses: actions/checkout@v4
       - run: nix build .#checks.x86_64-linux.test-mastodon-service -L
 
-  check-pixelfed:
-    runs-on: native
-    steps:
-      - uses: actions/checkout@v4
-      - run: nix build .#checks.x86_64-linux.test-pixelfed-garage-service -L
-
   check-peertube:
     runs-on: native
     steps:

infra/common/nixos/users.nix

@@ -1,7 +1,13 @@
+{
+  config,
+  ...
+}:
 {
   _class = "nixos";
 
   users.users = {
+    root.openssh.authorizedKeys.keys = config.users.users.procolix.openssh.authorizedKeys.keys;
+
     procolix = {
       isNormalUser = true;
       extraGroups = [ "wheel" ];

infra/flake-part.nix

@@ -23,21 +23,17 @@ let
   makeResourceModule =
     { 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 = {
-        inherit
-          inputs
-          keys
-          secrets
-          ;
-      };
-
       nixos.module.imports = [
         ./common/proxmox-qemu-vm.nix
       ];
 
       nixos.specialArgs = {
-        inherit sources;
+        inherit
+          sources
+          inputs
+          keys
+          secrets
+          ;
       };
 
       imports =
@@ -79,7 +75,13 @@ let
             # TODO(@fricklerhandwerk): we may want to pass through all of `specialArgs`
             # once we're sure it's sane. leaving it here for better control during refactoring.
             specialArgs = {
-              inherit sources;
+              inherit
+                sources
+                inputs
+                keys
+                secrets
+
+                ;
             };
           });
       };