From 0e1f14957e7b4e1aab993aa578aeaf34e24586b3 Mon Sep 17 00:00:00 2001
From: stuebinm <stuebinm@disroot.org>
Date: Wed, 4 Dec 2024 00:34:55 +0100
Subject: [PATCH] NixOS 24.11

in summary:
 - update inputs
 - copy a fix for the nopersist module from hexchen's nixfiles
   https://gitlab.com/hexchen/nixfiles/-/commit/d0b3a042ff9653cd3d39bf2427895ee310f8a661
 - remove an already-outdated override in pkgs
 - update zola's config for the docs.hacc.space website
---
 flake.lock                           | 39 +++++++++++++++++-----------
 flake.nix                            |  7 ++---
 modules/nopersist.nix                |  2 +-
 pkgs/default.nix                     |  3 ---
 websites/docs.hacc.space/config.toml |  4 +--
 5 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2fb6a8d..b05bc3a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -64,41 +64,50 @@
         "nixpkgs": [
           "nixpkgs-unstable"
         ],
-        "nixpkgs-24_05": [
-          "nixpkgs"
-        ],
-        "utils": [
-          "deploy-rs",
-          "utils"
-        ]
+        "nixpkgs-24_05": "nixpkgs-24_05"
       },
       "locked": {
-        "lastModified": 1718084203,
-        "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
+        "lastModified": 1722877200,
+        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
+        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "nixos-24.05",
+        "ref": "master",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733107608,
-        "narHash": "sha256-jdX4KeRP2J1Rj7IRWK5xZFvxr8yjw+PQnCc8n2XclVA=",
+        "lastModified": 1733220729,
+        "narHash": "sha256-BXFReJquw6GPlmeatsIKJIZNxcmy54Dg6zcwrogdlgU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c1c8d3d0b640adbb35a416e5cf8fbaf2186924d0",
+        "rev": "7247d0e9e88c3fc9769b025760db2b0b8698ccd0",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.05-small",
+        "ref": "nixos-24.11-small",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs-24_05": {
+      "locked": {
+        "lastModified": 1733016324,
+        "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-24.05",
         "type": "indirect"
       }
     },
diff --git a/flake.nix b/flake.nix
index c7f172e..b5a5e54 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,26 +2,23 @@
   description = "hacc infra stuff";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05-small";
+    nixpkgs.url = "nixpkgs/nixos-24.11-small";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable-small";
     nixpkgs-oldstable.url = "github:/NixOS/nixpkgs?rev=c4aec3c021620d98861639946123214207e98344";
 
-    nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
+    nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
     tracktrain.url = "git+https://stuebinm.eu/git/tracktrain?ref=main";
     tracktrain.flake = false;
 
     deploy-rs.url = "github:serokell/deploy-rs";
     deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
     sops-nix.url = "github:Mic92/sops-nix";
-    sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
     
     # these exist mostly to make the flake.lock somewhat more human-friendly
     # note that in theory doing this might break things, but it seems fairly unlikely
     nixos-mailserver.inputs = {
-      "nixpkgs-24_05".follows = "nixpkgs";
       nixpkgs.follows = "nixpkgs-unstable";
-      utils.follows = "/deploy-rs/utils";
       flake-compat.follows = "/deploy-rs/flake-compat";
     };
   };
diff --git a/modules/nopersist.nix b/modules/nopersist.nix
index e8308fc..44c30f8 100644
--- a/modules/nopersist.nix
+++ b/modules/nopersist.nix
@@ -7,7 +7,7 @@ with lib;
 
   users.mutableUsers = false;
 
-  boot.initrd = mkIf (config.fileSystems."/".fsType == "zfs") {
+  boot.initrd = mkIf (config.fileSystems."/".fsType or "notzfs" == "zfs") {
     network.ssh.hostKeys = mkIf config.hacc.encboot.enable
       (mkForce [ /persist/ssh/encboot_host ]);
 
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 7f34184..d08108d 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -29,9 +29,6 @@ let
     hacc-scripts = callPackage ./scripts {};
 
     inherit (oldstable) uwsgi flask;
-
-    # TODO: once on nixos 24.05, remove this inherit
-    inherit (unstable) lix;
   };
 
 in pkgs.extend(_: _: newpkgs)
diff --git a/websites/docs.hacc.space/config.toml b/websites/docs.hacc.space/config.toml
index c890821..d18353c 100644
--- a/websites/docs.hacc.space/config.toml
+++ b/websites/docs.hacc.space/config.toml
@@ -11,8 +11,8 @@ default_language = "en"
 
 # might be useful — this isn't a blog, obviously, but updates for new entries
 # could still be nice, I guess
-generate_feed = true
-feed_filename = "atom.xml"
+generate_feeds = true
+feed_filenames = [ "atom.xml" ]
 
 build_search_index = true