moar extraDependencies

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

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

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

-      nixos.module.imports = [
-        ./common/proxmox-qemu-vm.nix
-      ];
-
      imports =
        [
          ./common/resource.nix
@ -44,6 +40,7 @@ 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,13 +111,10 @@ in
      };

      vars.generators.attic = {
-        runtimeInputs = [
-          pkgs.coreutils
-          pkgs.openssl
-        ];
+        runtimeInputs = [ pkgs.openssl ];
        files.token.secret = true;
        script = ''
-          openssl genrsa -traditional 4096 | base64 -w0 > "$out"/token
+          genrsa -traditional 4096 | base64 -w0 > "$out"/token
        '';
      };
Author	SHA1	Message	Date
Nicolas “Niols” Jeannerod	1e51393fb8	moar extraDependencies	2025-07-03 17:07:27 +02:00
Kiara Grouwstra	099484d8f4	[wip] handling env file (still fails) rm unused dep nix-templating fix imports	2025-07-03 17:07:27 +02:00
Kiara Grouwstra	152548535e	use templating fork	2025-07-03 17:06:54 +02:00
Kiara Grouwstra	7763c4db1f	add tests, fix some things upgrade memory to resolve oom	2025-07-03 17:06:54 +02:00
Kiara Grouwstra	df35afcca1	move from dev to operator revert add qemu import	2025-07-03 17:06:04 +02:00
Kiara Grouwstra	24e1a092c4	WIP: add attic cache, see #92 flesh out attic TODO keys nginx-port testing fix key fix key	2025-07-03 17:06:04 +02:00