jump to nixpkgs 26.05

3 files changed, 18 insertions, 10 deletions

diff --git a/flora/services/akkoma.nix b/flora/services/akkoma.nix
index 6864a29..44b5528 100644
--- a/flora/services/akkoma.nix
+++ b/flora/services/akkoma.nix
@@ -203,8 +203,18 @@ in
 
       networking.firewall.allowedTCPPorts = [ 4000 ];
 
-      environment.etc."resolv.conf".text =
-        "nameserver 1.1.1.1";
+      # environment.etc."resolv.conf".text =
+      #   "nameserver 1.1.1.1";
+      #
+      # TODO: Possibly?
+      # services.coredns = {
+      #   enable = true;
+      #   config = ''
+      #   .:53 {
+      #     forward . 1.1.1.1
+      #   }
+      #   '';
+      # };
     };
   };
 
diff --git a/flora/services/blog.nix b/flora/services/blog.nix
index e77cc7c..5b4912f 100644
--- a/flora/services/blog.nix
+++ b/flora/services/blog.nix
@@ -6,7 +6,7 @@ let
     src = pkgs.fetchgit {
       url = "https://stuebinm.eu/git/forks/lux";
       rev = "refs/heads/master";
-      sha256 = "sha256-L2y5SEGOaoWl+jQGP3TmpQQLojjkRAjiRjbwhGKOg14=";
+      hash = "sha256-ooRgRhs50D6TEFVpL9QfsCUKX/R7dUoETIorJoS9FNY=";
     };
     buildInputs = [ pkgs.mdbook ];
     buildPhase = ''
@@ -27,8 +27,8 @@ let
     '';
     installPhase = ''
       mkdir -p $out
-      mv gtfs-book-html $out/gtfs
-      mv gtfs-realtime-book-html $out/gtfs-realtime
+      mv /build/gtfs-book-html $out/gtfs
+      mv /build/gtfs-realtime-book-html $out/gtfs-realtime
       cp -r ${lux.outPath} $out/lux
     '';
   };
@@ -48,5 +48,7 @@ in
       '';
     });
     locations."/bookshelf/".alias = "${gtfsBooks.outPath}/";
+
+    locations."/steno/".alias = "${pkgs.copyPathToStore ./dist}/";
   };
 }
diff --git a/flora/services/mail.nix b/flora/services/mail.nix
index 0ee8418..4705e25 100644
--- a/flora/services/mail.nix
+++ b/flora/services/mail.nix
@@ -12,15 +12,11 @@
 
     # A list of all login accounts. To create the password hashes, use
     # nix run nixpkgs.apacheHttpd -c htpasswd -nbB "" "super secret password" | cut -d: -f2
-    loginAccounts = {
+    accounts = {
         "hello@stuebinm.eu" = {
             hashedPasswordFile = "/run/secrets/mail/hashedPassword";
             aliases = ["postmaster@stuebinm.eu" "abuse@stuebinm.eu"];
         };
     };
-
-    # Use Let's Encrypt certificates. Note that this needs to set up a stripped
-    # down nginx and opens port 80.
-    certificateScheme = "acme-nginx";
   };
 }