.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
@@ -53,10 +51,7 @@
 
   # 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,8 +26,8 @@
       # Override the default, just keep fewer logs
       nginx.rotate = 6;
     }
-    // lib.mapAttrs' (
+    // lib.mapAttrs'
-      virtualHost: _:
+      (virtualHost: _:
         lib.nameValuePair "/var/log/nginx/${virtualHost}/access.log" {
           frequency = "daily";
           rotate = 2;
@@ -33,14 +35,17 @@
           delaycompress = true;
           su = "${config.services.nginx.user} ${config.services.nginx.group}";
           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 =
+    lib.mapAttrsToList
+      (
         virtualHost: _:
           #
           "d /var/log/nginx/${virtualHost} 0750 ${config.services.nginx.user} ${config.services.nginx.group}"
-  ) config.services.nginx.virtualHosts;
+      )
+      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 (
-      pkgs.writeShellApplication {
       inherit name text;
       runtimeInputs = packages;
-      }
+    });
-    );
 
   # *NOT* a TOML file, for some reason quotes are interpreted
   # *literally
@@ -55,10 +49,10 @@ 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 = {
           user = lib.mkOption {
             type = types.str;
@@ -133,9 +127,7 @@ in
             '';
           };
         };
-          }
+      }));
-        )
-      );
     };
   };
 
@@ -172,13 +164,15 @@ in
           };
         };
       }
-      // lib.mapAttrs' (
+      // lib.mapAttrs'
-        name: backup:
+        (name: backup:
           lib.nameValuePair "backup-${name}" {
             # Don't want to restart mid-backup
             restartIfChanged = false;
 
-          environment = resticEnv // {
+            environment =
+              resticEnv
+              // {
                 RESTIC_CACHE_DIR = "%C/backup-${name}";
               };
 
@@ -203,37 +197,25 @@ in
               PrivateTmp = true;
 
               ExecStart = [
-              (lib.concatStringsSep " " (
+                (lib.concatStringsSep " " ([ "${pkgs.restic}/bin/restic" "backup" "--tag" name ] ++ backup.paths))
-                [
-                  "${pkgs.restic}/bin/restic"
-                  "backup"
-                  "--tag"
-                  name
-                ]
-                ++ backup.paths
-              ))
               ];
 
               ExecStartPre =
                 map (service: "+${mkShutdownScript service}") backup.pauseServices
-              ++ singleton (
+                ++ singleton (writeScript "backup-${name}-repo-init" [ ] ''
-                writeScript "backup-${name}-repo-init" [ ] ''
                   restic snapshots || restic init
-                ''
+                '')
-              )
+                ++ optional (backup.preparation.text != null)
-              ++ optional (backup.preparation.text != null) (
+                  (writeScript "backup-${name}-prepare" backup.preparation.packages backup.preparation.text);
-                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) (
+                ++ optional (backup.cleanup.text != null)
-                writeScript "backup-${name}-cleanup" backup.cleanup.packages backup.cleanup.text
+                  (writeScript "backup-${name}-cleanup" backup.cleanup.packages backup.cleanup.text);
-              );
             };
-        }
+          })
-      ) config.services.backups;
+        config.services.backups;
 
     systemd.timers =
       {
@@ -245,8 +227,8 @@ in
           # of the backup jobs.
         };
       }
-      // lib.mapAttrs' (
+      // lib.mapAttrs'
-        name: backup:
+        (name: backup:
           lib.nameValuePair "backup-${name}" {
             wantedBy = [ "timers.target" ];
             timerConfig = {
@@ -255,8 +237,8 @@ in
               FixedRandomDelay = 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;
@@ -43,8 +42,7 @@ 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";
         url = "http://127.0.0.1:9898";
         as_token = "@AS_TOKEN@";
@@ -65,8 +63,7 @@ in
           aliases = [ ];
           rooms = [ ];
         };
-        }
+      });
-      );
 
       # TODO(tlater): Starting with systemd 253 it will become possible
       # to do the credential setup as part of ExecStartPre/preStart
