.git-blame-ignore-revs

@@ -1,9 +1,6 @@
 # Run this command to always ignore formatting commits in `git blame`
 # git config blame.ignoreRevsFile .git-blame-ignore-revs
 
-# Switch to nixfmt formatting
-04f7a7ef1d38906163afc9cddfa8ce2b0ebf3b45
-
 # Switch to nixpkgs-fmt formatting
 fd138d45e6a2cad89fead6e9f246ba282070d6b7
 

configuration/default.nix

@@ -1,12 +1,10 @@
-{
+{ config
-  config,
+, pkgs
-  pkgs,
+, lib
-  lib,
+, modulesPath
-  modulesPath,
+, flake-inputs
-  flake-inputs,
+, ...
-  ...
+}: {
-}:
-{
   imports = [
     flake-inputs.disko.nixosModules.disko
     flake-inputs.sops-nix.nixosModules.sops
@@ -26,7 +24,7 @@
     ./services/nextcloud.nix
     ./services/webserver.nix
     ./services/wireguard.nix
-    # ./services/starbound.nix -- Not currently used
+    ./services/starbound.nix
     ./services/postgres.nix
     ./nginx.nix
     ./sops.nix
@@ -51,12 +49,12 @@
     settings.trusted-users = [ "@wheel" ];
   };
 
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [ "steam-original" "steam-runtime" "steam-run" "steamcmd" ];
+
   # Optimization for minecraft servers, see:
   # https://bugs.mojang.com/browse/MC-183518
-  boot.kernelParams = [
+  boot.kernelParams = [ "highres=off" "nohz=off" ];
-    "highres=off"
-    "nohz=off"
-  ];
 
   networking = {
     usePredictableInterfaceNames = false;

configuration/hardware-specific/hetzner/default.nix

@@ -25,7 +25,9 @@
         };
       }
       # IPv6
-      { addressConfig.Address = "2a01:4f8:10b:3c85::2/64"; }
+      {
+        addressConfig.Address = "2a01:4f8:10b:3c85::2/64";
+      }
     ];
 
     networkConfig = {

configuration/hardware-specific/hetzner/disko.nix

@@ -19,10 +19,7 @@
         };
       };
 
