From 6471ef31020ffdf458b36df29a875ab238580619 Mon Sep 17 00:00:00 2001
From: Noratrieb <48135649+Noratrieb@users.noreply.github.com>
Date: Sun, 27 Jul 2025 18:21:18 +0200
Subject: [PATCH 1/3] std

---
 newinfra/nix/modules/dns/noratrieb.dev.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/newinfra/nix/modules/dns/noratrieb.dev.nix b/newinfra/nix/modules/dns/noratrieb.dev.nix
index bfb2b53..8ff312e 100644
--- a/newinfra/nix/modules/dns/noratrieb.dev.nix
+++ b/newinfra/nix/modules/dns/noratrieb.dev.nix
@@ -72,9 +72,7 @@ let
         git = vps1;
         olat = vps1;
 
-        yeet = {
-          A = [ (a "5.75.137.171") ];
-        };
+        std.CNAME = [ (cname "noratrieb.github.io.") ];
 
         # --- fun shit
         localhost.A = [ (a "127.0.0.1") ];

From 8a5b59965d6736658752e77bf93738e323723573 Mon Sep 17 00:00:00 2001
From: Noratrieb <48135649+Noratrieb@users.noreply.github.com>
Date: Sun, 27 Jul 2025 21:02:16 +0200
Subject: [PATCH 2/3] update

---
 newinfra/nix/hive.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/newinfra/nix/hive.nix b/newinfra/nix/hive.nix
index ec84717..7028528 100644
--- a/newinfra/nix/hive.nix
+++ b/newinfra/nix/hive.nix
@@ -2,7 +2,7 @@
   meta =
     let
       my-projects-versions = builtins.fromJSON (builtins.readFile ./my-projects.json);
-      nixpkgs-path = (fetchTarball "https://github.com/NixOS/nixpkgs/archive/7105ae3957700a9646cc4b766f5815b23ed0c682.tar.gz");
+      nixpkgs-path = (fetchTarball "https://github.com/NixOS/nixpkgs/archive/50ab793786d9de88ee30ec4e4c24fb4236fc2674.tar.gz"); # nixos-24.11 2025-07-27
     in
     {
       # Override to pin the Nixpkgs version (recommended). This option
@@ -10,7 +10,7 @@
       # - A path to a Nixpkgs checkout
       # - The Nixpkgs lambda (e.g., import <nixpkgs>)
       # - An initialized Nixpkgs attribute set
-      nixpkgs = import nixpkgs-path; # nixos-24.11 2025-03-21
+      nixpkgs = import nixpkgs-path;
 
       specialArgs = {
         website = import (fetchTarball "https://github.com/Noratrieb/website/archive/${my-projects-versions.website}.tar.gz");

From 2bd8830cd0827d55acc36abd261f658912f0adae Mon Sep 17 00:00:00 2001
From: Noratrieb <48135649+Noratrieb@users.noreply.github.com>
Date: Sun, 27 Jul 2025 21:19:32 +0200
Subject: [PATCH 3/3] start caddy after garage

this should eliminate the problem of caddy being down after every update
---
 newinfra/nix/hive.nix                  | 3 ++-
 newinfra/nix/modules/caddy/default.nix | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/newinfra/nix/hive.nix b/newinfra/nix/hive.nix
index 7028528..87357ef 100644
--- a/newinfra/nix/hive.nix
+++ b/newinfra/nix/hive.nix
@@ -2,7 +2,8 @@
   meta =
     let
       my-projects-versions = builtins.fromJSON (builtins.readFile ./my-projects.json);
-      nixpkgs-path = (fetchTarball "https://github.com/NixOS/nixpkgs/archive/50ab793786d9de88ee30ec4e4c24fb4236fc2674.tar.gz"); # nixos-24.11 2025-07-27
+      nixpkgs-hash = "50ab793786d9de88ee30ec4e4c24fb4236fc2674"; # nixos-24.11 2025-07-27
+      nixpkgs-path = (fetchTarball "https://github.com/NixOS/nixpkgs/archive/${nixpkgs-hash}.tar.gz");
     in
     {
       # Override to pin the Nixpkgs version (recommended). This option
diff --git a/newinfra/nix/modules/caddy/default.nix b/newinfra/nix/modules/caddy/default.nix
index 261118b..bbcb15a 100644
--- a/newinfra/nix/modules/caddy/default.nix
+++ b/newinfra/nix/modules/caddy/default.nix
@@ -30,6 +30,7 @@ in
   age.secrets.caddy_s3_key_secret.file = ../../secrets/caddy_s3_key_secret.age;
 
   systemd.services.caddy.serviceConfig.EnvironmentFile = config.age.secrets.caddy_s3_key_secret.path;
+  systemd.services.caddy.after = [ "garage.service" ]; # the cert store depends on garage
   services.caddy = {
     enable = true;
     package = caddy;