bump: Update to NixOS 24.11

configuration/default.nix

@@ -35,13 +35,11 @@
     (final: prev: {
       local = import ../pkgs {
         pkgs = prev;
-        lib = prev.lib;
       };
     })
   ];
 
   nix = {
-    package = pkgs.nixFlakes;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';

configuration/hardware-specific/hetzner/default.nix

@@ -19,13 +19,11 @@
     addresses = [
       # IPv4
       {
-        addressConfig = {
+        Address = "116.202.158.55/32";
-          Address = "116.202.158.55/32";
+        Peer = "116.202.158.1/32"; # Gateway
-          Peer = "116.202.158.1/32"; # Gateway
-        };
       }
       # IPv6
-      { addressConfig.Address = "2a01:4f8:10b:3c85::2/64"; }
+      { Address = "2a01:4f8:10b:3c85::2/64"; }
     ];
 
     networkConfig = {

configuration/services/metrics/options.nix

@@ -213,7 +213,15 @@ in
       let
         allExporters = lib.mapAttrs (name: exporter: { inherit (exporter) listenAddress port; }) (
           (lib.filterAttrs (
-            _: exporter: builtins.isAttrs exporter && exporter.enable
+            name: exporter:
+            # A bunch of deprecated exporters that need to be ignored
+            !(builtins.elem name [
+              "minio"
+              "tor"
+              "unifi-poller"
+            ])
+            && builtins.isAttrs exporter
+            && exporter.enable
           ) config.services.prometheus.exporters)
           // config.services.prometheus.extraExporters
         );

configuration/services/nextcloud.nix

@@ -18,10 +18,10 @@ in
         packageOverrides = final: prev: {
           extensions = prev.extensions // {
             pgsql = prev.extensions.pgsql.overrideAttrs (old: {
-              configureFlags = [ "--with-pgsql=${config.services.postgresql.package}" ];
+              configureFlags = [ "--with-pgsql=${lib.getDev config.services.postgresql.package}" ];
             });
             pdo_pgsql = prev.extensions.pdo_pgsql.overrideAttrs (old: {
-              configureFlags = [ "--with-pdo-pgsql=${config.services.postgresql.package}" ];
+              configureFlags = [ "--with-pdo-pgsql=${lib.getDev config.services.postgresql.package}" ];
             });
           };
         };
@@ -51,7 +51,7 @@ in
     };
 
     extraApps = {
-      inherit (pkgs.local)
+      inherit (config.services.nextcloud.package.packages.apps)
         bookmarks
         calendar
         contacts

configuration/services/wireguard.nix

@@ -24,12 +24,10 @@
         };
 
         wireguardPeers = [
+          # yui
           {
-            # yui
+            AllowedIPs = [ "10.45.249.2/32" ];
-            wireguardPeerConfig = {
+            PublicKey = "5mlnqEVJWks5OqgeFA2bLIrvST9TlCE81Btl+j4myz0=";
-              AllowedIPs = [ "10.45.249.2/32" ];
-              PublicKey = "5mlnqEVJWks5OqgeFA2bLIrvST9TlCE81Btl+j4myz0=";
-            };
           }
         ];
       };
@@ -40,23 +38,23 @@
         matchConfig.Name = "wg0";
 
         networkConfig = {
+          Description = "VLAN";
+
           Address = [
             "10.45.249.1/32"
             # TODO(tlater): Add IPv6 whenever that becomes relevant
           ];
 
-          IPForward = "yes";
+          IPv4Forwarding = "yes";
           IPv4ProxyARP = "yes";
         };
 
         routes = [
           {
-            routeConfig = {
+            Source = "10.45.249.0/24";
-              Source = "10.45.249.0/24";
+            Destination = "10.45.249.0/24";
-              Destination = "10.45.249.0/24";
+            Gateway = "10.45.249.1";
-              Gateway = "10.45.249.1";
+            GatewayOnLink = "no";
-              GatewayOnLink = "no";
-            };
           }
         ];
 

flake.lock

