still go thru shell to actually load it

pull attic-client into shell as CI is missing <nixpkgs> for nix-shell
collapse caching ci test, given it seems to not carry over variables between steps
2025-07-05 00:15:43 +02:00 · 2025-07-04 23:16:33 +02:00 · 2025-07-04 21:33:44 +02:00 · 2025-07-04 19:31:34 +02:00 · 2025-07-04 19:31:34 +02:00 · 2025-07-04 19:31:34 +02:00
2 changed files with 3 additions and 5 deletions
--- a/machines/dev/forgejo-ci/default.nix
+++ b/machines/dev/forgejo-ci/default.nix
@ -48,7 +48,7 @@ in
      };

      ## NOTE: This is a physical machine, so is not covered by disko
-      fileSystems."/" = lib.mkForce {
+      fileSystems."/" = {
        device = "rpool/root";
        fsType = "zfs";
      };
@ -58,7 +58,7 @@ in
        fsType = "zfs";
      };

-      fileSystems."/boot" = lib.mkForce {
+      fileSystems."/boot" = {
        device = "/dev/disk/by-uuid/50B2-DD3F";
        fsType = "vfat";
        options = [
--- a/services/fediversity/default.nix
+++ b/services/fediversity/default.nix
@ -70,9 +70,7 @@ in
  config = {
    ## FIXME: This should clearly go somewhere else; and we should have a
    ## `staging` vs. `production` setting somewhere.
-    # use a priority higher than mkDefault for panel deployment to work,
-    # yet lower than default so this will not clash with the setting in tests.
-    security.acme = lib.modules.defaultOverridePriority {
+    security.acme = lib.mkDefault {
      acceptTerms = true;
      defaults.email = "something@fediversity.net";
      # defaults.server = "https://acme-staging-v02.api.letsencrypt.org/directory";
Author	SHA1	Message	Date
Kiara Grouwstra	e85eac9733	still go thru shell to actually load it	2025-07-05 00:15:43 +02:00
Kiara Grouwstra	1db35fabd5	pull `attic-client` into shell as CI is missing `<nixpkgs>` for `nix-shell`	2025-07-04 23:16:33 +02:00
Kiara Grouwstra	371482b08d	collapse caching ci test, given it seems to not carry over variables between steps	2025-07-04 21:33:44 +02:00
Kiara Grouwstra	6d4dc82430	test attic cache from ci	2025-07-04 19:31:34 +02:00
Kiara Grouwstra	b772a86766	allow consuming attic cache from ci runner	2025-07-04 19:31:34 +02:00
Kiara Grouwstra	63e155d5b6	enquote attic env values for use in `source attic.env`	2025-07-04 19:31:34 +02:00
Kiara Grouwstra	b9bff48bfc	add generator dependency	2025-07-04 19:31:34 +02:00
Nicolas “Niols” Jeannerod	c69f913f42	moar extraDependencies	2025-07-04 19:31:34 +02:00
Kiara Grouwstra	a783d00d49	[wip] handling env file (still fails) rm unused dep nix-templating fix imports	2025-07-04 19:31:33 +02:00
Kiara Grouwstra	8c3be9dee1	use templating fork	2025-07-04 19:31:33 +02:00
Kiara Grouwstra	b2735924c2	add tests, fix some things upgrade memory to resolve oom	2025-07-04 19:31:33 +02:00
Kiara Grouwstra	c46e48c997	move from dev to operator revert add qemu import	2025-07-04 19:31:33 +02:00
Kiara Grouwstra	61a2b2ce49	WIP: add attic cache, see #92 flesh out attic TODO keys nginx-port testing fix key fix key	2025-07-04 19:31:33 +02:00
Kiara Grouwstra	6faf848140	resolve regressions from recent qemu files - move import to match module classes - manually import sources to resolve infinite recursion	2025-07-04 19:31:33 +02:00