-      mountOptions = [
+      mountOptions = [ "compress=zstd" "noatime" ];
-        "compress=zstd"
-        "noatime"
-      ];
     in
     {
       sda = {
@@ -57,15 +54,7 @@
                 type = "btrfs";
                 # Hack to get multi-device btrfs going
                 # See https://github.com/nix-community/disko/issues/99
-                extraArgs = [
+                extraArgs = [ "-d" "raid1" "-m" "raid1" "--runtime-features" "quota" "/dev/sda3" ];
-                  "-d"
-                  "raid1"
-                  "-m"
-                  "raid1"
-                  "--runtime-features"
-                  "quota"
-                  "/dev/sda3"
-                ];
                 subvolumes = {
                   "/volume" = { };
                   "/volume/root" = {

configuration/hardware-specific/vm.nix

@@ -1,5 +1,4 @@
-{ lib, ... }:
+{ lib, ... }: {
-{
   users.users.tlater.password = "insecure";
 
   # Disable graphical tty so -curses works

configuration/nginx.nix

@@ -1,5 +1,7 @@
-{ config, lib, ... }:
+{ config
-{
+, lib
+, ...
+}: {
   services.nginx = {
     enable = true;
     recommendedTlsSettings = true;
@@ -24,23 +26,26 @@
       # Override the default, just keep fewer logs
       nginx.rotate = 6;
     }
-    // lib.mapAttrs' (
+    // lib.mapAttrs'
-      virtualHost: _:
+      (virtualHost: _:
-      lib.nameValuePair "/var/log/nginx/${virtualHost}/access.log" {
+        lib.nameValuePair "/var/log/nginx/${virtualHost}/access.log" {
-        frequency = "daily";
+          frequency = "daily";
-        rotate = 2;
+          rotate = 2;
-        compress = true;
+          compress = true;
-        delaycompress = true;
+          delaycompress = true;
-        su = "${config.services.nginx.user} ${config.services.nginx.group}";
+          su = "${config.services.nginx.user} ${config.services.nginx.group}";
-        postrotate = "[ ! -f /var/run/nginx/nginx.pid ] || kill -USR1 `cat /var/run/nginx/nginx.pid`";
+          postrotate = "[ ! -f /var/run/nginx/nginx.pid ] || kill -USR1 `cat /var/run/nginx/nginx.pid`";
-      }
+        })
-    ) config.services.nginx.virtualHosts;
+      config.services.nginx.virtualHosts;
 
-  systemd.tmpfiles.rules = lib.mapAttrsToList (
+  systemd.tmpfiles.rules =
-    virtualHost: _:
+    lib.mapAttrsToList
-    #
+      (
-    "d /var/log/nginx/${virtualHost} 0750 ${config.services.nginx.user} ${config.services.nginx.group}"
+        virtualHost: _:
-  ) config.services.nginx.virtualHosts;
+          #
+          "d /var/log/nginx/${virtualHost} 0750 ${config.services.nginx.user} ${config.services.nginx.group}"
+      )
+      config.services.nginx.virtualHosts;
 
   security.acme = {
     defaults.email = "tm@tlater.net";
@@ -56,8 +61,8 @@
 
   services.backups.acme = {
     user = "acme";
-    paths = lib.mapAttrsToList (
+    paths =
-      virtualHost: _: "/var/lib/acme/${virtualHost}"
+      lib.mapAttrsToList (virtualHost: _: "/var/lib/acme/${virtualHost}")
-    ) config.services.nginx.virtualHosts;
+        config.services.nginx.virtualHosts;
   };
 }

configuration/services/afvalcalendar.nix

@@ -1,5 +1,7 @@
-{ pkgs, config, ... }:
+{ pkgs
-{
+, config
+, ...
+}: {
   systemd.services.afvalcalendar = {
     description = "Enschede afvalcalendar -> ical converter";
     wantedBy = [ "multi-user.target" ];
@@ -23,23 +25,16 @@
       ProtectKernelModules = true;
       ProtectKernelLogs = true;
       ProtectControlGroups = true;
-      RestrictAddressFamilies = [
+      RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
-        "AF_UNIX"
-        "AF_INET"
-        "AF_INET6"
-      ];
       RestrictNamespaces = true;
       LockPersonality = true;
       MemoryDenyWriteExecute = true;
       RestrictRealtime = true;
       RestrictSUIDSGID = true;
       SystemCallArchitectures = "native";
-      SystemCallFilter = [
+      SystemCallFilter = [ "@system-service" "~@privileged @resources @setuid @keyring" ];
-        "@system-service"
-        "~@privileged @resources @setuid @keyring"
-      ];
 
-      Umask = 2;
+      Umask = 0002;
       SupplementaryGroups = "afvalcalendar-hosting";
 
       ReadWritePaths = "/srv/afvalcalendar";

configuration/services/backups.nix

@@ -1,35 +1,29 @@
-{
+{ config
-  config,
+, pkgs
-  pkgs,
+, lib
-  lib,
+, ...
-  ...
 }:
 let
   inherit (lib) types optional singleton;
-  mkShutdownScript =
+  mkShutdownScript = service:
-    service:
     pkgs.writeShellScript "backup-${service}-shutdown" ''
       if systemctl is-active --quiet '${service}'; then
         touch '/tmp/${service}-was-active'
         systemctl stop '${service}'
       fi
     '';
-  mkRestartScript =
+  mkRestartScript = service:
-    service:
     pkgs.writeShellScript "backup-${service}-restart" ''
       if [ -f '/tmp/${service}-was-active' ]; then
         rm '/tmp/${service}-was-active'
         systemctl start '${service}'
       fi
     '';
-  writeScript =
+  writeScript = name: packages: text:
-    name: packages: text:
+    lib.getExe (pkgs.writeShellApplication {
-    lib.getExe (
+      inherit name text;
-      pkgs.writeShellApplication {
+      runtimeInputs = packages;
-        inherit name text;
+    });
-        runtimeInputs = packages;
-      }
-    );
 
   # *NOT* a TOML file, for some reason quotes are interpreted
   # *literally
@@ -55,87 +49,85 @@ in
       description = lib.mdDoc ''
         Configure restic backups with a specific tag.
       '';
-      type = types.attrsOf (
+      type = types.attrsOf (types.submodule ({ config
-        types.submodule (
+                                             , name
-          { config, name, ... }:
+                                             , ...
-          {
+                                             }: {
-            options = {
+        options = {
-              user = lib.mkOption {
+          user = lib.mkOption {
-                type = types.str;
+            type = types.str;
-                description = ''
+            description = ''
-                  The user as which to run the backup.
+              The user as which to run the backup.
-                '';
+            '';
-              };
+          };
-              paths = lib.mkOption {
+          paths = lib.mkOption {
-                type = types.listOf types.str;
+            type = types.listOf types.str;
-                description = ''
+            description = ''
-                  The paths to back up.
+              The paths to back up.
-                '';
+            '';
-              };
+          };
-              tag = lib.mkOption {
+          tag = lib.mkOption {
-                type = types.str;
+            type = types.str;
-                description = ''
+            description = ''
-                  The restic tag to mark the backup with.
+              The restic tag to mark the backup with.
-                '';
+            '';
-                default = name;
+            default = name;
-              };
+          };
-              preparation = {
+          preparation = {
-                packages = lib.mkOption {
+            packages = lib.mkOption {
-                  type = types.listOf types.package;
+              type = types.listOf types.package;
-                  default = [ ];
+              default = [ ];
-                  description = ''
+              description = ''
-                    The list of packages to make available in the
+                The list of packages to make available in the
-                    preparation script.
+                preparation script.
-                  '';
+              '';
-                };
-                text = lib.mkOption {
-                  type = types.nullOr types.str;
-                  default = null;
-                  description = ''
-                    The preparation script to run before the backup.
-
-                    This should include things like database dumps and
-                    enabling maintenance modes. If a service needs to be
-                    shut down for backups, use `pauseServices` instead.
-                  '';
-                };
-              };
-              cleanup = {
-                packages = lib.mkOption {
-                  type = types.listOf types.package;
-                  default = [ ];
-                  description = ''
-                    The list of packages to make available in the
-                    cleanup script.
-                  '';
-                };
-                text = lib.mkOption {
-                  type = types.nullOr types.str;
-                  default = null;
-                  description = ''
-                    The cleanup script to run after the backup.
-
-                    This should do things like cleaning up database dumps
-                    and disabling maintenance modes.
-                  '';
-                };
-              };
-              pauseServices = lib.mkOption {
-                type = types.listOf types.str;
-                default = [ ];
-                description = ''
-                  The systemd services that need to be shut down before
-                  the backup can run. Services will be restarted after the
-                  backup is complete.
-
-                  This is intended to be used for services that do not
-                  support hot backups.
-                '';
-              };
             };
-          }
+            text = lib.mkOption {
-        )
+              type = types.nullOr types.str;
-      );
+              default = null;
+              description = ''
+                The preparation script to run before the backup.
+
+                This should include things like database dumps and
+                enabling maintenance modes. If a service needs to be
+                shut down for backups, use `pauseServices` instead.
+              '';
+            };
+          };
+          cleanup = {
+            packages = lib.mkOption {
+              type = types.listOf types.package;
+              default = [ ];
+              description = ''
+                The list of packages to make available in the
+                cleanup script.
+              '';
+            };
+            text = lib.mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                The cleanup script to run after the backup.
+
+                This should do things like cleaning up database dumps
+                and disabling maintenance modes.
+              '';
+            };
+          };
+          pauseServices = lib.mkOption {
+            type = types.listOf types.str;
+            default = [ ];
+            description = ''
+              The systemd services that need to be shut down before
+              the backup can run. Services will be restarted after the
+              backup is complete.
+
+              This is intended to be used for services that do not
+              support hot backups.
+            '';
+          };
+        };
+      }));
     };
   };
 
@@ -172,68 +164,58 @@ in
           };
         };
       }
-      // lib.mapAttrs' (
+      // lib.mapAttrs'
-        name: backup:
+        (name: backup:
-        lib.nameValuePair "backup-${name}" {
+          lib.nameValuePair "backup-${name}" {
-          # Don't want to restart mid-backup
+            # Don't want to restart mid-backup
-          restartIfChanged = false;
+            restartIfChanged = false;
 
-          environment = resticEnv // {
+            environment =
-            RESTIC_CACHE_DIR = "%C/backup-${name}";
+              resticEnv
-          };
+              // {
+                RESTIC_CACHE_DIR = "%C/backup-${name}";
+              };
 
-          path = with pkgs; [
+            path = with pkgs; [
-            coreutils
+              coreutils
-            openssh
+              openssh
-            rclone
+              rclone
-            restic
+              restic
-          ];
-
-          # TODO(tlater): If I ever add more than one repo, service
-          # shutdown/restarting will potentially break if multiple
-          # backups for the same service overlap. A more clever
-          # sentinel file with reference counts would probably solve
-          # this.
-          serviceConfig = {
-            User = backup.user;
-            Group = "backup";
-            RuntimeDirectory = "backup-${name}";
-            CacheDirectory = "backup-${name}";
-            CacheDirectoryMode = "0700";
-            PrivateTmp = true;
-
-            ExecStart = [
-              (lib.concatStringsSep " " (
-                [
-                  "${pkgs.restic}/bin/restic"
-                  "backup"
-                  "--tag"
-                  name
-                ]
-                ++ backup.paths
-              ))
             ];
 
-            ExecStartPre =
+            # TODO(tlater): If I ever add more than one repo, service
-              map (service: "+${mkShutdownScript service}") backup.pauseServices
+            # shutdown/restarting will potentially break if multiple
-              ++ singleton (
+            # backups for the same service overlap. A more clever
-                writeScript "backup-${name}-repo-init" [ ] ''
+            # sentinel file with reference counts would probably solve
-                  restic snapshots || restic init
+            # this.
-                ''
+            serviceConfig = {
-              )
+              User = backup.user;
-              ++ optional (backup.preparation.text != null) (
+              Group = "backup";
-                writeScript "backup-${name}-prepare" backup.preparation.packages backup.preparation.text
+              RuntimeDirectory = "backup-${name}";
-              );
+              CacheDirectory = "backup-${name}";
+              CacheDirectoryMode = "0700";
+              PrivateTmp = true;
 
-            # TODO(tlater): Add repo pruning/checking
+              ExecStart = [
-            ExecStopPost =
+                (lib.concatStringsSep " " ([ "${pkgs.restic}/bin/restic" "backup" "--tag" name ] ++ backup.paths))
-              map (service: "+${mkRestartScript service}") backup.pauseServices
+              ];
-              ++ optional (backup.cleanup.text != null) (
+
-                writeScript "backup-${name}-cleanup" backup.cleanup.packages backup.cleanup.text
+              ExecStartPre =
-              );
+                map (service: "+${mkShutdownScript service}") backup.pauseServices
-          };
+                ++ singleton (writeScript "backup-${name}-repo-init" [ ] ''
-        }
+                  restic snapshots || restic init
-      ) config.services.backups;
+                '')
+                ++ optional (backup.preparation.text != null)
+                  (writeScript "backup-${name}-prepare" backup.preparation.packages backup.preparation.text);
+
+              # TODO(tlater): Add repo pruning/checking
+              ExecStopPost =
+                map (service: "+${mkRestartScript service}") backup.pauseServices
+                ++ optional (backup.cleanup.text != null)
+                  (writeScript "backup-${name}-cleanup" backup.cleanup.packages backup.cleanup.text);
+            };
+          })
+        config.services.backups;
 
     systemd.timers =
       {
@@ -245,18 +227,18 @@ in
           # of the backup jobs.
         };
       }
-      // lib.mapAttrs' (
+      // lib.mapAttrs'
-        name: backup:
+        (name: backup:
-        lib.nameValuePair "backup-${name}" {
+          lib.nameValuePair "backup-${name}" {
-          wantedBy = [ "timers.target" ];
+            wantedBy = [ "timers.target" ];
-          timerConfig = {
+            timerConfig = {
-            OnCalendar = "Wednesday 02:30:00 UTC";
+              OnCalendar = "Wednesday 02:30:00 UTC";
-            RandomizedDelaySec = "1h";
+              RandomizedDelaySec = "1h";
-            FixedRandomDelay = true;
+              FixedRandomDelay = true;
-            Persistent = true;
+              Persistent = true;
-          };
+            };
-        }
+          })
-      ) config.services.backups;
+        config.services.backups;
 
     users = {
       # This user is only used to own the ssh key, because apparently

configuration/services/battery-manager.nix

@@ -1,6 +1,10 @@
-{ config, flake-inputs, ... }:
+{ config
-{
+, flake-inputs
-  imports = [ flake-inputs.sonnenshift.nixosModules.default ];
+, ...
+}: {
+  imports = [
+    flake-inputs.sonnenshift.nixosModules.default
+  ];
 
   services.batteryManager = {
     enable = true;

configuration/services/conduit.nix

@@ -1,8 +1,7 @@
-{
+{ pkgs
-  pkgs,
+, config
-  config,
+, lib
-  lib,
+, ...
-  ...
 }:
 let
   inherit (lib.strings) concatMapStringsSep;
@@ -19,13 +18,6 @@ in
       server_name = domain;
       database_backend = "rocksdb";
 
-      # Set up delegation: https://docs.conduit.rs/delegation.html#automatic-recommended
-      # This is primarily to make sliding sync work
-      well_known = {
-        client = "https://${domain}";
-        server = "${domain}:443";
-      };
-
       turn_uris =
         let
           address = "${config.services.coturn.realm}:${toString config.services.coturn.listening-port}";
@@ -43,30 +35,28 @@ in
   systemd.services.heisenbridge =
     let
       replaceSecretBin = "${pkgs.replace-secret}/bin/replace-secret";
-      registrationFile = builtins.toFile "heisenbridge-registration.yaml" (
+      registrationFile = builtins.toFile "heisenbridge-registration.yaml" (builtins.toJSON {
-        builtins.toJSON {
+        id = "heisenbridge";
-          id = "heisenbridge";
+        url = "http://127.0.0.1:9898";
-          url = "http://127.0.0.1:9898";
+        as_token = "@AS_TOKEN@";
-          as_token = "@AS_TOKEN@";
+        hs_token = "@HS_TOKEN@";
-          hs_token = "@HS_TOKEN@";
+        rate_limited = false;
-          rate_limited = false;
+        sender_localpart = "heisenbridge";
-          sender_localpart = "heisenbridge";
+        namespaces = {
-          namespaces = {
+          users = [
-            users = [
+            {
-              {
+              regex = "@irc_.*";
-                regex = "@irc_.*";
+              exclusive = true;
-                exclusive = true;
+            }
-              }
+            {
-              {
+              regex = "@heisenbridge:.*";
-                regex = "@heisenbridge:.*";
+              exclusive = true;
-                exclusive = true;
+            }
-              }
+          ];
-            ];
+          aliases = [ ];
-            aliases = [ ];
+          rooms = [ ];
-            rooms = [ ];
+        };
-          };
+      });
-        }
-      );
 
       # TODO(tlater): Starting with systemd 253 it will become possible
       # to do the credential setup as part of ExecStartPre/preStart
@@ -117,7 +107,7 @@ in
         RestrictRealtime = true;
         ProtectProc = "invisible";
         ProcSubset = "pid";
-        UMask = 77;
+        UMask = 0077;
 
         # For the identd port
         # CapabilityBoundingSet = ["CAP_NET_BIND_SERVICE"];
@@ -137,7 +127,9 @@ in
     use-auth-secret = true;
     static-auth-secret-file = config.sops.secrets."turn/secret".path;
     realm = turn-realm;
-    relay-ips = [ "116.202.158.55" ];
+    relay-ips = [
+      "116.202.158.55"
+    ];
 
     # SSL config
     #
@@ -238,15 +230,28 @@ in
           proxy_buffering off;
         '';
       };
-      "/.well-known/matrix" = {
+
-        proxyPass = "http://${cfg.settings.global.address}:${toString cfg.settings.global.port}";
+      # Add Element X support
+      # TODO(tlater): Remove when no longer required: https://github.com/vector-im/element-x-android/issues/1085
+      "=/.well-known/matrix/client" = {
+        alias = pkgs.writeText "well-known-matrix-client" (builtins.toJSON {
+          "m.homeserver".base_url = "https://${domain}";
+          "org.matrix.msc3575.proxy".url = "https://${domain}";
+        });
+
+        extraConfig = ''
+          default_type application/json;
+          add_header Access-Control-Allow-Origin "*";
+        '';
       };
     };
   };
 
   services.backups.conduit = {
     user = "root";
-    paths = [ "/var/lib/private/matrix-conduit/" ];
+    paths = [
+      "/var/lib/private/matrix-conduit/"
+    ];
     # Other services store their data in conduit, so no other services
     # need to be shut down currently.
     pauseServices = [ "conduit.service" ];

configuration/services/fail2ban.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }: {
-{
   services.fail2ban = {
     enable = true;
     extraPackages = [ pkgs.ipset ];

configuration/services/foundryvtt.nix

@@ -1,9 +1,7 @@
-{
+{ lib
-  lib,
+, config
-  config,
+, flake-inputs
-  flake-inputs,
+, ...
-  pkgs,
-  ...
 }:
 let
   domain = "foundryvtt.${config.services.nginx.domain}";
@@ -17,7 +15,6 @@ in
     minifyStaticFiles = true;
     proxySSL = true;
     proxyPort = 443;
-    package = flake-inputs.foundryvtt.packages.${pkgs.system}.foundryvtt_11;
   };
 
   # Want to start it manually when I need it, not have it constantly
@@ -41,7 +38,9 @@ in
 
   services.backups.foundryvtt = {
     user = "foundryvtt";
-    paths = [ config.services.foundryvtt.dataDir ];
+    paths = [
+      config.services.foundryvtt.dataDir
+    ];
     pauseServices = [ "foundryvtt.service" ];
   };
 }

configuration/services/gitea.nix

@@ -1,8 +1,7 @@
-{
+{ pkgs
-  pkgs,
+, config
-  config,
+, lib
-  lib,
+, ...
-  ...
 }:
 let
   domain = "gitea.${config.services.nginx.domain}";
@@ -35,7 +34,9 @@ in
       secretPath = config.sops.secrets."forgejo/metrics-token".path;
       runConfig = "${config.services.forgejo.customDir}/conf/app.ini";
     in
-    [ "+${replaceSecretBin} '#metricstoken#' '${secretPath}' '${runConfig}'" ];
+    [
+      "+${replaceSecretBin} '#metricstoken#' '${secretPath}' '${runConfig}'"
+    ];
 
   # Set up SSL
   services.nginx.virtualHosts."${domain}" =

configuration/services/metrics/exporters.nix

@@ -1,8 +1,7 @@
-{
+{ config
-  config,
+, pkgs
-  pkgs,
+, lib
-  lib,
+, ...
-  ...
 }:
 let
   yaml = pkgs.formats.yaml { };
@@ -21,7 +20,9 @@ in
               "tlater.com"
             ];
           in
-          [ "--config=${yaml.generate "domains.yml" conf}" ];
+          [
+            "--config=${yaml.generate "domains.yml" conf}"
+          ];
       };
 
       # System statistics
@@ -50,21 +51,26 @@ in
         listenAddress = "127.0.0.1";
         group = "nginx";
 
-        settings.namespaces = lib.mapAttrsToList (name: virtualHost: {
+        settings.namespaces =
-          inherit name;
+          lib.mapAttrsToList
-          metrics_override.prefix = "nginxlog";
+            (name: virtualHost: {
-          namespace_label = "vhost";
+              inherit name;
+              metrics_override.prefix = "nginxlog";
+              namespace_label = "vhost";
 
-          format = lib.concatStringsSep " " [
+              format = lib.concatStringsSep " " [
-            "$remote_addr - $remote_user [$time_local]"
+                "$remote_addr - $remote_user [$time_local]"
-            ''"$request" $status $body_bytes_sent''
+                ''"$request" $status $body_bytes_sent''
-            ''"$http_referer" "$http_user_agent"''
+                ''"$http_referer" "$http_user_agent"''
-            ''rt=$request_time uct="$upstream_connect_time"''
+                ''rt=$request_time uct="$upstream_connect_time"''
-            ''uht="$upstream_header_time" urt="$upstream_response_time"''
+                ''uht="$upstream_header_time" urt="$upstream_response_time"''
-          ];
+              ];
 
-          source.files = [ "/var/log/nginx/${name}/access.log" ];
+              source.files = [
-        }) config.services.nginx.virtualHosts;
+                "/var/log/nginx/${name}/access.log"
+              ];
+            })
+            config.services.nginx.virtualHosts;
       };
     };
 
@@ -80,11 +86,7 @@ in
             requires = [ "fail2ban.service" ];
             serviceConfig = {
               Group = "fail2ban";
-              RestrictAddressFamilies = [
+              RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
-                "AF_UNIX"
-                "AF_INET"
-                "AF_INET6"
-              ];
               ExecStart = lib.concatStringsSep " " [
                 "${pkgs.local.prometheus-fail2ban-exporter}/bin/fail2ban-prometheus-exporter"
                 "--collector.f2b.socket=/var/run/fail2ban/fail2ban.sock"

configuration/services/metrics/grafana.nix

@@ -42,12 +42,6 @@ in
     forceSSL = true;
     useACMEHost = "tlater.net";
     enableHSTS = true;
-    locations = {
+    locations."/".proxyPass = "http://localhost:${toString config.services.grafana.settings.server.http_port}";
-      "/".proxyPass = "http://localhost:${toString config.services.grafana.settings.server.http_port}";
-      "/api/live" = {
-        proxyWebsockets = true;
-        proxyPass = "http://localhost:${toString config.services.grafana.settings.server.http_port}";
-      };
-    };
   };
 }

configuration/services/metrics/options.nix

@@ -1,8 +1,7 @@
-{
+{ pkgs
-  pkgs,
+, config
-  config,
+, lib
-  lib,
+, ...
-  ...
 }:
 let
   inherit (lib) types mkOption mkDefault;
@@ -12,94 +11,87 @@ in
   options = {
     services.prometheus = {
       extraExporters = mkOption {
-        type = types.attrsOf (
+        type = types.attrsOf (types.submodule {
-          types.submodule {
+          options = {
-            options = {
+            port = mkOption {
-              port = mkOption {
+              type = types.int;
-                type = types.int;
+              description = "The port on which this exporter listens.";
-                description = "The port on which this exporter listens.";
-              };
-              listenAddress = mkOption {
-                type = types.str;
-                default = "127.0.0.1";
-                description = "Address to listen on.";
-              };
-              serviceOpts = mkOption {
-                type = types.attrs;
-                description = "An attrset to be merged with the exporter's systemd service.";
-              };
             };
-          }
+            listenAddress = mkOption {
-        );
+              type = types.str;
+              default = "127.0.0.1";
+              description = "Address to listen on.";
+            };
+            serviceOpts = mkOption {
+              type = types.attrs;
+              description = "An attrset to be merged with the exporter's systemd service.";
+            };
+          };
+        });
       };
     };
 
     services.victoriametrics.scrapeConfigs = mkOption {
-      type = types.attrsOf (
+      type = types.attrsOf (types.submodule ({ name
-        types.submodule (
+                                             , self
-          { name, self, ... }:
+                                             , ...
-          {
+                                             }: {
-            options = {
+        options = {
-              job_name = mkOption {
+          job_name = mkOption {
-                type = types.str;
+            type = types.str;
-                default = name;
+            default = name;
+          };
+
+          extraSettings = mkOption {
+            type = types.anything;
+            description = ''
+              Other settings to set for this scrape config.
+            '';
+            default = { };
+          };
+
+          targets = mkOption {
+            type = types.listOf types.str;
+            description = lib.mdDoc ''
+              Addresses scrape targets for this config listen on.
+
+              Shortcut for `static_configs = lib.singleton {targets = [<targets>];}`
+            '';
+            default = [ ];
+          };
+
+          static_configs = mkOption {
+            default = [ ];
+            type = types.listOf (types.submodule {
+              options = {
+                targets = mkOption {
+                  type = types.listOf types.str;
+                  description = lib.mdDoc ''
+                    The addresses scrape targets for this config listen on.
+
+                    Must in `listenAddress:port` format.
+                  '';
+                };
+                labels = mkOption {
+                  type = types.attrsOf types.str;
+                  description = lib.mdDoc ''
+                    Labels to apply to all targets defined for this static config.
+                  '';
+                  default = { };
+                };
               };
-
+            });
-              extraSettings = mkOption {
+          };
-                type = types.anything;
+        };
-                description = ''
+      }));
-                  Other settings to set for this scrape config.
-                '';
-                default = { };
-              };
-
-              targets = mkOption {
-                type = types.listOf types.str;
-                description = lib.mdDoc ''
-                  Addresses scrape targets for this config listen on.
-
-                  Shortcut for `static_configs = lib.singleton {targets = [<targets>];}`
-                '';
-                default = [ ];
-              };
-
-              static_configs = mkOption {
-                default = [ ];
-                type = types.listOf (
-                  types.submodule {
-                    options = {
-                      targets = mkOption {
-                        type = types.listOf types.str;
-                        description = lib.mdDoc ''
-                          The addresses scrape targets for this config listen on.
-
-                          Must in `listenAddress:port` format.
-                        '';
-                      };
-                      labels = mkOption {
-                        type = types.attrsOf types.str;
-                        description = lib.mdDoc ''
-                          Labels to apply to all targets defined for this static config.
-                        '';
-                        default = { };
-                      };
-                    };
-                  }
-                );
-              };
-            };
-          }
-        )
-      );
     };
   };
 
   config = {
     systemd.services = lib.mkMerge [
-      (lib.mapAttrs' (
+      (lib.mapAttrs'
-        name: exporter:
+        (name: exporter:
-        lib.nameValuePair "prometheus-${name}-exporter" (
+          lib.nameValuePair "prometheus-${name}-exporter" (lib.mkMerge [
-          lib.mkMerge [
             {
               # Shamelessly copied from upstream because the upstream
               # module is an intractable mess
@@ -125,10 +117,7 @@ in
               serviceConfig.ProtectKernelTunables = true;
               serviceConfig.ProtectSystem = mkDefault "strict";
               serviceConfig.RemoveIPC = true;
-              serviceConfig.RestrictAddressFamilies = [
+              serviceConfig.RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
-                "AF_INET"
-                "AF_INET6"
-              ];
               serviceConfig.RestrictNamespaces = true;
               serviceConfig.RestrictRealtime = true;
               serviceConfig.RestrictSUIDSGID = true;
@@ -136,9 +125,8 @@ in
               serviceConfig.UMask = "0077";
             }
             exporter.serviceOpts
-          ]
+          ]))
-        )
+        config.services.prometheus.extraExporters)
-      ) config.services.prometheus.extraExporters)
 
       {
         vmagent-scrape-exporters =
@@ -146,25 +134,24 @@ in
             listenAddress = config.services.victoriametrics.listenAddress;
             vmAddr = (lib.optionalString (lib.hasPrefix ":" listenAddress) "127.0.0.1") + listenAddress;
             promscrape = yaml.generate "prometheus.yml" {
-              scrape_configs = lib.mapAttrsToList (
+              scrape_configs = lib.mapAttrsToList
-                _: scrape:
+                (_: scrape:
-                lib.recursiveUpdate {
+                  lib.recursiveUpdate
-                  inherit (scrape) job_name;
+                    {
-                  static_configs =
+                      inherit (scrape) job_name;
-                    scrape.static_configs
+                      static_configs =
-                    ++ lib.optional (scrape.targets != [ ]) { targets = scrape.targets; };
+                        scrape.static_configs
-                } scrape.extraSettings
+                        ++ lib.optional (scrape.targets != [ ]) { targets = scrape.targets; };
-              ) config.services.victoriametrics.scrapeConfigs;
+                    }
+                    scrape.extraSettings)
+                config.services.victoriametrics.scrapeConfigs;
             };
           in
           {
             enable = true;
             path = [ pkgs.victoriametrics ];
             wantedBy = [ "multi-user.target" ];
-            after = [
+            after = [ "network.target" "victoriametrics.service" ];
-              "network.target"
-              "victoriametrics.service"
-            ];
             serviceConfig = {
               ExecStart = [
                 (lib.concatStringsSep " " [
@@ -193,10 +180,7 @@ in
               ProtectKernelTunables = true;
               ProtectSystem = "strict";
               RemoveIPC = true;
-              RestrictAddressFamilies = [
+              RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
-                "AF_INET"
-                "AF_INET6"
-              ];
               RestrictNamespaces = true;
               RestrictRealtime = true;
               RestrictSUIDSGID = true;
@@ -211,15 +195,19 @@ in
 
     services.victoriametrics.scrapeConfigs =
       let
-        allExporters = lib.mapAttrs (name: exporter: { inherit (exporter) listenAddress port; }) (
+        allExporters =
-          (lib.filterAttrs (
+          lib.mapAttrs
-            _: exporter: builtins.isAttrs exporter && exporter.enable
+            (name: exporter: {
-          ) config.services.prometheus.exporters)
+              inherit (exporter) listenAddress port;
-          // config.services.prometheus.extraExporters
+            })
-        );
+            ((lib.filterAttrs (_: exporter: builtins.isAttrs exporter && exporter.enable)
+              config.services.prometheus.exporters)
+            // config.services.prometheus.extraExporters);
       in
-      lib.mapAttrs (_: exporter: {
+      lib.mapAttrs
-        targets = [ "${exporter.listenAddress}:${toString exporter.port}" ];
+        (_: exporter: {
-      }) allExporters;
+          targets = [ "${exporter.listenAddress}:${toString exporter.port}" ];
+        })
+        allExporters;
   };
 }

configuration/services/metrics/victoriametrics.nix

@@ -1,8 +1,9 @@
-{ config, ... }:
+{ config, ... }: {
-{
   config.services.victoriametrics = {
     enable = true;
-    extraOptions = [ "-storage.minFreeDiskSpaceBytes=5GB" ];
+    extraOptions = [
+      "-storage.minFreeDiskSpaceBytes=5GB"
+    ];
 
     scrapeConfigs = {
       forgejo = {

configuration/services/nextcloud.nix

@@ -1,14 +1,12 @@
-{
+{ pkgs
-  pkgs,
+, config
-  config,
+, ...
-  lib,
-  ...
 }:
 let
   # Update pending on rewrite of nextcloud news, though there is an
   # alpha to switch to if it becomes necessary:
   # https://github.com/nextcloud/news/issues/2610
-  nextcloud = pkgs.nextcloud28;
+  nextcloud = pkgs.nextcloud27;
   hostName = "nextcloud.${config.services.nginx.domain}";
 in
 {
@@ -16,20 +14,6 @@ in
     inherit hostName;
 
     package = nextcloud;
-    phpPackage = lib.mkForce (
-      pkgs.php.override {
-        packageOverrides = final: prev: {
-          extensions = prev.extensions // {
-            pgsql = prev.extensions.pgsql.overrideAttrs (old: {
-              configureFlags = [ "--with-pgsql=${config.services.postgresql.package}" ];
-            });
-            pdo_pgsql = prev.extensions.pdo_pgsql.overrideAttrs (old: {
-              configureFlags = [ "--with-pdo-pgsql=${config.services.postgresql.package}" ];
-            });
-          };
-        };
-      }
-    );
     enable = true;
     maxUploadSize = "2G";
     https = true;
@@ -54,14 +38,7 @@ in
     };
 
     extraApps = {
-      inherit (pkgs.local)
+      inherit (pkgs.local) bookmarks calendar contacts cookbook news notes;
-        bookmarks
-        calendar
-        contacts
-        cookbook
-        news
-        notes
-        ;
     };
   };
 

configuration/services/postgres.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }: {
-{
   services.postgresql = {
     package = pkgs.postgresql_14;
     enable = true;

configuration/services/starbound.nix

@@ -1,4 +1,7 @@
-{ pkgs, lib, ... }:
+{ pkgs
+, lib
+, ...
+}:
 let
   inherit (lib) concatStringsSep;
 in
@@ -111,7 +114,9 @@ in
 
   services.backups.starbound = {
     user = "root";
-    paths = [ "/var/lib/private/starbound/storage/universe/" ];
+    paths = [
+      "/var/lib/private/starbound/storage/universe/"
+    ];
     pauseServices = [ "starbound.service" ];
   };
 }

configuration/services/wireguard.nix

@@ -1,5 +1,4 @@
-{ config, ... }:
+{ config, ... }: {
-{
   # iptables needs to permit forwarding from wg0 to wg0
   networking.firewall.extraCommands = ''
     iptables -A FORWARD -i wg0 -o wg0 -j ACCEPT

flake.lock

@@ -7,11 +7,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1718194053,
+        "lastModified": 1711973905,
-        "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=",
+        "narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a",
+        "rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723685519,
+        "lastModified": 1714103775,
-        "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=",
+        "narHash": "sha256-kcBiIrmqzt3bNTr2GMBfAyA+on8BEKO1iKzzDFQZkjI=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "276a0d055a720691912c6a34abb724e395c8e38a",
+        "rev": "285e26465a0bae510897ca04da26ce6307c652b4",
         "type": "github"
       },
       "original": {
@@ -47,11 +47,11 @@
         "pyproject-nix": "pyproject-nix"
       },
       "locked": {
-        "lastModified": 1719685993,
+        "lastModified": 1702457430,
-        "narHash": "sha256-04gy1icwnGO3ZXF6r96yBm/C0PNPzeLxA/8xzzq0dBI=",
+        "narHash": "sha256-8NQiXtYCOiC7XFayy6GPGDudCBrPROry3mfWjpdVj5g=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "1b5e01219a32324c8f6889fe1f4db933ec7932f6",
+        "rev": "262198033e23e9ee832f0cc8133d38f07598f555",
         "type": "github"
       },
       "original": {
@@ -69,11 +69,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1719815435,
+        "lastModified": 1704003651,
-        "narHash": "sha256-K2xFp142onP35jcx7li10xUxNVEVRWjAdY8DSuR7Naw=",
+        "narHash": "sha256-bA3d4E1CX5G7TVbKwJOm9jZfVOGOPp6u5CKEUzNsE8E=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "ebfe2c639111d7e82972a12711206afaeeda2450",
+        "rev": "c6d82e087ac96f24b90c5787a17e29a72566c2b4",
         "type": "github"
       },
       "original": {
@@ -157,11 +157,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722661736,
+        "lastModified": 1712623723,
-        "narHash": "sha256-0lujsK40JV/2PlqCjhZMGpHKL4vDKzJcnkFJYnG1WZA=",
+        "narHash": "sha256-jPD5+M+QPyMRk52zfFMIeHdv7yXYJ/yNGqwS0PhYF+E=",
         "owner": "reckenrode",
         "repo": "nix-foundryvtt",
-        "rev": "699a175398410688214615a9d977354e9ef98d2d",
+        "rev": "6025615b431170558c3c13f16b549fc0126425e1",
         "type": "github"
       },
       "original": {
@@ -210,59 +210,59 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1721524707,
+        "lastModified": 1713638189,
-        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
+        "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
+        "rev": "74574c38577914733b4f7a775dd77d24245081dd",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-24.05",
+        "ref": "release-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1723957280,
+        "lastModified": 1714253743,
-        "narHash": "sha256-J08Yqf2IJ73y7myI69qEKsQ048ibweG6FeJeCxbIdB4=",
+        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "abcef4da4ebb72240bddc370a27263627e64877f",
+        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable-small",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1723920526,
+        "lastModified": 1718208800,
-        "narHash": "sha256-USs6A60raDKZ/8BEpqja1XjZIsRzADX+NtWKH6wIxIw=",
+        "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1cbd3d585263dc620c483e138d352a39b9f0e3ec",
+        "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.05-small",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1719468428,
+        "lastModified": 1702272962,
-        "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
+        "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
+        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
         "type": "github"
       },
       "original": {
@@ -281,11 +281,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718252448,
+        "lastModified": 1713333471,
-        "narHash": "sha256-xZZBdKqe1ByITzvx65pVgGQ5jeb73MybjgrcfI84lEo=",
+        "narHash": "sha256-sIVQKOXzruxtTYiBRHZa8UQH+CSIa9K5MZlY6vavYfA=",
         "owner": "berberman",
         "repo": "nvfetcher",
-        "rev": "fa7609950023462c6f91c425de7610c0bb6b86ba",
+        "rev": "2a824322dc6a755ffda83a13b948d42304521e4d",
         "type": "github"
       },
       "original": {
@@ -375,11 +375,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1719760370,
+        "lastModified": 1703965384,
-        "narHash": "sha256-fsxAuW6RxKZYjAP3biUC6C4vaYFhDfWv8lp1Tmx3ZCY=",
+        "narHash": "sha256-3iyouqkBvhh/E48TkBlt4JmmcIEyfQwY7pokKBx9WNg=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "ea7fdada6a0940b239ddbde2048a4d7dac1efe1e",
+        "rev": "e872f5085cf5b0e44558442365c1c033d486eff2",
         "type": "github"
       },
       "original": {
@@ -442,11 +442,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1723501126,
+        "lastModified": 1713892811,
-        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
+        "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
+        "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd",
         "type": "github"
       },
       "original": {
@@ -523,11 +523,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719851829,
+        "lastModified": 1704840002,
-        "narHash": "sha256-M5miiIbiwP4uArTyeIr/RKA857rP14AEJUe11AZsKAc=",
+        "narHash": "sha256-ik2LeuRjcnRXwBLoRSOyGEMXscE+coO8G79IFhZhdJk=",
         "ref": "refs/heads/master",
-        "rev": "4a099f27a27f4107ceb14969e2158eaabebcf1d4",
+        "rev": "d14f50c8dcc8ab30a5e5fa907b392ac0df6c7b52",
-        "revCount": 74,
+        "revCount": 73,
         "type": "git",
         "url": "https://gitea.tlater.net/tlaternet/tlaternet.git"
       },

flake.nix

@@ -2,8 +2,8 @@
   description = "tlater.net host configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05-small";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     disko = {
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -33,27 +33,16 @@
   };
 
   outputs =
-    {
+    { self
-      self,
+    , nixpkgs
-      nixpkgs,
+    , sops-nix
-      sops-nix,
+    , nvfetcher
-      nvfetcher,
+    , deploy-rs
-      deploy-rs,
+    , ...
-      ...
+    } @ inputs:
-    }@inputs:
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
-
-      vm = nixpkgs.lib.nixosSystem {
-        inherit system;
-        specialArgs.flake-inputs = inputs;
-
-        modules = [
-          ./configuration
-          ./configuration/hardware-specific/vm.nix
-        ];
-      };
     in
     {
       ##################
@@ -85,12 +74,7 @@
           };
 
           sshUser = "tlater";
-          sshOpts = [
+          sshOpts = [ "-p" "2222" "-o" "ForwardAgent=yes" ];
-            "-p"
-            "2222"
-            "-o"
-            "ForwardAgent=yes"
-          ];
         };
       };
 
@@ -99,12 +83,6 @@
       #########
       checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
 
-      ###########################
-      # Garbage collection root #
-      ###########################
-
-      packages.${system}.default = vm.config.system.build.vm;
-
       ###################
       # Utility scripts #
       ###################
@@ -115,6 +93,15 @@
           type = "app";
           program =
             let
+              vm = nixpkgs.lib.nixosSystem {
+                inherit system;
+                specialArgs.flake-inputs = inputs;
+
+                modules = [
+                  ./configuration
+                  ./configuration/hardware-specific/vm.nix
+                ];
+              };
             in
             (pkgs.writeShellScript "" ''
               ${vm.config.system.build.vm.outPath}/bin/run-testvm-vm
@@ -150,11 +137,10 @@
       # Development environment #
       ###########################
       devShells.${system}.default = nixpkgs.legacyPackages.${system}.mkShell {
-        sopsPGPKeyDirs = [
+        sopsPGPKeyDirs = [ "./keys/hosts/" "./keys/users/" ];
-          "./keys/hosts/"
+        nativeBuildInputs = [
-          "./keys/users/"
+          sops-nix.packages.${system}.sops-import-keys-hook
         ];
-        nativeBuildInputs = [ sops-nix.packages.${system}.sops-import-keys-hook ];
 
         packages = with pkgs; [
           sops-nix.packages.${system}.sops-init-gpg-key

modules/default.nix

@@ -1 +1,5 @@
-{ imports = [ ./nginxExtensions.nix ]; }
+{
+  imports = [
+    ./nginxExtensions.nix
+  ];
+}

modules/nginxExtensions.nix

@@ -1,10 +1,8 @@
-{
+{ config
-  config,
+, pkgs
-  pkgs,
+, lib
-  lib,
+, ...
-  ...
+}: {
-}:
-{
   options = {
     services.nginx.domain = lib.mkOption {
       type = lib.types.str;
@@ -14,8 +12,10 @@
     services.nginx.virtualHosts =
       let
         extraVirtualHostOptions =
-          { name, config, ... }:
+          { name
-          {
+          , config
+          , ...
+          }: {
             options = {
               enableHSTS = lib.mkEnableOption "Enable HSTS";
 
@@ -40,7 +40,9 @@
             };
           };
       in
-      lib.mkOption { type = lib.types.attrsOf (lib.types.submodule extraVirtualHostOptions); };
+      lib.mkOption {
+        type = lib.types.attrsOf (lib.types.submodule extraVirtualHostOptions);
+      };
   };
 
   config = {
@@ -49,11 +51,11 @@
       let
         confirm = ''[[ "tlater.net" = ${config.services.nginx.domain} ]]'';
       in
-      lib.mapAttrs' (
+      lib.mapAttrs'
-        cert: _:
+        (cert: _:
-        lib.nameValuePair "acme-${cert}" {
+          lib.nameValuePair "acme-${cert}" {
-          serviceConfig.ExecCondition = ''${pkgs.runtimeShell} -c '${confirm}' '';
+            serviceConfig.ExecCondition = ''${pkgs.runtimeShell} -c '${confirm}' '';
-        }
+          })
-      ) config.security.acme.certs;
+        config.security.acme.certs;
   };
 }

pkgs/_sources_nextcloud/generated.json

@@ -7,11 +7,11 @@
         "passthru": null,
         "pinned": false,
         "src": {
-            "sha256": "sha256-V4zZsAwPn8QiCXEDqOgNFHaXqMOcHMpMbJ1Oz3Db0pc=",
+            "sha256": "sha256-JXNQNnWXoii71QhtKktuEBEIqzmONVetULBhpSjM9xo=",
             "type": "tarball",
-            "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.4/bookmarks-14.2.4.tar.gz"
+            "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.3/bookmarks-13.1.3.tar.gz"
         },
-        "version": "14.2.4"
+        "version": "13.1.3"
     },
     "calendar": {
         "cargoLocks": null,
@@ -21,11 +21,11 @@
         "passthru": null,
         "pinned": false,
         "src": {
-            "sha256": "sha256-sipXeyOL4OhENz7V2beFeSYBAoFZdCWtqftIy0lsqEY=",
+            "sha256": "sha256-hZfjWAMi/0qs5xMMgOlcoSXG6kcZ2aeDaez+NqSZFKI=",
             "type": "tarball",
-            "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.15/calendar-v4.7.15.tar.gz"
+            "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.7/calendar-v4.6.7.tar.gz"
         },
-        "version": "v4.7.15"
+        "version": "v4.6.7"
     },
     "contacts": {
         "cargoLocks": null,
@@ -49,11 +49,11 @@
         "passthru": null,
         "pinned": false,
         "src": {
-            "sha256": "sha256-a8ekMnEzudHGiqHF53jPtgsVTOTc2QLuPg6YtTw5h68=",
+            "sha256": "sha256-TE/w8SgyIPaGl5wZUAsG234nxoPj25QoRPF3zjbMoRk=",
             "type": "tarball",
-            "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/Cookbook-0.11.1.tar.gz"
+            "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.10.5/Cookbook-0.10.5.tar.gz"
         },
-        "version": "0.11.1"
+        "version": "0.10.5"
     },
     "news": {
         "cargoLocks": null,
@@ -63,11 +63,11 @@
         "passthru": null,
         "pinned": false,
         "src": {
-            "sha256": "sha256-AhTZGQCLeNgsRBF5w3+Lf9JtNN4D1QncB5t+odU+XUc=",
+            "sha256": "sha256-cfJkKRNSz15L4E3w1tnEb+t4MrVwVzb8lb6vCOA4cK4=",
             "type": "tarball",
-            "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz"
+            "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz"
         },
-        "version": "25.0.0-alpha8"
+        "version": "24.0.0"
     },
     "notes": {
         "cargoLocks": null,
@@ -77,10 +77,10 @@
         "passthru": null,
         "pinned": false,
         "src": {
-            "sha256": "sha256-A3QNWGWeC2OcZngMrh9NpYbU5qp5x9xiDcRfB9cRXBo=",
+            "sha256": "sha256-ydpxatwuZUz7XIgK8FMklZlxNQklpsP8Uqpxvt3iK0k=",
             "type": "tarball",
-            "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.10.1/notes-v4.10.1.tar.gz"
+            "url": "https://github.com/nextcloud/notes/releases/download/v4.10.0/notes.tar.gz"
         },
-        "version": "v4.10.1"
+        "version": "v4.10.0"
     }
 }

pkgs/_sources_nextcloud/generated.nix

@@ -3,18 +3,18 @@
 {
   bookmarks = {
     pname = "bookmarks";
-    version = "14.2.4";
+    version = "13.1.3";
     src = fetchTarball {
-      url = "https://github.com/nextcloud/bookmarks/releases/download/v14.2.4/bookmarks-14.2.4.tar.gz";
+      url = "https://github.com/nextcloud/bookmarks/releases/download/v13.1.3/bookmarks-13.1.3.tar.gz";
-      sha256 = "sha256-V4zZsAwPn8QiCXEDqOgNFHaXqMOcHMpMbJ1Oz3Db0pc=";
+      sha256 = "sha256-JXNQNnWXoii71QhtKktuEBEIqzmONVetULBhpSjM9xo=";
     };
   };
   calendar = {
     pname = "calendar";
-    version = "v4.7.15";
+    version = "v4.6.7";
     src = fetchTarball {
-      url = "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.15/calendar-v4.7.15.tar.gz";
+      url = "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.7/calendar-v4.6.7.tar.gz";
-      sha256 = "sha256-sipXeyOL4OhENz7V2beFeSYBAoFZdCWtqftIy0lsqEY=";
+      sha256 = "sha256-hZfjWAMi/0qs5xMMgOlcoSXG6kcZ2aeDaez+NqSZFKI=";
     };
   };
   contacts = {
@@ -27,26 +27,26 @@
   };
   cookbook = {
     pname = "cookbook";
-    version = "0.11.1";
+    version = "0.10.5";
     src = fetchTarball {
-      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/Cookbook-0.11.1.tar.gz";
+      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.10.5/Cookbook-0.10.5.tar.gz";
-      sha256 = "sha256-a8ekMnEzudHGiqHF53jPtgsVTOTc2QLuPg6YtTw5h68=";
+      sha256 = "sha256-TE/w8SgyIPaGl5wZUAsG234nxoPj25QoRPF3zjbMoRk=";
     };
   };
   news = {
     pname = "news";
-    version = "25.0.0-alpha8";
+    version = "24.0.0";
     src = fetchTarball {
-      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz";
+      url = "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz";
-      sha256 = "sha256-AhTZGQCLeNgsRBF5w3+Lf9JtNN4D1QncB5t+odU+XUc=";
+      sha256 = "sha256-cfJkKRNSz15L4E3w1tnEb+t4MrVwVzb8lb6vCOA4cK4=";
     };
   };
   notes = {
     pname = "notes";
-    version = "v4.10.1";
+    version = "v4.10.0";
     src = fetchTarball {
-      url = "https://github.com/nextcloud-releases/notes/releases/download/v4.10.1/notes-v4.10.1.tar.gz";
+      url = "https://github.com/nextcloud/notes/releases/download/v4.10.0/notes.tar.gz";
-      sha256 = "sha256-A3QNWGWeC2OcZngMrh9NpYbU5qp5x9xiDcRfB9cRXBo=";
+      sha256 = "sha256-ydpxatwuZUz7XIgK8FMklZlxNQklpsP8Uqpxvt3iK0k=";
     };
   };
 }

pkgs/_sources_pkgs/generated.json

@@ -13,7 +13,6 @@
             "name": null,
             "rev": "v0.10.1",
             "sha256": "sha256-zGEhDy3uXIbvx4agSA8Mx7bRtiZZtoDZGbNbHc9L+yI=",
-            "sparseCheckout": [],
             "type": "git",
             "url": "https://gitlab.com/hectorjsmith/fail2ban-prometheus-exporter"
         },

pkgs/_sources_pkgs/generated.nix

@@ -10,7 +10,6 @@
       fetchSubmodules = false;
       deepClone = false;
       leaveDotGit = false;
-      sparseCheckout = [ ];
       sha256 = "sha256-zGEhDy3uXIbvx4agSA8Mx7bRtiZZtoDZGbNbHc9L+yI=";
     };
   };

pkgs/afvalcalendar/default.nix

@@ -1,12 +1,19 @@
-{ pkgs, rustPlatform, ... }:
+{ pkgs
+, rustPlatform
+, ...
+}:
 rustPlatform.buildRustPackage {
   pname = "afvalcalendar";
   version = "0.1.0";
   src = ./.;
 
-  nativeBuildInputs = with pkgs; [ pkg-config ];
+  nativeBuildInputs = with pkgs; [
+    pkg-config
+  ];
 
-  buildInputs = with pkgs; [ openssl ];
+  buildInputs = with pkgs; [
+    openssl
+  ];
 
   cargoHash = "sha256-JXx6aUKdKbUTBCwlBw5i1hZy8ofCfSrhLCwFzqdA8cI=";
 }

pkgs/default.nix

@@ -1,4 +1,7 @@
-{ pkgs, lib }:
+{ pkgs
+, lib
+,
+}:
 let
   inherit (builtins) fromJSON mapAttrs readFile;
   inherit (pkgs) callPackage;
@@ -10,7 +13,7 @@ in
   };
   afvalcalendar = callPackage ./afvalcalendar { };
 }
-// (
+  // (
   # Add nextcloud apps
   let
     mkNextcloudApp = pkgs.callPackage ./mkNextcloudApp.nix { };

pkgs/mkNextcloudApp.nix

@@ -1,5 +1,7 @@
-{ fetchNextcloudApp, lib }:
+{ fetchNextcloudApp
-source:
+, lib
+,
+}: source:
 fetchNextcloudApp {
   url = source.src.url;
   sha256 = source.src.sha256;

pkgs/nextcloud-apps.toml

@@ -1,10 +1,12 @@
 [bookmarks]
-src.github = "nextcloud/bookmarks"
+# src.github = "nextcloud/bookmarks"
 src.prefix = "v"
+src.manual = "v13.1.3"
 fetch.tarball = "https://github.com/nextcloud/bookmarks/releases/download/v$ver/bookmarks-$ver.tar.gz"
 
 [calendar]
-src.github = "nextcloud-releases/calendar"
+# src.github = "nextcloud-releases/calendar"
+src.manual = "v4.6.7"
 fetch.tarball = "https://github.com/nextcloud-releases/calendar/releases/download/$ver/calendar-$ver.tar.gz"
 
 [contacts]
@@ -13,16 +15,17 @@ 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.github = "christianlupus-nextcloud/cookbook-releases"
 src.prefix = "v"
+src.manual = "0.10.5"
 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-alpha8"
+# Update to 25 when angular rewrite is done/the alpha when I need to switch to nextcloud 28+
+src.manual = "24.0.0"
 fetch.tarball = "https://github.com/nextcloud/news/releases/download/$ver/news.tar.gz"
 
 [notes]
-src.github = "nextcloud-releases/notes"
+src.github = "nextcloud/notes"
-fetch.tarball = "https://github.com/nextcloud-releases/notes/releases/download/$ver/notes-$ver.tar.gz"
+fetch.tarball = "https://github.com/nextcloud/notes/releases/download/$ver/notes.tar.gz"

pkgs/prometheus/fail2ban-exporter.nix

@@ -1,4 +1,7 @@
-{ buildGoModule, sources }:
+{ buildGoModule
+, sources
+,
+}:
 buildGoModule {
   inherit (sources.prometheus-fail2ban-exporter) pname src version;
   vendorHash = "sha256-5o8p5p0U/c0WAIV5dACnWA3ThzSh2tt5LIFMb59i9GY=";

pkgs/starbound/default.nix

@@ -1,21 +1,19 @@
-{
+{ stdenv
-  stdenv,
+, lib
-  lib,
+, makeWrapper
-  makeWrapper,
+, patchelf
-  patchelf,
+, steamPackages
-  steamPackages,
+, replace-secret
-  replace-secret,
+,
 }:
 let
   # Use the directory in which starbound is installed so steamcmd
   # doesn't have to be reinstalled constantly (we're using DynamicUser
   # with StateDirectory to persist this).
-  steamcmd = steamPackages.steamcmd.override { steamRoot = "/var/lib/starbound/.steamcmd"; };
+  steamcmd = steamPackages.steamcmd.override {
-  wrapperPath = lib.makeBinPath [
+    steamRoot = "/var/lib/starbound/.steamcmd";
-    patchelf
+  };
-    steamcmd
+  wrapperPath = lib.makeBinPath [ patchelf steamcmd replace-secret ];
-    replace-secret
-  ];
 in
 stdenv.mkDerivation {
   name = "starbound-update-script";