@@ -47,11 +47,11 @@
         "pyproject-nix": "pyproject-nix"
       },
       "locked": {
-        "lastModified": 1719685993,
+        "lastModified": 1735160684,
-        "narHash": "sha256-04gy1icwnGO3ZXF6r96yBm/C0PNPzeLxA/8xzzq0dBI=",
+        "narHash": "sha256-n5CwhmqKxifuD4Sq4WuRP/h5LO6f23cGnSAuJemnd/4=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "1b5e01219a32324c8f6889fe1f4db933ec7932f6",
+        "rev": "8ce6284ff58208ed8961681276f82c2f8f978ef4",
         "type": "github"
       },
       "original": {
@@ -69,11 +69,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1719815435,
+        "lastModified": 1737181903,
-        "narHash": "sha256-K2xFp142onP35jcx7li10xUxNVEVRWjAdY8DSuR7Naw=",
+        "narHash": "sha256-lvp77MhGzSN+ICd0MugppCjQR6cmlM2iAC5cjy2ZsaA=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "ebfe2c639111d7e82972a12711206afaeeda2450",
+        "rev": "ac79bb490b8c1af4bbc587b84c76f9527d6b14f7",
         "type": "github"
       },
       "original": {
@@ -114,6 +114,22 @@
         "type": "github"
       }
     },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems_2"
@@ -242,11 +258,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1719468428,
+        "lastModified": 1729850857,
-        "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
+        "narHash": "sha256-WvLXzNNnnw+qpFOmgaM3JUlNEH+T4s22b5i2oyyCpXE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
+        "rev": "41dea55321e5a999b17033296ac05fe8a8b5a257",
         "type": "github"
       },
       "original": {
@@ -305,6 +321,7 @@
     },
     "purescript-overlay": {
       "inputs": {
+        "flake-compat": "flake-compat_3",
         "nixpkgs": [
           "tlaternet-webserver",
           "dream2nix",
@@ -313,11 +330,11 @@
         "slimlock": "slimlock"
       },
       "locked": {
-        "lastModified": 1696022621,
+        "lastModified": 1728546539,
-        "narHash": "sha256-eMjFmsj2G1E0Q5XiibUNgFjTiSz0GxIeSSzzVdoN730=",
+        "narHash": "sha256-Sws7w0tlnjD+Bjck1nv29NjC5DbL6nH5auL9Ex9Iz2A=",
         "owner": "thomashoneyman",
         "repo": "purescript-overlay",
-        "rev": "047c7933abd6da8aa239904422e22d190ce55ead",
+        "rev": "4ad4c15d07bd899d7346b331f377606631eb0ee4",
         "type": "github"
       },
       "original": {
@@ -359,11 +376,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1719760370,
+        "lastModified": 1737140097,
-        "narHash": "sha256-fsxAuW6RxKZYjAP3biUC6C4vaYFhDfWv8lp1Tmx3ZCY=",
+        "narHash": "sha256-m4SN8DeKzsP10EQFS7+2zgGfCrMhTfTt1H0QRNesD08=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "ea7fdada6a0940b239ddbde2048a4d7dac1efe1e",
+        "rev": "f61bfa4d7feb84d07538d361fe77d34a29e3b375",
         "type": "github"
       },
       "original": {
@@ -383,11 +400,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688610262,
+        "lastModified": 1688756706,
-        "narHash": "sha256-Wg0ViDotFWGWqKIQzyYCgayeH8s4U1OZcTiWTQYdAp4=",
+        "narHash": "sha256-xzkkMv3neJJJ89zo3o2ojp7nFeaZc2G0fYwNXNJRFlo=",
         "owner": "thomashoneyman",
         "repo": "slimlock",
-        "rev": "b5c6cdcaf636ebbebd0a1f32520929394493f1a6",
+        "rev": "cf72723f59e2340d24881fd7bf61cb113b4c407c",
         "type": "github"
       },
       "original": {
@@ -505,11 +522,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719851829,
+        "lastModified": 1737271785,
-        "narHash": "sha256-M5miiIbiwP4uArTyeIr/RKA857rP14AEJUe11AZsKAc=",
+        "narHash": "sha256-yVdaaawYK1/q9V5btfGpxVCQBdyQx1WcFHYO0yX5bP8=",
         "ref": "refs/heads/master",
-        "rev": "4a099f27a27f4107ceb14969e2158eaabebcf1d4",
+        "rev": "5d3d84836101ec9b9867a5f754c9ee1b9d4dc538",
-        "revCount": 74,
+        "revCount": 76,
         "type": "git",
         "url": "https://gitea.tlater.net/tlaternet/tlaternet.git"
       },

flake.nix

@@ -2,7 +2,7 @@
   description = "tlater.net host configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05-small";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11-small";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
     disko = {
       url = "github:nix-community/disko";
@@ -132,18 +132,6 @@
               ${nvfetcher-bin} -o _sources_pkgs -c nvfetcher.toml
             '').outPath;
         };
-
-        update-nextcloud-apps = {
-          type = "app";
-          program =
-            let
-              nvfetcher-bin = "${nvfetcher.packages.${system}.default}/bin/nvfetcher";
-            in
-            (pkgs.writeShellScript "update-nextcloud-apps" ''
-              cd "$(git rev-parse --show-toplevel)/pkgs"
-              ${nvfetcher-bin} -o _sources_nextcloud -c nextcloud-apps.toml
-            '').outPath;
-        };
       };
 
       ###########################

