From 67f1b56e82577f314047dfc0113a54f0da7965b4 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 5 Jun 2025 18:56:27 -0500
Subject: [PATCH 1/5] bert: bannergen: fix service after/wants

---
 bert/services/http/bannergen.chandlerswift.com.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bert/services/http/bannergen.chandlerswift.com.nix b/bert/services/http/bannergen.chandlerswift.com.nix
index b4e38a8..77054c6 100644
--- a/bert/services/http/bannergen.chandlerswift.com.nix
+++ b/bert/services/http/bannergen.chandlerswift.com.nix
@@ -14,7 +14,8 @@ in
 {
   systemd.services.bannergen = {
     enable = true;
-    after = [ "network.target" ];
+    after = [ "network-online.target" ];
+    wants = [ "network-online.target" ];
     wantedBy = [ "multi-user.target" ];
     serviceConfig = {
       ExecStart = "${bannergen}/bin/bannergen";

From 4ec43f72262009060c05376b6c6687ccd18fed83 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 5 Jun 2025 18:58:43 -0500
Subject: [PATCH 2/5] bert: Replace old pureserendipityweddings.com domain with
 harborpaper.com

---
 bert/services/http/harborpaperco.com.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bert/services/http/harborpaperco.com.nix b/bert/services/http/harborpaperco.com.nix
index 071f053..74d7b7f 100644
--- a/bert/services/http/harborpaperco.com.nix
+++ b/bert/services/http/harborpaperco.com.nix
@@ -12,8 +12,8 @@
       }
     '';
   };
-  services.caddy.virtualHosts."pureserendipityweddings.com" = {
-    serverAliases = ["www.pureserendipityweddings.com"];
+  services.caddy.virtualHosts."harborpaper.com" = {
+    serverAliases = ["www.harborpaper.com"];
     extraConfig = ''
       redir https://harborpaperco.com
     '';

From 71a39e5a35fc1b03bc1dc4ebcbd1f21c9fc8cf2b Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 5 Jun 2025 19:10:32 -0500
Subject: [PATCH 3/5] bert: Remove Navidrome version pin

---
 bert/services/navidrome.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bert/services/navidrome.nix b/bert/services/navidrome.nix
index 66945df..25292e8 100644
--- a/bert/services/navidrome.nix
+++ b/bert/services/navidrome.nix
@@ -1,11 +1,12 @@
 {
   services.navidrome = {
     enable = true;
-    package = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/33ab0a55ad0e3fe2b40339bdc3c46e3387a8a777.tar.gz") {}).navidrome;
     settings = {
       MusicFolder = "/mnt/bigbird_public/media/music";
       ScanSchedule = "@every 12h";
       EnableSharing = true;
     };
   };
+  systemd.services.navidrome.after = [ "mnt-bigbird_public.mount" ];
+  systemd.services.navidrome.requires = [ "mnt-bigbird_public.mount" ];
 }

From 004cc9649cccdf587a195e4683435b0f3c686b1c Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 5 Jun 2025 19:17:52 -0500
Subject: [PATCH 4/5] bert: Use upstream owntracks-recorder package

---
 bert/services/owntracks-recorder.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/bert/services/owntracks-recorder.nix b/bert/services/owntracks-recorder.nix
index ffe97b5..23f245f 100644
--- a/bert/services/owntracks-recorder.nix
+++ b/bert/services/owntracks-recorder.nix
@@ -1,15 +1,11 @@
-{pkgs, ...}:
-let # off my branch until https://github.com/NixOS/nixpkgs/pull/373934 is merged
-  package = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/7ebad821473c78c7cfdf17ecf9f9be91d2455d81.tar.gz") {}).owntracks-recorder;
-in
-{
+{pkgs, ...}: {
   systemd.services.owntracks-recorder = {
     enable = true;
     description = "owntracks-recorder Service";
     wantedBy = [ "multi-user.target" ];
     after = [ "network.target" ];
     serviceConfig = {
-      ExecStart = "${package}/bin/ot-recorder --storage /var/lib/owntracks --port 0";
+      ExecStart = "${pkgs.owntracks-recorder}/bin/ot-recorder --storage /var/lib/owntracks --port 0";
       DynamicUser = true;
       StateDirectory = "owntracks";
       StateDirectoryMode = "0775";

From 0f8ac0dadddd8309d6064bfc6a4d18558e67d1f2 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 5 Jun 2025 20:01:26 -0500
Subject: [PATCH 5/5] bert: Use upstream factorio package

---
 bert/services/factorio.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bert/services/factorio.nix b/bert/services/factorio.nix
index b6291ac..78336a5 100644
--- a/bert/services/factorio.nix
+++ b/bert/services/factorio.nix
@@ -4,9 +4,7 @@
   ];
   services.factorio = {
     enable = true;
-    package = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/aa2922b69f0245008d93e9edf9f34894db724d89.tar.gz") {
-      config.allowUnfree = true;
-    }).factorio-headless;
+    package = pkgs.factorio-headless;
     openFirewall = true;
     nonBlockingSaving = true;
     game-name = "Chandler's Factorio Server";