bert: Use upstream factorio package

bert/services/factorio.nix

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

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";

bert/services/http/harborpaperco.com.nix

@@ -12,8 +12,8 @@
       }
     '';
   };
-  services.caddy.virtualHosts."pureserendipityweddings.com" = {
+  services.caddy.virtualHosts."harborpaper.com" = {
-    serverAliases = ["www.pureserendipityweddings.com"];
+    serverAliases = ["www.harborpaper.com"];
     extraConfig = ''
       redir https://harborpaperco.com
     '';

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" ];
 }

bert/services/owntracks-recorder.nix

@@ -1,15 +1,11 @@
-{pkgs, ...}:
+{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
-{
   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";