pkgs/_sources_nextcloud/generated.json

@@ -1,86 +0,0 @@
-{
-    "bookmarks": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "bookmarks",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "sha256": "sha256-7BTNFsNcqmDACpj5PMEiS71xtr50v7Sqo3qeCL+3J9s=",
-            "type": "tarball",
-            "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.6/bookmarks-14.2.6.tar.gz"
-        },
-        "version": "14.2.6"
-    },
-    "calendar": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "calendar",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "sha256": "sha256-X2XcH7HpxgizCEJVrazGtzNQTBihFxvTq/ybK939cxo=",
-            "type": "tarball",
-            "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.16/calendar-v4.7.16.tar.gz"
-        },
-        "version": "v4.7.16"
-    },
-    "contacts": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "contacts",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "sha256": "sha256-HCEjiAqn6sTNXKW6O5X6Ta9Ll4ehvzmGZUj1c0ue2Xc=",
-            "type": "tarball",
-            "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.3/contacts-v5.5.3.tar.gz"
-        },
-        "version": "v5.5.3"
-    },
-    "cookbook": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "cookbook",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "sha256": "sha256-Pfa+Xbopg20os+pnGgg+wpEX1MI5fz5JMb0K4a8rBhs=",
-            "type": "tarball",
-            "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/Cookbook-0.11.2.tar.gz"
-        },
-        "version": "0.11.2"
-    },
-    "news": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "news",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "sha256": "sha256-pnvyMZQ+NYMgH0Unfh5S19HdZSjnghgoUDAoi2KIXNI=",
-            "type": "tarball",
-            "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz"
-        },
-        "version": "25.0.0-alpha12"
-    },
-    "notes": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "notes",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "sha256": "sha256-Cu73H0hJREbkskLbj56M8qUF1Tp4EazORlCF9rpPL90=",
-            "type": "tarball",
-            "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz"
-        },
-        "version": "v4.11.0"
-    }
-}

pkgs/_sources_nextcloud/generated.nix

