add generator dependency

moar extraDependencies
[wip] handling env file (still fails)
2025-07-04 13:23:02 +02:00 · 2025-07-03 17:35:39 +02:00 · 2025-07-03 17:35:39 +02:00 · 2025-07-03 17:35:39 +02:00 · 2025-07-03 17:35:39 +02:00 · 2025-07-03 17:35:39 +02:00
3 changed files with 16 additions and 6 deletions
--- a/infra/common/proxmox-qemu-vm.nix
+++ b/infra/common/proxmox-qemu-vm.nix
@ -1,9 +1,13 @@
-{ modulesPath, ... }:
-
+let
+  # pulling this in manually over from module args resolves an infinite recursion
+  sources = import ../../npins;
+in
 {
  _class = "nixos";

-  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
+  imports = [
+    "${sources.nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
+  ];

  boot = {
    initrd = {
--- a/infra/flake-part.nix
+++ b/infra/flake-part.nix
@ -33,6 +33,10 @@ let
          ;
      };

+      nixos.module.imports = [
+        ./common/proxmox-qemu-vm.nix
+      ];
+
      imports =
        [
          ./common/resource.nix
@ -40,7 +44,6 @@ let
        ++ (
          if isTestVm then
            [
-              ./common/proxmox-qemu-vm.nix
              ../machines/operator/${vmName}
              {
                nixos.module.users.users.root.openssh.authorizedKeys.keys = [
--- a/services/fediversity/attic/default.nix
+++ b/services/fediversity/attic/default.nix
@ -111,10 +111,13 @@ in
      };

      vars.generators.attic = {
-        runtimeInputs = [ pkgs.openssl ];
+        runtimeInputs = [
+          pkgs.coreutils
+          pkgs.openssl
+        ];
        files.token.secret = true;
        script = ''
-          genrsa -traditional 4096 | base64 -w0 > "$out"/token
+          openssl genrsa -traditional 4096 | base64 -w0 > "$out"/token
        '';
      };
Author	SHA1	Message	Date
Kiara Grouwstra	0da4c76336	add generator dependency	2025-07-04 13:23:02 +02:00
Nicolas “Niols” Jeannerod	653d8b7cf8	moar extraDependencies	2025-07-03 17:35:39 +02:00
Kiara Grouwstra	f3d3c95540	[wip] handling env file (still fails) rm unused dep nix-templating fix imports	2025-07-03 17:35:39 +02:00
Kiara Grouwstra	375180748d	use templating fork	2025-07-03 17:35:39 +02:00
Kiara Grouwstra	f1dbec8e60	add tests, fix some things upgrade memory to resolve oom	2025-07-03 17:35:39 +02:00
Kiara Grouwstra	c4a8e70253	move from dev to operator revert add qemu import	2025-07-03 17:35:39 +02:00
Kiara Grouwstra	221c61955f	WIP: add attic cache, see #92 flesh out attic TODO keys nginx-port testing fix key fix key	2025-07-03 17:35:39 +02:00
Kiara Grouwstra	9eabd56ee9	resolve regressions from recent qemu files - move import to match module classes - manually import sources to resolve infinite recursion	2025-07-03 17:34:10 +02:00