@@ -117,7 +114,7 @@ in
         RestrictRealtime = true;
         ProtectProc = "invisible";
         ProcSubset = "pid";
-        UMask = 77;
+        UMask = 0077;
 
         # For the identd port
         # CapabilityBoundingSet = ["CAP_NET_BIND_SERVICE"];
@@ -137,7 +134,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
     #
@@ -246,7 +245,9 @@ in
 
   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,8 @@
-{
+{ lib
-  lib,
+, config
-  config,
+, flake-inputs
-  flake-inputs,
+, pkgs
-  pkgs,
+, ...
-  ...
 }:
 let
   domain = "foundryvtt.${config.services.nginx.domain}";
@@ -41,7 +40,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,7 +51,9 @@ in
         listenAddress = "127.0.0.1";
         group = "nginx";
 
-        settings.namespaces = lib.mapAttrsToList (name: virtualHost: {
+        settings.namespaces =
+          lib.mapAttrsToList
+            (name: virtualHost: {
               inherit name;
               metrics_override.prefix = "nginxlog";
               namespace_label = "vhost";
@@ -63,8 +66,11 @@ in
                 ''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/options.nix

@@ -1,8 +1,7 @@
-{
+{ pkgs
-  pkgs,
+, config
-  config,
+, lib
-  lib,
+, ...
-  ...
 }:
 let
   inherit (lib) types mkOption mkDefault;
@@ -12,8 +11,7 @@ in
   options = {
     services.prometheus = {
       extraExporters = mkOption {
-        type = types.attrsOf (
+        type = types.attrsOf (types.submodule {
-          types.submodule {
           options = {
             port = mkOption {
               type = types.int;
@@ -29,16 +27,15 @@ in
               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 = {
           job_name = mkOption {
             type = types.str;
@@ -65,8 +62,7 @@ in
 
           static_configs = mkOption {
             default = [ ];
-                type = types.listOf (
+            type = types.listOf (types.submodule {
-                  types.submodule {
               options = {
                 targets = mkOption {
                   type = types.listOf types.str;
@@ -84,22 +80,18 @@ in
                   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 =
                         scrape.static_configs
                         ++ lib.optional (scrape.targets != [ ]) { targets = scrape.targets; };
-                } scrape.extraSettings
+                    }
-              ) 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
+        (_: exporter: {
           targets = [ "${exporter.listenAddress}:${toString exporter.port}" ];
-      }) allExporters;
+        })
+        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,8 +1,7 @@
-{
+{ pkgs
-  pkgs,
+, config
-  config,
+, lib
-  lib,
+, ...
-  ...
 }:
 let
   # Update pending on rewrite of nextcloud news, though there is an
@@ -16,8 +15,8 @@ in
     inherit hostName;
 
     package = nextcloud;
-    phpPackage = lib.mkForce (
+    phpPackage = lib.mkForce
-      pkgs.php.override {
+      (pkgs.php.override {
         packageOverrides = final: prev: {
           extensions = prev.extensions // {
             pgsql = prev.extensions.pgsql.overrideAttrs (old: {
@@ -28,8 +27,7 @@ in
             });
           };
         };
-      }
+      });
-    );
     enable = true;
     maxUploadSize = "2G";
     https = true;
@@ -54,14 +52,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.nix

@@ -33,14 +33,13 @@
   };
 
   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};
@@ -85,12 +84,7 @@
           };
 
           sshUser = "tlater";
-          sshOpts = [
+          sshOpts = [ "-p" "2222" "-o" "ForwardAgent=yes" ];
-            "-p"
-            "2222"
-            "-o"
-            "ForwardAgent=yes"
-          ];
         };
       };
 
@@ -150,11 +144,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}" {
             serviceConfig.ExecCondition = ''${pkgs.runtimeShell} -c '${confirm}' '';
-        }
+          })
-      ) config.security.acme.certs;
+        config.security.acme.certs;
   };
 }

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