@@ -1,52 +0,0 @@
-# This file was generated by nvfetcher, please do not modify it manually.
-{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
-{
-  bookmarks = {
-    pname = "bookmarks";
-    version = "14.2.6";
-    src = fetchTarball {
-      url = "https://github.com/nextcloud/bookmarks/releases/download/v14.2.6/bookmarks-14.2.6.tar.gz";
-      sha256 = "sha256-7BTNFsNcqmDACpj5PMEiS71xtr50v7Sqo3qeCL+3J9s=";
-    };
-  };
-  calendar = {
-    pname = "calendar";
-    version = "v4.7.16";
-    src = fetchTarball {
-      url = "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.16/calendar-v4.7.16.tar.gz";
-      sha256 = "sha256-X2XcH7HpxgizCEJVrazGtzNQTBihFxvTq/ybK939cxo=";
-    };
-  };
-  contacts = {
-    pname = "contacts";
-    version = "v5.5.3";
-    src = fetchTarball {
-      url = "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.3/contacts-v5.5.3.tar.gz";
-      sha256 = "sha256-HCEjiAqn6sTNXKW6O5X6Ta9Ll4ehvzmGZUj1c0ue2Xc=";
-    };
-  };
-  cookbook = {
-    pname = "cookbook";
-    version = "0.11.2";
-    src = fetchTarball {
-      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/Cookbook-0.11.2.tar.gz";
-      sha256 = "sha256-Pfa+Xbopg20os+pnGgg+wpEX1MI5fz5JMb0K4a8rBhs=";
-    };
-  };
-  news = {
-    pname = "news";
-    version = "25.0.0-alpha12";
-    src = fetchTarball {
-      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz";
-      sha256 = "sha256-pnvyMZQ+NYMgH0Unfh5S19HdZSjnghgoUDAoi2KIXNI=";
-    };
-  };
-  notes = {
-    pname = "notes";
-    version = "v4.11.0";
-    src = fetchTarball {
-      url = "https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz";
-      sha256 = "sha256-Cu73H0hJREbkskLbj56M8qUF1Tp4EazORlCF9rpPL90=";
-    };
-  };
-}

pkgs/default.nix

@@ -1,6 +1,5 @@
-{ pkgs, lib }:
+{ pkgs }:
 let
-  inherit (builtins) fromJSON mapAttrs readFile;
   inherit (pkgs) callPackage;
 in
 {
@@ -9,11 +8,3 @@ in
     sources = pkgs.callPackage ./_sources_pkgs/generated.nix { };
   };
 }
-// (
-  # Add nextcloud apps
-  let
-    mkNextcloudApp = pkgs.callPackage ./mkNextcloudApp.nix { };
-    sources = fromJSON (readFile ./_sources_nextcloud/generated.json);
-  in
-  mapAttrs (_: source: mkNextcloudApp source) sources
-)

pkgs/mkNextcloudApp.nix

@@ -1,7 +0,0 @@
-{ fetchNextcloudApp, lib }:
-source:
-fetchNextcloudApp {
-  url = source.src.url;
-  sha256 = source.src.sha256;
-  license = "unlicense"; # Blatant lie
-}

pkgs/nextcloud-apps.toml

@@ -1,30 +0,0 @@
-[bookmarks]
-# src.github = "nextcloud/bookmarks"
-# src.prefix = "v"
-src.manual = "14.2.6"
-fetch.tarball = "https://github.com/nextcloud/bookmarks/releases/download/v$ver/bookmarks-$ver.tar.gz"
-
-[calendar]
-# src.github = "nextcloud-releases/calendar"
-src.manual = "v4.7.16"
-fetch.tarball = "https://github.com/nextcloud-releases/calendar/releases/download/$ver/calendar-$ver.tar.gz"
-
-[contacts]
-# src.github = "nextcloud-releases/contacts"
-src.manual = "v5.5.3"
-fetch.tarball = "https://github.com/nextcloud-releases/contacts/releases/download/$ver/contacts-$ver.tar.gz"
-
-[cookbook]
-src.github = "christianlupus-nextcloud/cookbook-releases"
-src.prefix = "v"
-fetch.tarball = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v$ver/Cookbook-$ver.tar.gz"
-
-[news]
-# Update manually until angular rewrite is done
-# src.github = "nextcloud/news"
-src.manual = "25.0.0-alpha12"
-fetch.tarball = "https://github.com/nextcloud/news/releases/download/$ver/news.tar.gz"
-
-[notes]
-src.github = "nextcloud-releases/notes"
-fetch.tarball = "https://github.com/nextcloud-releases/notes/releases/download/$ver/notes-$ver.tar.gz"