only cross compile when necessary

Co-authored-by: System administrator <root@skrot.pvv.ntnu.no>
Reviewed-on: https://git.pvv.ntnu.no/Drift/pvv-nixos-config/pulls/124
Co-authored-by: Vegard Bieker Matthey <VegardMatthey@protonmail.com>
Co-committed-by: Vegard Bieker Matthey <VegardMatthey@protonmail.com>

.sops.yaml

@@ -20,8 +20,9 @@ keys:
   - &host_lupine-3 age1j2u876z8hu87q5npfxzzpfgllyw8ypj66d7cgelmzmnrf3xud34qzkntp9
   - &host_lupine-4 age1t8zlawqkmhye737pn8yx0z3p9cl947d9ktv2cajdc6hnvn52d3fsc59s2k
   - &host_lupine-5 age199zkqq4jp4yc3d0hx2q0ksxdtp42xhmjsqwyngh8tswuck34ke3smrfyqu
-  - &host_skrott age1hlvwswsljxsvrtp4leuw8a8rf8l2q6y06xvxtafvzpq54xm9aegs0kqw2e
+  - &host_skrott age1lpkju2e053aaddpgsr4ef83epclf4c9tp4m98d35ft2fswr8p4tq2ua0mf
   - &host_ustetind age1hffjafs4slznksefmtqrlj7rdaqgzqncn4un938rhr053237ry8s3rs0v8
+  - &host_skrot age1hzkvnktkr8t5gvtq0ccw69e44z5z6wf00n3xhk3hj24emf07je5s6q2evr
 
 creation_rules:
   # Global secrets
@@ -144,5 +145,18 @@ creation_rules:
       - *user_pederbs_sopp
       - *user_pederbs_nord
       - *user_pederbs_bjarte
+      - *user_vegardbm
+      pgp:
+      - *user_oysteikt
+  - path_regex: secrets/skrot/[^/]+\.yaml$
+    key_groups:
+    - age:
+      - *host_skrot
+      - *user_danio
+      - *user_felixalb
+      - *user_pederbs_sopp
+      - *user_pederbs_nord
+      - *user_pederbs_bjarte
+      - *user_vegardbm
       pgp:
       - *user_oysteikt

README.md

@@ -43,7 +43,7 @@ revert the changes on the next nightly rebuild (tends to happen when everybody i
 | [kommode][kom]             | Virtual  | Gitea + Gitea pages                                       |
 | [lupine][lup]              | Physical | Gitea CI/CD runners                                       |
 |  shark                     | Virtual  | Test host for authentication, absolutely horrendous       |
-| [skrott][skr]              | Physical | Kiosk, snacks and soda                                    |
+| [skrot/skrott][skr]        | Physical | Kiosk, snacks and soda                                    |
 | [wenche][wen]              | Virtual  | Nix-builders, general purpose compute                     |
 
 ## Documentation

base/nix.nix

@@ -1,4 +1,9 @@
-{ lib, config, inputs, ... }:
+{
+  lib,
+  config,
+  inputs,
+  ...
+}:
 {
   nix = {
     gc = {
@@ -11,12 +16,17 @@
       allow-dirty = true;
       auto-allocate-uids = true;
       builders-use-substitutes = true;
-      experimental-features = [ "nix-command" "flakes" "auto-allocate-uids" ];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+        "auto-allocate-uids"
+      ];
       log-lines = 50;
       use-xdg-base-directories = true;
     };
 
-    /* This makes commandline tools like
+    /*
+      This makes commandline tools like
       ** nix run nixpkgs#hello
       ** and nix-shell -p hello
       ** use the same channel the system

base/programs.nix

@@ -19,6 +19,9 @@
     # Check computer specs
     lshw
 
+    # Check who is keeping open files
+    lsof
+
     # Scan for open ports with netstat
     net-tools
 

base/services/acme.nix

@@ -2,7 +2,7 @@
 {
   security.acme = {
     acceptTerms = true;
-    defaults.email = "drift@pvv.ntnu.no";
+    defaults.email = "acme-drift@pvv.ntnu.no";
   };
 
   # Let's not spam LetsEncrypt in `nixos-rebuild build-vm` mode:

base/services/auto-upgrade.nix

@@ -1,4 +1,10 @@
-{ config, inputs, pkgs, lib, ... }:
+{
+  config,
+  inputs,
+  pkgs,
+  lib,
+  ...
+}:
 
 let
   inputUrls = lib.mapAttrs (input: value: value.url) (import "${inputs.self}/flake.nix").inputs;
@@ -16,25 +22,33 @@ in
       # --update-input is deprecated since nix 2.22, and removed in lix 2.90
       # as such we instead use --override-input combined with --refresh
       # https://git.lix.systems/lix-project/lix/issues/400
-    ] ++ (lib.pipe inputUrls [
+    ]
+    ++ (lib.pipe inputUrls [
       (lib.intersectAttrs {
         nixpkgs = { };
         nixpkgs-unstable = { };
       })
-      (lib.mapAttrsToList (input: url: ["--override-input" input url]))
+      (lib.mapAttrsToList (
+        input: url: [
+          "--override-input"
+          input
+          url
+        ]
+      ))
       lib.concatLists
     ]);
   };
 
   # workaround for https://github.com/NixOS/nix/issues/6895
   # via https://git.lix.systems/lix-project/lix/issues/400
-  environment.etc = lib.mkIf (!config.virtualisation.isVmVariant && config.system.autoUpgrade.enable) {
-    "current-system-flake-inputs.json".source
-      = pkgs.writers.writeJSON "flake-inputs.json" (
-        lib.flip lib.mapAttrs inputs (name: input:
+  environment.etc =
+    lib.mkIf (!config.virtualisation.isVmVariant && config.system.autoUpgrade.enable)
+      {
+        "current-system-flake-inputs.json".source = pkgs.writers.writeJSON "flake-inputs.json" (
+          lib.flip lib.mapAttrs inputs (
+            name: input:
             # inputs.*.sourceInfo sans outPath, since writeJSON will otherwise serialize sourceInfo like a derivation
-          lib.removeAttrs (input.sourceInfo or {}) [ "outPath" ]
-            // { store-path = input.outPath; } # comment this line if you don't want to retain a store reference to the flake inputs
+            lib.removeAttrs (input.sourceInfo or { }) [ "outPath" ] // { store-path = input.outPath; } # comment this line if you don't want to retain a store reference to the flake inputs
           )
         );
       };

base/services/journald-upload.nix

@@ -1,4 +1,9 @@
-{ config, lib, values, ... }:
+{
+  config,
+  lib,
+  values,
+  ...
+}:
 let
   cfg = config.services.journald.upload;
 in

base/services/logrotate.nix

@@ -1,7 +1,10 @@
 { ... }:
 {
   systemd.services.logrotate = {
-    documentation = [ "man:logrotate(8)" "man:logrotate.conf(5)" ];
+    documentation = [
+      "man:logrotate(8)"
+      "man:logrotate.conf(5)"
+    ];
     unitConfig.RequiresMountsFor = "/var/log";
     serviceConfig.ReadWritePaths = [ "/var/log" ];
   };

base/services/nginx.nix

@@ -11,7 +11,10 @@
     };
   };
 
-  networking.firewall.allowedTCPPorts = lib.mkIf config.services.nginx.enable [ 80 443 ];
+  networking.firewall.allowedTCPPorts = lib.mkIf config.services.nginx.enable [
+    80
+    443
+  ];
 
   services.nginx = {
     recommendedTlsSettings = true;

base/services/openssh.nix

@@ -18,4 +18,3 @@
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICCbgJ0Uwh9VSVhfId7l9i5/jk4CvAK5rbkiab8R+moF root@sleipner"
   ];
 }
-

base/services/postfix.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   cfg = config.services.postfix;
 in

base/services/prometheus-node-exporter.nix

@@ -1,4 +1,9 @@
-{ config, lib, values, ... }:
+{
+  config,
+  lib,
+  values,
+  ...
+}:
 let
   cfg = config.services.prometheus.exporters.node;
 in

base/services/prometheus-systemd-exporter.nix

@@ -1,4 +1,9 @@
-{ config, lib, values, ... }:
+{
+  config,
+  lib,
+  values,
+  ...
+}:
 let
   cfg = config.services.prometheus.exporters.systemd;
 in

base/services/promtail.nix

@@ -1,4 +1,9 @@
-{ config, lib, values, ... }:
+{
+  config,
+  lib,
+  values,
+  ...
+}:
 let
   cfg = config.services.prometheus.exporters.node;
 in
@@ -10,10 +15,13 @@ in
         http_listen_port = 28183;
         grpc_listen_port = 0;
       };
-      clients = [{
+      clients = [
+        {
           url = "http://ildkule.pvv.ntnu.no:3100/loki/api/v1/push";
-      }];
-      scrape_configs = [{
+        }
+      ];
+      scrape_configs = [
+        {
           job_name = "systemd-journal";
           journal = {
             max_age = "12h";
@@ -32,7 +40,8 @@ in
               target_label = "level";
             }
           ];
-      }];
+        }
+      ];
     };
   };
 }

base/services/smartd.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {
   services.smartd = {
     # NOTE: qemu guests tend not to have SMART-reporting disks. Please override for the
@@ -14,9 +19,12 @@
     };
   };
 
-  environment.systemPackages = lib.optionals config.services.smartd.enable (with pkgs; [
+  environment.systemPackages = lib.optionals config.services.smartd.enable (
+    with pkgs;
+    [
       smartmontools
-  ]);
+    ]
+  );
 
   systemd.services.smartd.unitConfig.ConditionVirtualization = "no";
 }

base/services/uptimed.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   cfg = config.services.uptimed;
 in
@@ -15,16 +20,19 @@ in
     services.uptimed = {
       enable = true;
 
-      settings = let
+      settings =
+        let
           stateDir = "/var/lib/uptimed";
-      in {
+        in
+        {
           PIDFILE = "${stateDir}/pid";
           SENDMAIL = lib.mkDefault "${pkgs.system-sendmail}/bin/sendmail -t";
         };
     };
 
     systemd.services.uptimed = lib.mkIf (cfg.enable) {
-      serviceConfig = let
+      serviceConfig =
+        let
           uptimed = pkgs.uptimed.overrideAttrs (prev: {
             postPatch = ''
               substituteInPlace Makefile.am \
@@ -34,23 +42,23 @@ in
             '';
           });
 
-      in {
+        in
+        {
           Type = "notify";
 
           ExecStart = lib.mkForce "${uptimed}/sbin/uptimed -f";
 
-        BindReadOnlyPaths = let
+          BindReadOnlyPaths =
+            let
               configFile = lib.pipe cfg.settings [
-            (lib.mapAttrsToList
-              (k: v:
-                if builtins.isList v
-                  then lib.mapConcatStringsSep "\n" (v': "${k}=${v'}") v
-                  else "${k}=${v}")
-            )
+                (lib.mapAttrsToList (
+                  k: v: if builtins.isList v then lib.mapConcatStringsSep "\n" (v': "${k}=${v'}") v else "${k}=${v}"
+                ))
                 (lib.concatStringsSep "\n")
                 (pkgs.writeText "uptimed.conf")
               ];
-        in [
+            in
+            [
               "${configFile}:/var/lib/uptimed/uptimed.conf"
             ];
         };

base/sops.nix

@@ -1,8 +1,15 @@
-{ config, fp, lib, ... }:
 {
-  sops.defaultSopsFile = let
+  config,
+  fp,
+  lib,
+  ...
+}:
+{
+  sops.defaultSopsFile =
+    let
       secretsFilePath = fp /secrets/${config.networking.hostName}/${config.networking.hostName}.yaml;
-  in lib.mkIf (builtins.pathExists secretsFilePath) secretsFilePath;
+    in
+    lib.mkIf (builtins.pathExists secretsFilePath) secretsFilePath;
 
   sops.age = lib.mkIf (config.sops.defaultSopsFile != null) {
     sshKeyPaths = lib.mkDefault [ "/etc/ssh/ssh_host_ed25519_key" ];

docs/secret-management.md

@@ -151,7 +151,7 @@ is up to date, you can do the following:
 
 ```console
 # Fetch gpg (unless you have it already)
-nix-shell -p gpg
+nix shell nixpkgs#gnupg
 
 # Import oysteikts key to the gpg keychain
 gpg --import ./keys/oysteikt.pub

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769510541,
-        "narHash": "sha256-jxuQY0anT3YpwpnYB5w7p6EPS6UWIj4vGxzfsOJvC1I=",
+        "lastModified": 1770133120,
+        "narHash": "sha256-RuAWONXb+U3omSsuIPCrPcgj0XYqv+2djG0cnPGEyKg=",
         "ref": "main",
-        "rev": "ec43f67e58f049a709fa2c19601b8c637f38126f",
-        "revCount": 232,
+        "rev": "3123b8b474319bc75ee780e0357dcdea69dc85e6",
+        "revCount": 244,
         "type": "git",
         "url": "https://git.pvv.ntnu.no/Projects/dibbler.git"
       },
@@ -195,11 +195,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767906352,
-        "narHash": "sha256-wYsH9MMAPFG3XTL+3DwI39XMG0F2fTmn/5lt265a3Es=",
+        "lastModified": 1770960722,
+        "narHash": "sha256-IdhPsWFZUKSJh/nLjGLJvGM5d5Uta+k1FlVYPxTZi0E=",
         "ref": "main",
-        "rev": "d054c5d064b8ed6d53a0adb0cf6c0a72febe212e",
-        "revCount": 13,
+        "rev": "c2e4aca7e1ba27cd09eeaeab47010d32a11841b2",
+        "revCount": 15,
         "type": "git",
         "url": "https://git.pvv.ntnu.no/Drift/nix-gitea-themes.git"
       },
@@ -233,11 +233,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1769484787,
-        "narHash": "sha256-ufhG9uSA8cCEk/97D/7xQEKcO/ftr4IPRH+HQFaKNdE=",
-        "rev": "999ca0e5484922624254294ea1adc2b90081579e",
+        "lastModified": 1769724120,
+        "narHash": "sha256-oQBM04hQk1kotfv4qmIG1tHmuwODd1+hqRJE5TELeCE=",
+        "rev": "8ec59ed5093c2a742d7744e9ecf58f358aa4a87d",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/25.11-small/nixos-25.11.4804.999ca0e54849/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/25.11-small/nixos-25.11.4961.8ec59ed5093c/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -261,11 +261,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1769434638,
-        "narHash": "sha256-u19M4QdjvjEySkGhP4fUNyY6rqAbPCdQf/AFw04CkQU=",
-        "rev": "9c2822d7024c032e66000a8b8a47e91b4e63ffc8",
+        "lastModified": 1769813739,
+        "narHash": "sha256-RmNWW1DQczvDwBHu11P0hGwJZxbngdoymVu7qkwq/2M=",
+        "rev": "16a3cae5c2487b1afa240e5f2c1811f172419558",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable-small/nixos-26.05pre935000.9c2822d7024c/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/unstable-small/nixos-26.05pre937548.16a3cae5c248/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -364,11 +364,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1769325266,
-        "narHash": "sha256-q2G2NG7I1tvfFK4GDnn3vt1CCg0GN4ncdo0NSY+Q2Nc=",
+        "lastModified": 1769834595,
+        "narHash": "sha256-P1jrO7BxHyIKDuOXHuUb7bi4H2TuYnACW5eqf1gG47g=",
         "ref": "main",
-        "rev": "23b163e828901cb981eec6f3262e922f437f850b",
-        "revCount": 45,
+        "rev": "def4eec2d59a69b4638b3f25d6d713b703b2fa56",
+        "revCount": 49,
         "type": "git",
         "url": "https://git.pvv.ntnu.no/Projects/roowho2.git"
       },

flake.nix

@@ -49,7 +49,15 @@
     qotd.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, sops-nix, disko, ... }@inputs:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      nixpkgs-unstable,
+      sops-nix,
+      disko,
+      ...
+    }@inputs:
     let
       inherit (nixpkgs) lib;
       systems = [
@@ -66,23 +74,27 @@
         "georg"
         "ildkule"
       ];
-  in {
+    in
+    {
       inputs = lib.mapAttrs (_: src: src.outPath) inputs;
 
-    pkgs = forAllSystems (system: import nixpkgs {
+      pkgs = forAllSystems (
+        system:
+        import nixpkgs {
           inherit system;
-      config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg)
-        [
+          config.allowUnfreePredicate =
+            pkg:
+            builtins.elem (lib.getName pkg) [
               "nvidia-x11"
               "nvidia-settings"
             ];
-    });
+        }
+      );
 
-    nixosConfigurations = let
+      nixosConfigurations =
+        let
           nixosConfig =
-        nixpkgs:
-        name:
-        configurationPath:
+            nixpkgs: name: configurationPath:
             extraArgs@{
               localSystem ? "x86_64-linux", # buildPlatform
               crossSystem ? "x86_64-linux", # hostPlatform
@@ -94,7 +106,6 @@
             }:
             let
               commonPkgsConfig = {
-            inherit localSystem crossSystem;
                 config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg)
                   [
                     "nvidia-x11"
@@ -104,12 +115,17 @@
                   # Global overlays go here
                   inputs.roowho2.overlays.default
                 ]) ++ overlays;
-          };
+              } // (if localSystem != crossSystem then {
+                inherit localSystem crossSystem;
+              } else {
+                system = crossSystem;
+              });
 
               pkgs = import nixpkgs commonPkgsConfig;
               unstablePkgs = import nixpkgs-unstable commonPkgsConfig;
             in
-        lib.nixosSystem (lib.recursiveUpdate
+            lib.nixosSystem (
+              lib.recursiveUpdate
                 {
                   system = crossSystem;
 
@@ -119,32 +135,38 @@
                     inherit inputs unstablePkgs;
                     values = import ./values.nix;
                     fp = path: ./${path};
-          } // specialArgs;
+                  }
+                  // specialArgs;
 
                   modules = [
                     {
                       networking.hostName = lib.mkDefault name;
                     }
                     configurationPath
-          ] ++ (lib.optionals enableDefaults [
+                  ]
+                  ++ (lib.optionals enableDefaults [
                     sops-nix.nixosModules.sops
                     inputs.roowho2.nixosModules.default
                     self.nixosModules.rsync-pull-targets
-          ]) ++ modules;
+                  ])
+                  ++ modules;
                 }
-        (builtins.removeAttrs extraArgs [
+                (
+                  builtins.removeAttrs extraArgs [
                     "localSystem"
                     "crossSystem"
                     "modules"
                     "overlays"
                     "specialArgs"
                     "enableDefaults"
-        ])
+                  ]
+                )
             );
 
-      stableNixosConfig = name: extraArgs:
-          nixosConfig nixpkgs name ./hosts/${name}/configuration.nix extraArgs;
-    in {
+          stableNixosConfig =
+            name: extraArgs: nixosConfig nixpkgs name ./hosts/${name}/configuration.nix extraArgs;
+        in
+        {
           bakke = stableNixosConfig "bakke" {
             modules = [
               inputs.disko.nixosModules.disko
@@ -184,6 +206,13 @@
           };
           ildkule = stableNixosConfig "ildkule" { };
           #ildkule-unstable = unstableNixosConfig "ildkule" { };
+          skrot = stableNixosConfig "skrot" {
+            modules = [
+              inputs.disko.nixosModules.disko
+              inputs.dibbler.nixosModules.default
+            ];
+            overlays = [ inputs.dibbler.overlays.default ];
+          };
           shark = stableNixosConfig "shark" { };
           wenche = stableNixosConfig "wenche" { };
           temmie = stableNixosConfig "temmie" { };
@@ -228,8 +257,8 @@
             ];
           };
         }
-    //
-    (let
+        // (
+          let
             skrottConfig = {
               modules = [
                 (nixpkgs + "/nixos/modules/installer/sd-card/sd-image-aarch64.nix")
@@ -245,30 +274,46 @@
                 })
               ];
             };
-    in {
+          in
+          {
             skrott = self.nixosConfigurations.skrott-native;
-      skrott-native = stableNixosConfig "skrott" (skrottConfig // {
+            skrott-native = stableNixosConfig "skrott" (
+              skrottConfig
+              // {
                 localSystem = "aarch64-linux";
                 crossSystem = "aarch64-linux";
-      });
-      skrott-cross = stableNixosConfig "skrott" (skrottConfig // {
+              }
+            );
+            skrott-cross = stableNixosConfig "skrott" (
+              skrottConfig
+              // {
                 localSystem = "x86_64-linux";
                 crossSystem = "aarch64-linux";
-      });
-      skrott-x86_64 = stableNixosConfig "skrott" (skrottConfig // {
+              }
+            );
+            skrott-x86_64 = stableNixosConfig "skrott" (
+              skrottConfig
+              // {
                 localSystem = "x86_64-linux";
                 crossSystem = "x86_64-linux";
-      });
-    })
-    //
-    (let
+              }
+            );
+          }
+        )
+        // (
+          let
             machineNames = map (i: "lupine-${toString i}") (lib.range 1 5);
-      stableLupineNixosConfig = name: extraArgs:
-          nixosConfig nixpkgs name ./hosts/lupine/configuration.nix extraArgs;
-    in lib.genAttrs machineNames (name: stableLupineNixosConfig name {
+            stableLupineNixosConfig =
+              name: extraArgs: nixosConfig nixpkgs name ./hosts/lupine/configuration.nix extraArgs;
+          in
+          lib.genAttrs machineNames (
+            name:
+            stableLupineNixosConfig name {
               modules = [ { networking.hostName = name; } ];
               specialArgs.lupineName = name;
-    }));
+            }
+          )
+        );
 
       nixosModules = {
         bluemap = ./modules/bluemap.nix;
@@ -281,7 +326,8 @@
       };
 
       devShells = forAllSystems (system: {
-      default = let
+        default =
+          let
             pkgs = import nixpkgs-unstable {
               inherit system;
               overlays = [
@@ -290,8 +336,10 @@
                 })
               ];
             };
-      in pkgs.callPackage ./shell.nix { };
-      cuda = let
+          in
+          pkgs.callPackage ./shell.nix { };
+        cuda =
+          let
             cuda-pkgs = import nixpkgs-unstable {
               inherit system;
               config = {
@@ -299,19 +347,22 @@
                 cudaSupport = true;
               };
             };
-      in cuda-pkgs.callPackage ./shells/cuda.nix { };
+          in
+          cuda-pkgs.callPackage ./shells/cuda.nix { };
       });
 
       packages = {
-      "x86_64-linux" = let
+        "x86_64-linux" =
+          let
             system = "x86_64-linux";
             pkgs = nixpkgs.legacyPackages.${system};
-      in rec {
+          in
+          rec {
             default = important-machines;
-        important-machines = pkgs.linkFarm "important-machines"
-          (lib.getAttrs importantMachines self.packages.${system});
-        all-machines = pkgs.linkFarm "all-machines"
-          (lib.getAttrs allMachines self.packages.${system});
+            important-machines = pkgs.linkFarm "important-machines" (
+              lib.getAttrs importantMachines self.packages.${system}
+            );
+            all-machines = pkgs.linkFarm "all-machines" (lib.getAttrs allMachines self.packages.${system});
 
             simplesamlphp = pkgs.callPackage ./packages/simplesamlphp { };
 
@@ -323,13 +374,15 @@
             # Mediawiki extensions
             (lib.pipe null [
               (_: pkgs.callPackage ./packages/mediawiki-extensions { })
-        (lib.flip builtins.removeAttrs ["override" "overrideDerivation"])
+              (lib.flip builtins.removeAttrs [
+                "override"
+                "overrideDerivation"
+              ])
               (lib.mapAttrs' (name: lib.nameValuePair "mediawiki-${name}"))
             ])
           //
             # Machines
-      lib.genAttrs allMachines
-        (machine: self.nixosConfigurations.${machine}.config.system.build.toplevel)
+            lib.genAttrs allMachines (machine: self.nixosConfigurations.${machine}.config.system.build.toplevel)
           //
             # Skrott is exception
             {
@@ -342,7 +395,8 @@
             }
           //
             # Nix-topology
-      (let
+            (
+              let
                 topology' = import inputs.nix-topology {
                   pkgs = import nixpkgs {
                     inherit system;
@@ -361,7 +415,9 @@
                   modules = [
                     ./topology
                     {
-              nixosConfigurations = lib.mapAttrs (_name: nixosCfg: nixosCfg.extendModules {
+                      nixosConfigurations = lib.mapAttrs (
+                        _name: nixosCfg:
+                        nixosCfg.extendModules {
                           modules = [
                             inputs.nix-topology.nixosModules.default
                             ./topology/service-extractors/greg-ng.nix
@@ -369,21 +425,27 @@
                             ./topology/service-extractors/mysql.nix
                             ./topology/service-extractors/gitea-runners.nix
                           ];
-              }) self.nixosConfigurations;
+                        }
+                      ) self.nixosConfigurations;
                     }
                   ];
                 };
-      in {
+              in
+              {
                 topology = topology'.config.output;
-        topology-png = pkgs.runCommand "pvv-config-topology-png" {
+                topology-png =
+                  pkgs.runCommand "pvv-config-topology-png"
+                    {
                       nativeBuildInputs = [ pkgs.writableTmpDirAsHomeHook ];
-        } ''
+                    }
+                    ''
                       mkdir -p "$out"
                       for file in '${topology'.config.output}'/*.svg; do
                         ${lib.getExe pkgs.imagemagick} -density 300 -background none "$file" "$out"/"$(basename "''${file%.svg}.png")"
                       done
                     '';
-      });
+              }
+            );
       };
     };
 }

hosts/bakke/configuration.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, values, ... }:
+{
+  config,
+  pkgs,
+  values,
+  ...
+}:
 {
   imports = [
     ./hardware-configuration.nix
@@ -9,7 +14,10 @@
   networking.hostId = "99609ffc";
   systemd.network.networks."30-enp2s0" = values.defaultNetworkConfig // {
     matchConfig.Name = "enp2s0";
-    address = with values.hosts.bakke; [ (ipv4 + "/25") (ipv6 + "/64") ];
+    address = with values.hosts.bakke; [
+      (ipv4 + "/25")
+      (ipv6 + "/64")
+    ];
   };
 
   # Don't change (even during upgrades) unless you know what you are doing.

hosts/bakke/hardware-configuration.nix

@@ -1,40 +1,58 @@
 # Do not modify this file!  It was generated by 'nixos-generate-config'
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "ehci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/0f63c3d2-fc12-4ed5-a5a5-141bfd67a571";
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/0f63c3d2-fc12-4ed5-a5a5-141bfd67a571";
     fsType = "btrfs";
     options = [ "subvol=root" ];
   };
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/0f63c3d2-fc12-4ed5-a5a5-141bfd67a571";
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/0f63c3d2-fc12-4ed5-a5a5-141bfd67a571";
     fsType = "btrfs";
     options = [ "subvol=home" ];
   };
 
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/0f63c3d2-fc12-4ed5-a5a5-141bfd67a571";
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/0f63c3d2-fc12-4ed5-a5a5-141bfd67a571";
     fsType = "btrfs";
-      options = [ "subvol=nix" "noatime" ];
+    options = [
+      "subvol=nix"
+      "noatime"
+    ];
   };
 
-  fileSystems."/boot" =
-    { device = "/dev/sdc2";
+  fileSystems."/boot" = {
+    device = "/dev/sdc2";
     fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
   };
 
   swapDevices = [ ];

hosts/bekkalokk/configuration.nix

@@ -1,4 +1,9 @@
-{ fp, pkgs, values, ... }:
+{
+  fp,
+  pkgs,
+  values,
+  ...
+}:
 {
   imports = [
     ./hardware-configuration.nix
@@ -21,7 +26,10 @@
 
   systemd.network.networks."30-enp2s0" = values.defaultNetworkConfig // {
     matchConfig.Name = "enp2s0";
-    address = with values.hosts.bekkalokk; [ (ipv4 + "/25") (ipv6 + "/64") ];
+    address = with values.hosts.bekkalokk; [
+      (ipv4 + "/25")
+      (ipv6 + "/64")
+    ];
   };
 
   services.btrfs.autoScrub.enable = true;

hosts/bekkalokk/hardware-configuration.nix

@@ -1,30 +1,42 @@
 # Do not modify this file!  It was generated by 'nixos-generate-config'
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "ehci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/sda1";
+  fileSystems."/" = {
+    device = "/dev/sda1";
     fsType = "btrfs";
   };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/CE63-3B9B";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/CE63-3B9B";
     fsType = "vfat";
   };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/2df10c7b-0dec-45c6-a728-533f7da7f4b9"; }
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/2df10c7b-0dec-45c6-a728-533f7da7f4b9"; }
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/bekkalokk/services/bluemap.nix

@@ -1,8 +1,15 @@
-{ config, lib, pkgs, inputs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}:
 let
   vanillaSurvival = "/var/lib/bluemap/vanilla_survival_world";
   format = pkgs.formats.hocon { };
-in {
+in
+{
   # NOTE: our versino of the module gets added in flake.nix
   disabledModules = [ "services/web-apps/bluemap.nix" ];
 
@@ -17,9 +24,11 @@ in {
 
     host = "minecraft.pvv.ntnu.no";
 
-    maps = let
+    maps =
+      let
         inherit (inputs.minecraft-kartverket.packages.${pkgs.stdenv.hostPlatform.system}) bluemap-export;
-    in {
+      in
+      {
         "verden" = {
           extraHoconMarkersFile = "${bluemap-export}/overworld.hocon";
           settings = {
@@ -53,9 +62,11 @@ in {
             remove-caves-below-y = -10000;
             cave-detection-ocean-floor = -5;
             cave-detection-uses-block-light = true;
-          render-mask = [{
+            render-mask = [
+              {
                 max-y = 90;
-          }];
+              }
+            ];
           };
         };
         "enden" = {
@@ -83,7 +94,8 @@ in {
   systemd.services."render-bluemap-maps" = {
     serviceConfig = {
       StateDirectory = [ "bluemap/world" ];
-      ExecStartPre = let
+      ExecStartPre =
+        let
           rsyncArgs = lib.cli.toCommandLineShellGNU { } {
             archive = true;
             compress = true;
@@ -92,7 +104,8 @@ in {
             no-group = true;
             rsh = "${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=%d/ssh-known-hosts -i %d/sshkey";
           };
-      in "${lib.getExe pkgs.rsync} ${rsyncArgs} root@innovation.pvv.ntnu.no:/ ${vanillaSurvival}";
+        in
+        "${lib.getExe pkgs.rsync} ${rsyncArgs} root@innovation.pvv.ntnu.no:/ ${vanillaSurvival}";
       LoadCredential = [
         "sshkey:${config.sops.secrets."bluemap/ssh-key".path}"
         "ssh-known-hosts:${config.sops.secrets."bluemap/ssh-known-hosts".path}"

hosts/bekkalokk/services/idp-simplesamlphp/default.nix

@@ -1,8 +1,16 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   pwAuthScript = pkgs.writeShellApplication {
     name = "pwauth";
-    runtimeInputs = with pkgs; [ coreutils heimdal ];
+    runtimeInputs = with pkgs; [
+      coreutils
+      heimdal
+    ];
     text = ''
       read -r user1
       user2="$(echo -n "$user1" | tr -c -d '0123456789abcdefghijklmnopqrstuvwxyz')"
@@ -85,14 +93,20 @@ let
 
         substituteInPlace "$out" \
           --replace-warn '$SAML_COOKIE_SECURE' 'true' \
-          --replace-warn '$SAML_COOKIE_SALT' 'file_get_contents("${config.sops.secrets."idp/cookie_salt".path}")' \
+          --replace-warn '$SAML_COOKIE_SALT' 'file_get_contents("${
+            config.sops.secrets."idp/cookie_salt".path
+          }")' \
           --replace-warn '$SAML_ADMIN_NAME' '"Drift"' \
           --replace-warn '$SAML_ADMIN_EMAIL' '"drift@pvv.ntnu.no"' \
-          --replace-warn '$SAML_ADMIN_PASSWORD' 'file_get_contents("${config.sops.secrets."idp/admin_password".path}")' \
+          --replace-warn '$SAML_ADMIN_PASSWORD' 'file_get_contents("${
+            config.sops.secrets."idp/admin_password".path
+          }")' \
           --replace-warn '$SAML_TRUSTED_DOMAINS' 'array( "idp.pvv.ntnu.no" )' \
           --replace-warn '$SAML_DATABASE_DSN' '"pgsql:host=postgres.pvv.ntnu.no;port=5432;dbname=idp"' \
           --replace-warn '$SAML_DATABASE_USERNAME' '"idp"' \
-          --replace-warn '$SAML_DATABASE_PASSWORD' 'file_get_contents("${config.sops.secrets."idp/postgres_password".path}")' \
+          --replace-warn '$SAML_DATABASE_PASSWORD' 'file_get_contents("${
+            config.sops.secrets."idp/postgres_password".path
+          }")' \
           --replace-warn '$CACHE_DIRECTORY' '/var/cache/idp'
       '';
 
@@ -158,10 +172,12 @@ in
     services.phpfpm.pools.idp = {
       user = "idp";
       group = "idp";
-      settings = let
+      settings =
+        let
           listenUser = config.services.nginx.user;
           listenGroup = config.services.nginx.group;
-      in {
+        in
+        {
           "pm" = "dynamic";
           "pm.max_children" = 32;
           "pm.max_requests" = 500;

hosts/bekkalokk/services/kerberos.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {
   security.krb5 = {
     enable = true;

hosts/bekkalokk/services/mediawiki/default.nix

@@ -1,4 +1,12 @@
-{ pkgs, lib, fp, config, values, ... }: let
+{
+  pkgs,
+  lib,
+  fp,
+  config,
+  values,
+  ...
+}:
+let
   cfg = config.services.mediawiki;
 
   # "mediawiki"
@@ -9,7 +17,9 @@
 
   simplesamlphp = pkgs.simplesamlphp.override {
     extra_files = {
-      "metadata/saml20-idp-remote.php" = pkgs.writeText "mediawiki-saml20-idp-remote.php" (import ../idp-simplesamlphp/metadata.php.nix);
+      "metadata/saml20-idp-remote.php" = pkgs.writeText "mediawiki-saml20-idp-remote.php" (
+        import ../idp-simplesamlphp/metadata.php.nix
+      );
 
       "config/authsources.php" = ./simplesaml-authsources.php;
 
@@ -18,34 +28,47 @@
 
         substituteInPlace "$out" \
           --replace-warn '$SAML_COOKIE_SECURE' 'true' \
-          --replace-warn '$SAML_COOKIE_SALT' 'file_get_contents("${config.sops.secrets."mediawiki/simplesamlphp/cookie_salt".path}")' \
+          --replace-warn '$SAML_COOKIE_SALT' 'file_get_contents("${
+            config.sops.secrets."mediawiki/simplesamlphp/cookie_salt".path
+          }")' \
           --replace-warn '$SAML_ADMIN_NAME' '"Drift"' \
           --replace-warn '$SAML_ADMIN_EMAIL' '"drift@pvv.ntnu.no"' \
-          --replace-warn '$SAML_ADMIN_PASSWORD' 'file_get_contents("${config.sops.secrets."mediawiki/simplesamlphp/admin_password".path}")' \
+          --replace-warn '$SAML_ADMIN_PASSWORD' 'file_get_contents("${
+            config.sops.secrets."mediawiki/simplesamlphp/admin_password".path
+          }")' \
           --replace-warn '$SAML_TRUSTED_DOMAINS' 'array( "wiki.pvv.ntnu.no" )' \
           --replace-warn '$SAML_DATABASE_DSN' '"pgsql:host=postgres.pvv.ntnu.no;port=5432;dbname=mediawiki_simplesamlphp"' \
           --replace-warn '$SAML_DATABASE_USERNAME' '"mediawiki_simplesamlphp"' \
-          --replace-warn '$SAML_DATABASE_PASSWORD' 'file_get_contents("${config.sops.secrets."mediawiki/simplesamlphp/postgres_password".path}")' \
+          --replace-warn '$SAML_DATABASE_PASSWORD' 'file_get_contents("${
+            config.sops.secrets."mediawiki/simplesamlphp/postgres_password".path
+          }")' \
           --replace-warn '$CACHE_DIRECTORY' '/var/cache/mediawiki/idp'
       '';
     };
   };
-in {
+in
+{
   services.idp.sp-remote-metadata = [ "https://wiki.pvv.ntnu.no/simplesaml/" ];
 
-  sops.secrets = lib.pipe [
+  sops.secrets =
+    lib.pipe
+      [
         "mediawiki/secret-key"
         "mediawiki/password"
         "mediawiki/postgres_password"
         "mediawiki/simplesamlphp/postgres_password"
         "mediawiki/simplesamlphp/cookie_salt"
         "mediawiki/simplesamlphp/admin_password"
-  ] [
-    (map (key: lib.nameValuePair key {
+      ]
+      [
+        (map (
+          key:
+          lib.nameValuePair key {
             owner = user;
             group = group;
             restartUnits = [ "phpfpm-mediawiki.service" ];
-    }))
+          }
+        ))
         lib.listToAttrs
       ];
 
@@ -56,6 +79,7 @@ in {
       rrsyncArgs.ro = true;
       authorizedKeysAttrs = [
         "restrict"
+        "from=\"principal.pvv.ntnu.no,${values.hosts.principal.ipv6},${values.hosts.principal.ipv4}\""
         "no-agent-forwarding"
         "no-port-forwarding"
         "no-pty"
@@ -161,6 +185,24 @@ in {
       $wgDBserver = "${toString cfg.database.host}";
       $wgAllowCopyUploads = true;
 
+      # Files
+      $wgFileExtensions = [
+        'bmp',
+        'gif',
+        'jpeg',
+        'jpg',
+        'mp3',
+        'odg',
+        'odp',
+        'ods',
+        'odt',
+        'pdf',
+        'png',
+        'tiff',
+        'webm',
+        'webp',
+      ];
+
       # Misc program paths
       $wgFFmpegLocation = '${pkgs.ffmpeg}/bin/ffmpeg';
       $wgExiftool = '${pkgs.exiftool}/bin/exiftool';
@@ -196,7 +238,9 @@ in {
 
   # Cache directory for simplesamlphp
   # systemd.services.phpfpm-mediawiki.serviceConfig.CacheDirectory = "mediawiki/simplesamlphp";
-  systemd.tmpfiles.settings."10-mediawiki"."/var/cache/mediawiki/simplesamlphp".d = lib.mkIf cfg.enable {
+  systemd.tmpfiles.settings."10-mediawiki"."/var/cache/mediawiki/simplesamlphp".d =
+    lib.mkIf cfg.enable
+      {
         user = "mediawiki";
         group = "mediawiki";
         mode = "0770";
@@ -234,9 +278,12 @@ in {
 
       "= /PNG/PVV-logo.svg".alias = fp /assets/logo_blue_regular.svg;
       "= /PNG/PVV-logo.png".alias = fp /assets/logo_blue_regular.png;
-      "= /favicon.ico".alias = pkgs.runCommandLocal "mediawiki-favicon.ico" {
+      "= /favicon.ico".alias =
+        pkgs.runCommandLocal "mediawiki-favicon.ico"
+          {
             buildInputs = with pkgs; [ imagemagick ];
-      } ''
+          }
+          ''
             magick \
               ${fp /assets/logo_blue_regular.png} \
               -resize x64 \
@@ -254,16 +301,22 @@ in {
   systemd.services.mediawiki-init = lib.mkIf cfg.enable {
     after = [ "sops-install-secrets.service" ];
     serviceConfig = {
-      BindReadOnlyPaths = [ "/run/credentials/mediawiki-init.service/secret-key:/var/lib/mediawiki/secret.key" ];
+      BindReadOnlyPaths = [
+        "/run/credentials/mediawiki-init.service/secret-key:/var/lib/mediawiki/secret.key"
+      ];
       LoadCredential = [ "secret-key:${config.sops.secrets."mediawiki/secret-key".path}" ];
+      UMask = lib.mkForce "0007";
     };
   };
 
   systemd.services.phpfpm-mediawiki = lib.mkIf cfg.enable {
     after = [ "sops-install-secrets.service" ];
     serviceConfig = {
-      BindReadOnlyPaths = [ "/run/credentials/phpfpm-mediawiki.service/secret-key:/var/lib/mediawiki/secret.key" ];
+      BindReadOnlyPaths = [
+        "/run/credentials/phpfpm-mediawiki.service/secret-key:/var/lib/mediawiki/secret.key"
+      ];
       LoadCredential = [ "secret-key:${config.sops.secrets."mediawiki/secret-key".path}" ];
+      UMask = lib.mkForce "0007";
     };
   };
 }

hosts/bekkalokk/services/phpfpm.nix

@@ -11,7 +11,8 @@ in
 {
   # Source: https://www.pierreblazquez.com/2023/06/17/how-to-harden-apache-php-fpm-daemons-using-systemd/
   systemd.services = lib.genAttrs pools (_: {
-    serviceConfig = let
+    serviceConfig =
+      let
         caps = [
           "CAP_NET_BIND_SERVICE"
           "CAP_SETGID"
@@ -21,7 +22,8 @@ in
           "CAP_IPC_LOCK"
           "CAP_DAC_OVERRIDE"
         ];
-    in {
+      in
+      {
         AmbientCapabilities = caps;
         CapabilityBoundingSet = caps;
         DeviceAllow = [ "" ];

hosts/bekkalokk/services/vaultwarden.nix

@@ -1,11 +1,18 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  values,
+  ...
+}:
 let
   cfg = config.services.vaultwarden;
   domain = "pw.pvv.ntnu.no";
   address = "127.0.1.2";
   port = 3011;
   wsPort = 3012;
-in {
+in
+{
   sops.secrets."vaultwarden/environ" = {
     owner = "vaultwarden";
     group = "vaultwarden";
@@ -107,6 +114,7 @@ in {
       rrsyncArgs.ro = true;
       authorizedKeysAttrs = [
         "restrict"
+        "from=\"principal.pvv.ntnu.no,${values.hosts.principal.ipv6},${values.hosts.principal.ipv4}\""
         "no-agent-forwarding"
         "no-port-forwarding"
         "no-pty"

hosts/bekkalokk/services/webmail/default.nix

@@ -1,4 +1,10 @@
-{ config, values, pkgs, lib, ... }:
+{
+  config,
+  values,
+  pkgs,
+  lib,
+  ...
+}:
 {
   imports = [
     ./roundcube.nix

hosts/bekkalokk/services/webmail/roundcube.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 with lib;
 let
@@ -14,14 +19,24 @@ in
   services.roundcube = {
     enable = true;
 
-    package = pkgs.roundcube.withPlugins (plugins: with plugins; [
+    package = pkgs.roundcube.withPlugins (
+      plugins: with plugins; [
         persistent_login
         thunderbird_labels
         contextmenu
         custom_from
-    ]);
+      ]
+    );
 
-    dicts = with pkgs.aspellDicts; [ en en-computers nb nn fr de it ];
+    dicts = with pkgs.aspellDicts; [
+      en
+      en-computers
+      nb
+      nn
+      fr
+      de
+      it
+    ];
     maxAttachmentSize = 20;
     hostName = "roundcubeplaceholder.example.com";
 
@@ -54,7 +69,8 @@ in
         ln -s ${cfg.package} $out/roundcube
       '';
       extraConfig = ''
-        location ~ ^/roundcube/(${builtins.concatStringsSep "|" [
+        location ~ ^/roundcube/(${
+          builtins.concatStringsSep "|" [
             # https://wiki.archlinux.org/title/Roundcube
             "README"
             "INSTALL"
@@ -68,7 +84,8 @@ in
             "config"
             "temp"
             "logs"
-        ]})/? {
+          ]
+        })/? {
           deny all;
         }
 

hosts/bekkalokk/services/webmail/snappymail.nix

@@ -1,7 +1,15 @@
-{ config, lib, fp, pkgs, ... }:
+{
+  config,
+  lib,
+  fp,
+  pkgs,
+  values,
+  ...
+}:
 let
   cfg = config.services.snappymail;
-in {
+in
+{
   imports = [ (fp /modules/snappymail.nix) ];
 
   services.snappymail = {
@@ -22,6 +30,7 @@ in {
       rrsyncArgs.ro = true;
       authorizedKeysAttrs = [
         "restrict"
+        "from=\"principal.pvv.ntnu.no,${values.hosts.principal.ipv6},${values.hosts.principal.ipv4}\""
         "no-agent-forwarding"
         "no-port-forwarding"
         "no-pty"

hosts/bekkalokk/services/website/default.nix

@@ -1,18 +1,27 @@
-{ pkgs, lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 let
   format = pkgs.formats.php { };
   cfg = config.services.pvv-nettsiden;
-in {
+in
+{
   imports = [
     ./fetch-gallery.nix
   ];
 
-  sops.secrets = lib.genAttrs [
+  sops.secrets =
+    lib.genAttrs
+      [
         "nettsiden/door_secret"
         "nettsiden/mysql_password"
         "nettsiden/simplesamlphp/admin_password"
         "nettsiden/simplesamlphp/cookie_salt"
-  ] (_: {
+      ]
+      (_: {
         owner = config.services.phpfpm.pools.pvv-nettsiden.user;
         group = config.services.phpfpm.pools.pvv-nettsiden.group;
         restartUnits = [ "phpfpm-pvv-nettsiden.service" ];
@@ -35,8 +44,10 @@ in {
 
     package = pkgs.pvv-nettsiden.override {
       extra_files = {
-        "${pkgs.pvv-nettsiden.passthru.simplesamlphpPath}/metadata/saml20-idp-remote.php" = pkgs.writeText "pvv-nettsiden-saml20-idp-remote.php" (import ../idp-simplesamlphp/metadata.php.nix);
-        "${pkgs.pvv-nettsiden.passthru.simplesamlphpPath}/config/authsources.php" = pkgs.writeText "pvv-nettsiden-authsources.php" ''
+        "${pkgs.pvv-nettsiden.passthru.simplesamlphpPath}/metadata/saml20-idp-remote.php" =
+          pkgs.writeText "pvv-nettsiden-saml20-idp-remote.php" (import ../idp-simplesamlphp/metadata.php.nix);
+        "${pkgs.pvv-nettsiden.passthru.simplesamlphpPath}/config/authsources.php" =
+          pkgs.writeText "pvv-nettsiden-authsources.php" ''
             <?php
             $config = array(
                 'admin' => array(
@@ -54,9 +65,12 @@ in {
 
     domainName = "www.pvv.ntnu.no";
 
-    settings = let
-      includeFromSops = path: format.lib.mkRaw "file_get_contents('${config.sops.secrets."nettsiden/${path}".path}')";
-    in {
+    settings =
+      let
+        includeFromSops =
+          path: format.lib.mkRaw "file_get_contents('${config.sops.secrets."nettsiden/${path}".path}')";
+      in
+      {
         DOOR_SECRET = includeFromSops "door_secret";
 
         DB = {

hosts/bekkalokk/services/website/fetch-gallery.nix

@@ -1,8 +1,21 @@
-{ pkgs, lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  values,
+  ...
+}:
 let
   galleryDir = config.services.pvv-nettsiden.settings.GALLERY.DIR;
   transferDir = "${config.services.pvv-nettsiden.settings.GALLERY.DIR}-transfer";
-in {
+in
+{
+  users.users.${config.services.pvv-nettsiden.user} = {
+    # NOTE: the user unfortunately needs a registered shell for rrsync to function...
+    #       is there anything we can do to remove this?
+    useDefaultShell = true;
+  };
+
   # This is pushed from microbel:/var/www/www-gallery/build-gallery.sh
   services.rsync-pull-targets = {
     enable = true;
@@ -11,6 +24,7 @@ in {
       rrsyncArgs.wo = true;
       authorizedKeysAttrs = [
         "restrict"
+        "from=\"microbel.pvv.ntnu.no,${values.hosts.microbel.ipv6},${values.hosts.microbel.ipv4}\""
         "no-agent-forwarding"
         "no-port-forwarding"
         "no-pty"
@@ -30,14 +44,20 @@ in {
   };
 
   systemd.services.pvv-nettsiden-gallery-update = {
-    path = with pkgs; [ imagemagick gnutar gzip ];
+    path = with pkgs; [
+      imagemagick
+      gnutar
+      gzip
+    ];
 
     script = ''
-      tar ${lib.cli.toGNUCommandLineShell {} {
+      tar ${
+        lib.cli.toGNUCommandLineShell { } {
           extract = true;
           file = "${transferDir}/gallery.tar.gz";
           directory = ".";
-      }}
+        }
+      }
 
       # Delete files and directories that exists in the gallery that don't exist in the tarball
       filesToRemove=$(uniq -u <(sort <(find . -not -path "./.thumbnails*") <(tar -tf ${transferDir}/gallery.tar.gz | sed 's|/$||')))

hosts/bekkalokk/services/well-known/default.nix

@@ -1,11 +1,14 @@
 { lib, ... }:
 {
-  services.nginx.virtualHosts = lib.genAttrs [
+  services.nginx.virtualHosts =
+    lib.genAttrs
+      [
         "pvv.ntnu.no"
         "www.pvv.ntnu.no"
         "pvv.org"
         "www.pvv.org"
-  ] (_: {
+      ]
+      (_: {
         locations = {
           "^~ /.well-known/" = {
             alias = (toString ./root) + "/";

hosts/bicep/configuration.nix

@@ -1,4 +1,9 @@
-{ fp, pkgs, values, ... }:
+{
+  fp,
+  pkgs,
+  values,
+  ...
+}:
 {
   imports = [
     ./hardware-configuration.nix
@@ -19,8 +24,16 @@
   systemd.network.networks."30-ens18" = values.defaultNetworkConfig // {
     #matchConfig.Name = "enp6s0f0";
     matchConfig.Name = "ens18";
-    address = with values.hosts.bicep; [ (ipv4 + "/25") (ipv6 + "/64") ]
-      ++ (with values.services.turn; [ (ipv4 + "/25") (ipv6 + "/64") ]);
+    address =
+      with values.hosts.bicep;
+      [
+        (ipv4 + "/25")
+        (ipv6 + "/64")
+      ]
+      ++ (with values.services.turn; [
+        (ipv4 + "/25")
+        (ipv6 + "/64")
+      ]);
   };
   systemd.network.wait-online = {
     anyInterface = true;

hosts/bicep/hardware-configuration.nix

@@ -1,33 +1,48 @@
 # Do not modify this file!  It was generated by 'nixos-generate-config'
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ahci" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [
+    "ata_piix"
+    "uhci_hcd"
+    "ahci"
+    "sd_mod"
+    "sr_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/20e06202-7a09-47cc-8ef6-5e7afe19453a";
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/20e06202-7a09-47cc-8ef6-5e7afe19453a";
     fsType = "ext4";
   };
 
   # temp data disk, only 128gb not enough until we can add another disk to the system.
-  fileSystems."/data" =
-    { device = "/dev/disk/by-uuid/c81af266-0781-4084-b8eb-c2587cbcf1ba";
+  fileSystems."/data" = {
+    device = "/dev/disk/by-uuid/c81af266-0781-4084-b8eb-c2587cbcf1ba";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/198B-E363";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/198B-E363";
     fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
   };
 
   swapDevices = [ ];

hosts/bicep/services/calendar-bot.nix

@@ -1,7 +1,14 @@
-{ config, fp, lib, pkgs, ... }:
+{
+  config,
+  fp,
+  lib,
+  pkgs,
+  ...
+}:
 let
   cfg = config.services.pvv-calendar-bot;
-in {
+in
+{
   sops.secrets = {
     "calendar-bot/matrix_token" = {
       sopsFile = fp /secrets/bicep/bicep.yaml;

hosts/bicep/services/git-mirrors/default.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, fp, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  fp,
+  ...
+}:
 let
   cfg = config.services.gickup;
 in
@@ -20,14 +26,16 @@ in
       lfs = false;
     };
 
-    instances = let
+    instances =
+      let
         defaultGithubConfig = {
           settings.token_file = config.sops.secrets."gickup/github-token".path;
         };
         defaultGitlabConfig = {
           # settings.token_file = ...
         };
-    in {
+      in
+      {
         "github:Git-Mediawiki/Git-Mediawiki" = defaultGithubConfig;
         "github:NixOS/nixpkgs" = defaultGithubConfig;
         "github:go-gitea/gitea" = defaultGithubConfig;
@@ -58,9 +66,11 @@ in
       };
   };
 
-  services.cgit = let
+  services.cgit =
+    let
       domain = "mirrors.pvv.ntnu.no";
-  in {
+    in
+    {
       ${domain} = {
         enable = true;
         package = pkgs.callPackage (fp /packages/cgit.nix) { };
@@ -86,13 +96,18 @@ in
     forceSSL = true;
     enableACME = true;
 
-    locations."= /PVV-logo.png".alias = let
-      small-pvv-logo = pkgs.runCommandLocal "pvv-logo-96x96" {
+    locations."= /PVV-logo.png".alias =
+      let
+        small-pvv-logo =
+          pkgs.runCommandLocal "pvv-logo-96x96"
+            {
               nativeBuildInputs = [ pkgs.imagemagick ];
-      } ''
+            }
+            ''
               magick '${fp /assets/logo_blue_regular.svg}' -resize 96x96 PNG:"$out"
             '';
-    in toString small-pvv-logo;
+      in
+      toString small-pvv-logo;
   };
 
   systemd.services."fcgiwrap-cgit-mirrors.pvv.ntnu.no" = {

hosts/bicep/services/matrix/coturn.nix

@@ -1,4 +1,12 @@
-{ config, lib, fp, pkgs, secrets, values, ... }:
+{
+  config,
+  lib,
+  fp,
+  pkgs,
+  secrets,
+  values,
+  ...
+}:
 
 {
   sops.secrets."matrix/coturn/static-auth-secret" = {
@@ -127,17 +135,30 @@
   };
 
   networking.firewall = {
-    interfaces.enp6s0f0 = let
-      range = with config.services.coturn; [ {
+    interfaces.enp6s0f0 =
+      let
+        range = with config.services.coturn; [
+          {
             from = min-port;
             to = max-port;
-    } ];
+          }
+        ];
       in
       {
         allowedUDPPortRanges = range;
-      allowedUDPPorts = [ 443 3478 3479 5349 ];
+        allowedUDPPorts = [
+          443
+          3478
+          3479
+          5349
+        ];
         allowedTCPPortRanges = range;
-      allowedTCPPorts = [ 443 3478 3479 5349 ];
+        allowedTCPPorts = [
+          443
+          3478
+          3479
+          5349
+        ];
       };
   };
 

hosts/bicep/services/matrix/discord.nix

@@ -1,4 +1,9 @@
-{ config, lib, fp, ... }:
+{
+  config,
+  lib,
+  fp,
+  ...
+}:
 
 let
   cfg = config.services.mx-puppet-discord;
@@ -44,7 +49,6 @@ in
     ];
   };
 
-
   services.mx-puppet-discord.enable = false;
   services.mx-puppet-discord.settings = {
     bridge = {
@@ -52,16 +56,21 @@ in
       domain = "pvv.ntnu.no";
       homeserverUrl = "https://matrix.pvv.ntnu.no";
     };
-    provisioning.whitelist = [ "@dandellion:dodsorf\\.as" "@danio:pvv\\.ntnu\\.no"];
+    provisioning.whitelist = [
+      "@dandellion:dodsorf\\.as"
+      "@danio:pvv\\.ntnu\\.no"
+    ];
     relay.whitelist = [ ".*" ];
-    selfService.whitelist = [ "@danio:pvv\\.ntnu\\.no" "@dandellion:dodsorf\\.as" ];
+    selfService.whitelist = [
+      "@danio:pvv\\.ntnu\\.no"
+      "@dandellion:dodsorf\\.as"
+    ];
   };
   services.mx-puppet-discord.serviceDependencies = [
     "matrix-synapse.target"
     "nginx.service"
   ];
 
-
   services.matrix-synapse-next.settings = {
     app_service_config_files = [
       config.sops.templates."discord-registration.yaml".path

hosts/bicep/services/matrix/element.nix

@@ -1,7 +1,13 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   synapse-cfg = config.services.matrix-synapse-next;
-in {
+in
+{
   services.pvv-matrix-well-known.client = {
     "m.homeserver" = {
       base_url = "https://matrix.pvv.ntnu.no";

hosts/bicep/services/matrix/hookshot/default.nix

@@ -1,4 +1,11 @@
-{ config, lib, fp, unstablePkgs, inputs, ... }:
+{
+  config,
+  lib,
+  fp,
+  unstablePkgs,
+  inputs,
+  ...
+}:
 
 let
   cfg = config.services.matrix-hookshot;
@@ -100,7 +107,8 @@ in
       };
 
       serviceBots = [
-        { localpart = "bot_feeds";
+        {
+          localpart = "bot_feeds";
           displayname = "Aya";
           avatar = ./feeds.png;
           prefix = "!aya";
@@ -115,20 +123,44 @@ in
 
       permissions = [
         # Users of the PVV Server
-        { actor = "pvv.ntnu.no";
-          services = [ { service = "*"; level = "commands"; } ];
+        {
+          actor = "pvv.ntnu.no";
+          services = [
+            {
+              service = "*";
+              level = "commands";
+            }
+          ];
         }
         # Members of Medlem space (for people with their own hs)
-        { actor = "!pZOTJQinWyyTWaeOgK:pvv.ntnu.no";
-          services = [ { service = "*"; level = "commands"; } ];
+        {
+          actor = "!pZOTJQinWyyTWaeOgK:pvv.ntnu.no";
+          services = [
+            {
+              service = "*";
+              level = "commands";
+            }
+          ];
         }
         # Members of Drift
-        { actor = "!eYgeufLrninXxQpYml:pvv.ntnu.no";
-          services = [ { service = "*"; level = "admin"; } ];
+        {
+          actor = "!eYgeufLrninXxQpYml:pvv.ntnu.no";
+          services = [
+            {
+              service = "*";
+              level = "admin";
+            }
+          ];
         }
         # Dan bootstrap
-        { actor = "@dandellion:dodsorf.as";
-          services = [ { service = "*"; level = "admin"; } ];
+        {
+          actor = "@dandellion:dodsorf.as";
+          services = [
+            {
+              service = "*";
+              level = "admin";
+            }
+          ];
         }
       ];
     };

hosts/bicep/services/matrix/livekit.nix

@@ -1,4 +1,9 @@
-{ config, lib, fp, ... }:
+{
+  config,
+  lib,
+  fp,
+  ...
+}:
 let
   synapseConfig = config.services.matrix-synapse-next;
   matrixDomain = "matrix.pvv.ntnu.no";
@@ -20,10 +25,12 @@ in
   };
 
   services.pvv-matrix-well-known.client = lib.mkIf cfg.enable {
-    "org.matrix.msc4143.rtc_foci" = [{
+    "org.matrix.msc4143.rtc_foci" = [
+      {
         type = "livekit";
         livekit_service_url = "https://${matrixDomain}/livekit/jwt";
-    }];
+      }
+    ];
   };
 
   services.livekit = {
@@ -43,7 +50,12 @@ in
     keyFile = config.sops.templates."matrix-livekit-keyfile".path;
   };
 
-  systemd.services.lk-jwt-service.environment.LIVEKIT_FULL_ACCESS_HOMESERVERS = lib.mkIf cfg.enable matrixDomain;
+  systemd.services.lk-jwt-service.environment.LIVEKIT_FULL_ACCESS_HOMESERVERS = lib.mkIf cfg.enable (
+    builtins.concatStringsSep "," [
+      "pvv.ntnu.no"
+      "dodsorf.as"
+    ]
+  );
 
   services.nginx.virtualHosts.${matrixDomain} = lib.mkIf cfg.enable {
     locations."^~ /livekit/jwt/" = {

hosts/bicep/services/matrix/mjolnir.nix

@@ -1,4 +1,9 @@
-{ config, lib, fp, ... }:
+{
+  config,
+  lib,
+  fp,
+  ...
+}:
 
 {
   sops.secrets."matrix/mjolnir/access_token" = {

hosts/bicep/services/matrix/out-of-your-element.nix

@@ -1,4 +1,11 @@
-{ config, pkgs, fp, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  values,
+  fp,
+  ...
+}:
 let
   cfg = config.services.matrix-ooye;
 in
@@ -28,6 +35,23 @@ in
     };
   };
 
+  services.rsync-pull-targets = lib.mkIf cfg.enable {
+    enable = true;
+    locations."/var/lib/private/matrix-ooye" = {
+      user = "root";
+      rrsyncArgs.ro = true;
+      authorizedKeysAttrs = [
+        "restrict"
+        "from=\"principal.pvv.ntnu.no,${values.hosts.principal.ipv6},${values.hosts.principal.ipv4}\""
+        "no-agent-forwarding"
+        "no-port-forwarding"
+        "no-pty"
+        "no-X11-forwarding"
+      ];
+      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE5koYfor5+kKB30Dugj3dAWvmj8h/akQQ2XYDvLobFL matrix_ooye rsync backup";
+    };
+  };
+
   services.matrix-ooye = {
     enable = true;
     homeserver = "https://matrix.pvv.ntnu.no";

hosts/bicep/services/matrix/smtp-authenticator/default.nix

@@ -1,4 +1,9 @@
-{ lib, buildPythonPackage, fetchFromGitHub, setuptools }:
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
 
 buildPythonPackage rec {
   pname = "matrix-synapse-smtp-auth";

hosts/bicep/services/matrix/synapse-admin.nix

@@ -1,5 +1,9 @@
-{ config, lib, pkgs, ... }:
-
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 # This service requires you to have access to endpoints not available over the internet
 # Use an ssh proxy or similar to access this dashboard.

hosts/bicep/services/matrix/synapse-auto-compressor.nix

@@ -1,4 +1,9 @@
-{ config, lib, utils, ... }:
+{
+  config,
+  lib,
+  utils,
+  ...
+}:
 let
   cfg = config.services.synapse-auto-compressor;
 in

hosts/bicep/services/matrix/synapse.nix

@@ -1,13 +1,23 @@
-{ config, lib, fp, pkgs, values, inputs, ... }:
+{
+  config,
+  lib,
+  fp,
+  pkgs,
+  values,
+  inputs,
+  ...
+}:
 
 let
   cfg = config.services.matrix-synapse-next;
 
   matrix-lib = inputs.matrix-next.lib;
 
-  imap0Attrs = with lib; f: set:
-    listToAttrs (imap0 (i: attr: nameValuePair attr (f i attr set.${attr})) (attrNames set));
-in {
+  imap0Attrs =
+    with lib;
+    f: set: listToAttrs (imap0 (i: attr: nameValuePair attr (f i attr set.${attr})) (attrNames set));
+in
+{
   sops.secrets."matrix/synapse/signing_key" = {
     key = "synapse/signing_key";
     sopsFile = fp /secrets/bicep/matrix.yaml;
@@ -23,7 +33,9 @@ in {
     owner = config.users.users.matrix-synapse.name;
     group = config.users.users.matrix-synapse.group;
     content = ''
-      registration_shared_secret: ${config.sops.placeholder."matrix/synapse/user_registration/registration_shared_secret"}
+      registration_shared_secret: ${
+        config.sops.placeholder."matrix/synapse/user_registration/registration_shared_secret"
+      }
     '';
   };
 
@@ -34,6 +46,7 @@ in {
       rrsyncArgs.ro = true;
       authorizedKeysAttrs = [
         "restrict"
+        "from=\"principal.pvv.ntnu.no,${values.hosts.principal.ipv6},${values.hosts.principal.ipv4}\""
         "no-agent-forwarding"
         "no-port-forwarding"
         "no-pty"
@@ -109,7 +122,8 @@ in {
       password_config.enabled = true;
 
       modules = [
-        { module = "smtp_auth_provider.SMTPAuthProvider";
+        {
+          module = "smtp_auth_provider.SMTPAuthProvider";
           config = {
             smtp_host = "smtp.pvv.ntnu.no";
           };
@@ -198,22 +212,30 @@ in {
       };
     }
     {
-    locations = let
+      locations =
+        let
           connectionInfo = w: matrix-lib.workerConnectionResource "metrics" w;
-      socketAddress = w: let c = connectionInfo w; in "${c.host}:${toString c.port}";
+          socketAddress =
+            w:
+            let
+              c = connectionInfo w;
+            in
+            "${c.host}:${toString c.port}";
 
           metricsPath = w: "/metrics/${w.type}/${toString w.index}";
           proxyPath = w: "http://${socketAddress w}/_synapse/metrics";
-    in lib.mapAttrs' (n: v: lib.nameValuePair
-      (metricsPath v) {
+        in
+        lib.mapAttrs' (
+          n: v:
+          lib.nameValuePair (metricsPath v) {
             proxyPass = proxyPath v;
             extraConfig = ''
               allow ${values.hosts.ildkule.ipv4};
               allow ${values.hosts.ildkule.ipv6};
               deny all;
             '';
-      })
-      cfg.workers.instances;
+          }
+        ) cfg.workers.instances;
     }
     {
       locations."/metrics/master/1" = {
@@ -225,18 +247,28 @@ in {
         '';
       };
 
-    locations."/metrics/" = let
-      endpoints = lib.pipe cfg.workers.instances [
+      locations."/metrics/" =
+        let
+          endpoints =
+            lib.pipe cfg.workers.instances [
               (lib.mapAttrsToList (_: v: v))
               (map (w: "${w.type}/${toString w.index}"))
               (map (w: "matrix.pvv.ntnu.no/metrics/${w}"))
-      ] ++ [ "matrix.pvv.ntnu.no/metrics/master/1" ];
-    in {
-      alias = pkgs.writeTextDir "/config.json"
-        (builtins.toJSON [
-          { targets = endpoints;
+            ]
+            ++ [ "matrix.pvv.ntnu.no/metrics/master/1" ];
+        in
+        {
+          alias =
+            pkgs.writeTextDir "/config.json" (
+              builtins.toJSON [
+                {
+                  targets = endpoints;
                   labels = { };
-          }]) + "/";
-    };
-  }];
+                }
+              ]
+            )
+            + "/";
+        };
+    }
+  ];
 }

hosts/bicep/services/matrix/well-known.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   cfg = config.services.pvv-matrix-well-known;
   format = pkgs.formats.json { };

hosts/bicep/services/minecraft-heatmap.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   cfg = config.services.minecraft-heatmap;
 in
@@ -27,13 +32,15 @@ in
       "sshkey:${config.sops.secrets."minecraft-heatmap/ssh-key/private".path}"
     ];
 
-    preStart = let
+    preStart =
+      let
         knownHostsFile = pkgs.writeText "minecraft-heatmap-known-hosts" ''
           innovation.pvv.ntnu.no ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9O/y5uqcLKCodg2Q+XfZPH/AoUIyBlDhigImU+4+Kn
           innovation.pvv.ntnu.no ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQClR9GvWeVPZHudlnFXhGHUX5sGX9nscsOsotnlQ4uVuGsgvRifsVsuDULlAFXwoV1tYp4vnyXlsVtMddpLI5ANOIDcZ4fgDxpfSQmtHKssNpDcfMhFJbfRVyacipjA4osxTxvLox/yjtVt+URjTHUA1MWzEwc26KfiOvWO5tCBTan7doN/4KOyT05GwBxwzUAwUmoGTacIITck2Y9qp4+xFYqehbXqPdBb15hFyd38OCQhtU1hWV2Yi18+hJ4nyjc/g5pr6mW09ULlFghe/BaTUXrTisYC6bMcJZsTDwsvld9581KPvoNZOTQhZPTEQCZZ1h54fe0ZHuveVB3TIHovZyjoUuaf4uiFOjJVaKRB+Ig+Il6r7tMUn9CyHtus/Nd86E0TFBzoKxM0OFu88oaUlDtZVrUJL5En1lGoimajebb1JPxllFN5hqIT+gVyMY6nRzkcfS7ieny/U4rzXY2rfz98selftgh3LsBywwADv65i+mPw1A/1QdND1R6fV4U=
           innovation.pvv.ntnu.no ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNjl3HfsDqmALWCL9uhz9k93RAD2565ndBqUh4N/rvI7MCwEJ6iRCdDev0YzB1Fpg24oriyYoxZRP24ifC2sQf8=
         '';
-    in ''
+      in
+      ''
         mkdir -p '${cfg.minecraftLogsDir}'
         "${lib.getExe pkgs.rsync}" \
         --archive \

hosts/bicep/services/mysql/backup.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  values,
+  ...
+}:
 let
   cfg = config.services.mysql;
   backupDir = "/data/mysql-backups";
@@ -22,6 +28,7 @@ in
       rrsyncArgs.ro = true;
       authorizedKeysAttrs = [
         "restrict"
+        "from=\"principal.pvv.ntnu.no,${values.hosts.principal.ipv6},${values.hosts.principal.ipv4}\""
         "no-agent-forwarding"
         "no-port-forwarding"
         "no-pty"
@@ -43,9 +50,11 @@ in
       zstd
     ];
 
-    script = let
+    script =
+      let
         rotations = 2;
-    in ''
+      in
+      ''
         set -euo pipefail
 
         OUT_FILE="$STATE_DIRECTORY/mysql-dump-$(date --iso-8601).sql.zst"

hosts/bicep/services/mysql/default.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, values, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  values,
+  ...
+}:
 let
   cfg = config.services.mysql;
   dataDir = "/data/mysql";
@@ -36,12 +42,14 @@ in
     #       a password which can be found in /secrets/ildkule/ildkule.yaml
     #       We have also changed both the host and auth plugin of this user
     #       to be 'ildkule.pvv.ntnu.no' and 'mysql_native_password' respectively.
-    ensureUsers = [{
+    ensureUsers = [
+      {
         name = "prometheus_mysqld_exporter";
         ensurePermissions = {
           "*.*" = "PROCESS, REPLICATION CLIENT, SELECT, SLAVE MONITOR";
         };
-    }];
+      }
+    ];
   };
 
   networking.firewall.allowedTCPPorts = lib.mkIf cfg.enable [ 3306 ];

hosts/bicep/services/postgresql/backup.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  values,
+  ...
+}:
 let
   cfg = config.services.postgresql;
   backupDir = "/data/postgresql-backups";
@@ -23,6 +29,7 @@ in
       rrsyncArgs.ro = true;
       authorizedKeysAttrs = [
         "restrict"
+        "from=\"principal.pvv.ntnu.no,${values.hosts.principal.ipv6},${values.hosts.principal.ipv4}\""
         "no-agent-forwarding"
         "no-port-forwarding"
         "no-pty"
@@ -44,9 +51,11 @@ in
       cfg.package
     ];
 
-    script = let
+    script =
+      let
         rotations = 2;
-    in ''
+      in
+      ''
         set -euo pipefail
 
         OUT_FILE="$STATE_DIRECTORY/postgresql-dump-$(date --iso-8601).sql.zst"

hosts/bicep/services/postgresql/default.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, values, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  values,
+  ...
+}:
 let
   cfg = config.services.postgresql;
 in

hosts/bikkje/configuration.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, values, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  values,
+  ...
+}:
 {
   networking.nat = {
     enable = true;
@@ -10,7 +16,9 @@
 
   containers.bikkje = {
     autoStart = true;
-    config = { config, pkgs, ... }: {
+    config =
+      { config, pkgs, ... }:
+      {
         #import packages
         packages = with pkgs; [
           alpine
@@ -29,12 +37,52 @@
           firewall = {
             enable = true;
             # Allow SSH and HTTP and ports for email and irc
-          allowedTCPPorts = [ 80 22 194 994 6665 6666 6667 6668 6669 6697 995 993 25 465 587 110 143 993 995 ];
-          allowedUDPPorts = [ 80 22 194 994 6665 6666 6667 6668 6669 6697 995 993 25 465 587 110 143 993 995 ];
+            allowedTCPPorts = [
+              80
+              22
+              194
+              994
+              6665
+              6666
+              6667
+              6668
+              6669
+              6697
+              995
+              993
+              25
+              465
+              587
+              110
+              143
+              993
+              995
+            ];
+            allowedUDPPorts = [
+              80
+              22
+              194
+              994
+              6665
+              6666
+              6667
+              6668
+              6669
+              6697
+              995
+              993
+              25
+              465
+              587
+              110
+              143
+              993
+              995
+            ];
           };
           # Use systemd-resolved inside the container
           # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686
-        useHostResolvConf = mkForce false;
+          useHostResolvConf = lib.mkForce false;
         };
 
         services.resolved.enable = true;
@@ -44,4 +92,4 @@
         system.stateVersion = "23.11";
       };
   };
-};
+}

hosts/brzeczyszczykiewicz/configuration.nix

@@ -1,4 +1,10 @@
-{ config, fp, pkgs, values, ... }:
+{
+  config,
+  fp,
+  pkgs,
+  values,
+  ...
+}:
 {
   imports = [
     # Include the results of the hardware scan.
@@ -10,7 +16,10 @@
 
   systemd.network.networks."30-eno1" = values.defaultNetworkConfig // {
     matchConfig.Name = "eno1";
-    address = with values.hosts.brzeczyszczykiewicz; [ (ipv4 + "/25") (ipv6 + "/64") ];
+    address = with values.hosts.brzeczyszczykiewicz; [
+      (ipv4 + "/25")
+      (ipv6 + "/64")
+    ];
   };
 
   fonts.fontconfig.enable = true;

hosts/brzeczyszczykiewicz/hardware-configuration.nix

@@ -1,30 +1,44 @@
 # Do not modify this file!  It was generated by 'nixos-generate-config'
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ehci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+    "sr_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/4e8667f8-55de-4103-8369-b94665f42204";
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/4e8667f8-55de-4103-8369-b94665f42204";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/82E3-3D03";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/82E3-3D03";
     fsType = "vfat";
   };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/d0bf9a21-44bc-44a3-ae55-8f0971875883"; }
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/d0bf9a21-44bc-44a3-ae55-8f0971875883"; }
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/georg/configuration.nix

@@ -1,4 +1,10 @@
-{ config, fp, pkgs, values, ... }:
+{
+  config,
+  fp,
+  pkgs,
+  values,
+  ...
+}:
 {
   imports = [
     # Include the results of the hardware scan.
@@ -10,7 +16,10 @@
 
   systemd.network.networks."30-eno1" = values.defaultNetworkConfig // {
     matchConfig.Name = "eno1";
-    address = with values.hosts.georg; [ (ipv4 + "/25") (ipv6 + "/64") ];
+    address = with values.hosts.georg; [
+      (ipv4 + "/25")
+      (ipv6 + "/64")
+    ];
   };
 
   services.spotifyd = {

hosts/georg/hardware-configuration.nix

@@ -1,30 +1,43 @@
 # Do not modify this file!  It was generated by 'nixos-generate-config'
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ehci_pci"
+    "ahci"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/33825f0d-5a63-40fc-83db-bfa1ebb72ba0";
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/33825f0d-5a63-40fc-83db-bfa1ebb72ba0";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/145E-7362";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/145E-7362";
     fsType = "vfat";
   };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/7ed27e21-3247-44cd-8bcc-5d4a2efebf57"; }
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/7ed27e21-3247-44cd-8bcc-5d4a2efebf57"; }
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/gluttony/hardware-configuration.nix

@@ -31,7 +31,7 @@
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/D00A-B488";
+    device = "/dev/disk/by-uuid/933A-3005";
     fsType = "vfat";
     options = [
       "fmask=0077"

hosts/ildkule/configuration.nix

@@ -1,4 +1,11 @@
-{ config, fp, pkgs, lib, values, ... }:
+{
+  config,
+  fp,
+  pkgs,
+  lib,
+  values,
+  ...
+}:
 {
   imports = [
     # Include the results of the hardware scan.
@@ -17,9 +24,11 @@
 
   # Openstack Neutron and systemd-networkd are not best friends, use something else:
   systemd.network.enable = lib.mkForce false;
-  networking = let
+  networking =
+    let
       hostConf = values.hosts.ildkule;
-  in {
+    in
+    {
       tempAddresses = "disabled";
       useDHCP = lib.mkForce true;
 
@@ -29,11 +38,20 @@
 
       interfaces."ens4" = {
         ipv4.addresses = [
-        { address = hostConf.ipv4;          prefixLength = 32; }
-        { address = hostConf.ipv4_internal; prefixLength = 24; }
+          {
+            address = hostConf.ipv4;
+            prefixLength = 32;
+          }
+          {
+            address = hostConf.ipv4_internal;
+            prefixLength = 24;
+          }
         ];
         ipv6.addresses = [
-        { address = hostConf.ipv6;          prefixLength = 64; }
+          {
+            address = hostConf.ipv6;
+            prefixLength = 64;
+          }
         ];
       };
     };

hosts/ildkule/hardware-configuration.nix

@@ -1,7 +1,12 @@
 { modulesPath, lib, ... }:
 {
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
+  boot.initrd.availableKernelModules = [
+    "ata_piix"
+    "uhci_hcd"
+    "xen_blkfront"
+    "vmw_pvscsi"
+  ];
   boot.initrd.kernelModules = [ "nvme" ];
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/e35eb4ce-aac3-4f91-8383-6e7cd8bbf942";

hosts/ildkule/services/journald-remote.nix

@@ -1,4 +1,9 @@
-{ config, lib, values, ... }:
+{
+  config,
+  lib,
+  values,
+  ...
+}:
 let
   cfg = config.services.journald.remote;
   domainName = "journald.pvv.ntnu.no";
@@ -22,9 +27,11 @@ in
 
   services.journald.remote = {
     enable = true;
-    settings.Remote = let
+    settings.Remote =
+      let
         inherit (config.security.acme.certs.${domainName}) directory;
-    in {
+      in
+      {
         ServerKeyFile = "/run/credentials/systemd-journal-remote.service/key.pem";
         ServerCertificateFile = "/run/credentials/systemd-journal-remote.service/cert.pem";
         TrustedCertificateFile = "-";
@@ -47,9 +54,11 @@ in
 
   systemd.services."systemd-journal-remote" = {
     serviceConfig = {
-      LoadCredential = let
+      LoadCredential =
+        let
           inherit (config.security.acme.certs.${domainName}) directory;
-      in [
+        in
+        [
           "key.pem:${directory}/key.pem"
           "cert.pem:${directory}/cert.pem"
         ];

hosts/ildkule/services/monitoring/grafana.nix

@@ -1,10 +1,19 @@
-{ config, pkgs, values, ... }: let
+{
+  config,
+  pkgs,
+  values,
+  ...
+}:
+let
   cfg = config.services.grafana;
-in {
-  sops.secrets = let
+in
+{
+  sops.secrets =
+    let
       owner = "grafana";
       group = "grafana";
-  in {
+    in
+    {
       "keys/grafana/secret_key" = { inherit owner group; };
       "keys/grafana/admin_password" = { inherit owner group; };
     };
@@ -12,10 +21,12 @@ in {
   services.grafana = {
     enable = true;
 
-    settings = let
+    settings =
+      let
         # See https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#file-provider
         secretFile = path: "$__file{${path}}";
-    in {
+      in
+      {
         server = {
           domain = "grafana.pvv.ntnu.no";
           http_port = 2342;

hosts/ildkule/services/monitoring/loki.nix

@@ -3,7 +3,8 @@
 let
   cfg = config.services.loki;
   stateDir = "/data/monitoring/loki";
-in {
+in
+{
   services.loki = {
     enable = true;
     configuration = {

hosts/ildkule/services/monitoring/prometheus/default.nix

@@ -1,6 +1,8 @@
-{ config, ... }: let
+{ config, ... }:
+let
   stateDir = "/data/monitoring/prometheus";
-in {
+in
+{
   imports = [
     ./exim.nix
     ./gitea.nix

hosts/ildkule/services/monitoring/prometheus/exim.nix

@@ -5,9 +5,11 @@
       {
         job_name = "exim";
         scrape_interval = "15s";
-        static_configs = [{
+        static_configs = [
+          {
             targets = [ "microbel.pvv.ntnu.no:9636" ];
-        }];
+          }
+        ];
       }
     ];
   };

hosts/ildkule/services/monitoring/prometheus/gitea.nix

@@ -1,6 +1,7 @@
 { ... }:
 {
-  services.prometheus.scrapeConfigs = [{
+  services.prometheus.scrapeConfigs = [
+    {
       job_name = "gitea";
       scrape_interval = "60s";
       scheme = "https";
@@ -12,5 +13,6 @@
           ];
         }
       ];
-  }];
+    }
+  ];
 }

hosts/ildkule/services/monitoring/prometheus/machines.nix

@@ -1,4 +1,5 @@
-{ config, ... }: let
+{ config, ... }:
+let
   cfg = config.services.prometheus;
 
   mkHostScrapeConfig = name: ports: {
@@ -9,32 +10,98 @@
   defaultNodeExporterPort = 9100;
   defaultSystemdExporterPort = 9101;
   defaultNixosExporterPort = 9102;
-in {
-  services.prometheus.scrapeConfigs = [{
+in
+{
+  services.prometheus.scrapeConfigs = [
+    {
       job_name = "base_info";
       static_configs = [
-      (mkHostScrapeConfig "ildkule" [ cfg.exporters.node.port cfg.exporters.systemd.port defaultNixosExporterPort ])
+        (mkHostScrapeConfig "ildkule" [
+          cfg.exporters.node.port
+          cfg.exporters.systemd.port
+          defaultNixosExporterPort
+        ])
 
-      (mkHostScrapeConfig "bekkalokk" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ])
-      (mkHostScrapeConfig "bicep" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ])
-      (mkHostScrapeConfig "brzeczyszczykiewicz" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ])
-      (mkHostScrapeConfig "georg" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ])
-      (mkHostScrapeConfig "gluttony" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ])
-      (mkHostScrapeConfig "kommode" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ])
-      (mkHostScrapeConfig "lupine-1" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ])
-      (mkHostScrapeConfig "lupine-2" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ])
-      (mkHostScrapeConfig "lupine-3" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ])
-      (mkHostScrapeConfig "lupine-4" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ])
-      (mkHostScrapeConfig "lupine-5" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ])
-      (mkHostScrapeConfig "temmie" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ])
-      (mkHostScrapeConfig "ustetind" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ])
-      (mkHostScrapeConfig "wenche" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ])
+        (mkHostScrapeConfig "bekkalokk" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+          defaultNixosExporterPort
+        ])
+        (mkHostScrapeConfig "bicep" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+          defaultNixosExporterPort
+        ])
+        (mkHostScrapeConfig "brzeczyszczykiewicz" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+          defaultNixosExporterPort
+        ])
+        (mkHostScrapeConfig "georg" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+          defaultNixosExporterPort
+        ])
+        (mkHostScrapeConfig "gluttony" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+          defaultNixosExporterPort
+        ])
+        (mkHostScrapeConfig "kommode" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+          defaultNixosExporterPort
+        ])
+        (mkHostScrapeConfig "lupine-1" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+          defaultNixosExporterPort
+        ])
+        (mkHostScrapeConfig "lupine-2" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+          defaultNixosExporterPort
+        ])
+        (mkHostScrapeConfig "lupine-3" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+          defaultNixosExporterPort
+        ])
+        (mkHostScrapeConfig "lupine-4" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+          defaultNixosExporterPort
+        ])
+        (mkHostScrapeConfig "lupine-5" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+          defaultNixosExporterPort
+        ])
+        (mkHostScrapeConfig "temmie" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+          defaultNixosExporterPort
+        ])
+        (mkHostScrapeConfig "ustetind" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+          defaultNixosExporterPort
+        ])
+        (mkHostScrapeConfig "wenche" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+          defaultNixosExporterPort
+        ])
 
-      (mkHostScrapeConfig "skrott" [ defaultNodeExporterPort defaultSystemdExporterPort ])
+        (mkHostScrapeConfig "skrott" [
+          defaultNodeExporterPort
+          defaultSystemdExporterPort
+        ])
 
         (mkHostScrapeConfig "hildring" [ defaultNodeExporterPort ])
         (mkHostScrapeConfig "isvegg" [ defaultNodeExporterPort ])
         (mkHostScrapeConfig "microbel" [ defaultNodeExporterPort ])
       ];
-  }];
+    }
+  ];
 }

hosts/ildkule/services/monitoring/prometheus/matrix-synapse.nix

@@ -1,13 +1,16 @@
 { ... }:
 {
-  services.prometheus.scrapeConfigs = [{
+  services.prometheus.scrapeConfigs = [
+    {
       job_name = "synapse";
       scrape_interval = "15s";
       scheme = "https";
 
-    http_sd_configs = [{
+      http_sd_configs = [
+        {
           url = "https://matrix.pvv.ntnu.no/metrics/config.json";
-    }];
+        }
+      ];
 
       relabel_configs = [
         {
@@ -36,5 +39,6 @@
           target_label = "__address__";
         }
       ];
-  }];
+    }
+  ];
 }

hosts/ildkule/services/monitoring/prometheus/mysqld.nix

@@ -1,14 +1,18 @@
-{ config, ... }: let
+{ config, ... }:
+let
   cfg = config.services.prometheus;
-in {
+in
+{
   sops = {
     secrets."config/mysqld_exporter_password" = { };
 
     templates."mysqld_exporter.conf" = {
       restartUnits = [ "prometheus-mysqld-exporter.service" ];
-      content = let
+      content =
+        let
           inherit (config.sops) placeholder;
-      in ''
+        in
+        ''
           [client]
           host = mysql.pvv.ntnu.no
           port = 3306
@@ -19,7 +23,8 @@ in {
   };
 
   services.prometheus = {
-    scrapeConfigs = [{
+    scrapeConfigs = [
+      {
         job_name = "mysql";
         scheme = "http";
         metrics_path = cfg.exporters.mysqld.telemetryPath;
@@ -30,7 +35,8 @@ in {
             ];
           }
         ];
-    }];
+      }
+    ];
 
     exporters.mysqld = {
       enable = true;

hosts/ildkule/services/monitoring/prometheus/postgres.nix

@@ -1,6 +1,14 @@
-{ pkgs, lib, config, values, ... }: let
+{
+  pkgs,
+  lib,
+  config,
+  values,
+  ...
+}:
+let
   cfg = config.services.prometheus;
-in {
+in
+{
   sops.secrets = {
     "keys/postgres/postgres_exporter_env" = { };
     "keys/postgres/postgres_exporter_knakelibrak_env" = { };
@@ -11,22 +19,26 @@ in {
       {
         job_name = "postgres";
         scrape_interval = "15s";
-        static_configs = [{
+        static_configs = [
+          {
             targets = [ "localhost:${toString cfg.exporters.postgres.port}" ];
             labels = {
               server = "bicep";
             };
-        }];
+          }
+        ];
       }
       {
         job_name = "postgres-knakelibrak";
         scrape_interval = "15s";
-        static_configs = [{
+        static_configs = [
+          {
             targets = [ "localhost:${toString (cfg.exporters.postgres.port + 1)}" ];
             labels = {
               server = "knakelibrak";
             };
-        }];
+          }
+        ];
       }
     ];
 
@@ -37,9 +49,11 @@ in {
     };
   };
 
-  systemd.services.prometheus-postgres-exporter-knakelibrak.serviceConfig = let
+  systemd.services.prometheus-postgres-exporter-knakelibrak.serviceConfig =
+    let
       localCfg = config.services.prometheus.exporters.postgres;
-  in lib.recursiveUpdate config.systemd.services.prometheus-postgres-exporter.serviceConfig {
+    in
+    lib.recursiveUpdate config.systemd.services.prometheus-postgres-exporter.serviceConfig {
       EnvironmentFile = config.sops.secrets."keys/postgres/postgres_exporter_knakelibrak_env".path;
       ExecStart = ''
         ${pkgs.prometheus-postgres-exporter}/bin/postgres_exporter \

hosts/ildkule/services/monitoring/uptime-kuma.nix

@@ -1,9 +1,15 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   cfg = config.services.uptime-kuma;
   domain = "status.pvv.ntnu.no";
   stateDir = "/data/monitoring/uptime-kuma";
-in {
+in
+{
   services.uptime-kuma = {
     enable = true;
     settings = {

hosts/kommode/configuration.nix

@@ -1,4 +1,9 @@
-{ pkgs, values, fp, ... }:
+{
+  pkgs,
+  values,
+  fp,
+  ...
+}:
 {
   imports = [
     # Include the results of the hardware scan.
@@ -12,7 +17,10 @@
 
   systemd.network.networks."30-ens18" = values.defaultNetworkConfig // {
     matchConfig.Name = "ens18";
-    address = with values.hosts.kommode; [ (ipv4 + "/25") (ipv6 + "/64") ];
+    address = with values.hosts.kommode; [
+      (ipv4 + "/25")
+      (ipv6 + "/64")
+    ];
   };
 
   services.btrfs.autoScrub.enable = true;

hosts/kommode/hardware-configuration.nix

@@ -1,14 +1,27 @@
 # Do not modify this file!  It was generated by 'nixos-generate-config'
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [
+    "ata_piix"
+    "uhci_hcd"
+    "virtio_pci"
+    "virtio_scsi"
+    "sd_mod"
+    "sr_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];

hosts/kommode/services/gitea/customization/default.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, fp, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  fp,
+  ...
+}:
 let
   cfg = config.services.gitea;
 in
@@ -10,6 +16,59 @@ in
     catppuccin = pkgs.gitea-theme-catppuccin;
   };
 
+  services.gitea.settings = {
+    ui = {
+      DEFAULT_THEME = "gitea-auto";
+      REACTIONS = lib.concatStringsSep "," [
+        "+1"
+        "-1"
+        "laugh"
+        "confused"
+        "heart"
+        "hooray"
+        "rocket"
+        "eyes"
+        "100"
+        "anger"
+        "astonished"
+        "no_good"
+        "ok_hand"
+        "pensive"
+        "pizza"
+        "point_up"
+        "sob"
+        "skull"
+        "upside_down_face"
+        "shrug"
+        "huh"
+        "bruh"
+        "okiedokie"
+        "grr"
+      ];
+
+      CUSTOM_EMOJIS = lib.concatStringsSep "," [
+        "bruh"
+        "grr"
+        "huh"
+        "ohyeah"
+      ];
+    };
+    "ui.meta" = {
+      AUTHOR = "Programvareverkstedet";
+      DESCRIPTION = "Bokstavelig talt programvareverkstedet";
+      KEYWORDS = lib.concatStringsSep "," [
+        "git"
+        "hackerspace"
+        "nix"
+        "open source"
+        "foss"
+        "organization"
+        "software"
+        "student"
+      ];
+    };
+  };
+
   systemd.services.gitea-customization = lib.mkIf cfg.enable {
     description = "Install extra customization in gitea's CUSTOM_DIR";
     wantedBy = [ "gitea.service" ];
@@ -21,7 +80,8 @@ in
       Group = cfg.group;
     };
 
-    script = let
+    script =
+      let
         logo-svg = fp /assets/logo_blue_regular.svg;
         logo-png = fp /assets/logo_blue_regular.png;
 
@@ -39,17 +99,21 @@ in
           labels = lib.importJSON ./labels/projects.json;
         };
 
-      customTemplates = pkgs.runCommandLocal "gitea-templates" {
+        customTemplates =
+          pkgs.runCommandLocal "gitea-templates"
+            {
               nativeBuildInputs = with pkgs; [
                 coreutils
                 gnused
               ];
-      } ''
+            }
+            ''
               # Bigger icons
               install -Dm444 "${cfg.package.src}/templates/repo/icon.tmpl" "$out/repo/icon.tmpl"
               sed -i -e 's/24/60/g' "$out/repo/icon.tmpl"
             '';
-    in ''
+      in
+      ''
         install -Dm444 ${logo-svg} ${cfg.customDir}/public/assets/img/logo.svg
         install -Dm444 ${logo-png} ${cfg.customDir}/public/assets/img/logo.png
         install -Dm444 ${./loading.apng} ${cfg.customDir}/public/assets/img/loading.png
@@ -57,6 +121,11 @@ in
         install -Dm444 ${extraLinksFooter} ${cfg.customDir}/templates/custom/extra_links_footer.tmpl
         install -Dm444 ${project-labels} ${cfg.customDir}/options/label/project-labels.yaml
 
+        install -Dm644 ${./emotes/bruh.png} ${cfg.customDir}/public/assets/img/emoji/bruh.png
+        install -Dm644 ${./emotes/huh.gif} ${cfg.customDir}/public/assets/img/emoji/huh.png
+        install -Dm644 ${./emotes/grr.png} ${cfg.customDir}/public/assets/img/emoji/grr.png
+        install -Dm644 ${./emotes/okiedokie.jpg} ${cfg.customDir}/public/assets/img/emoji/okiedokie.png
+
         "${lib.getExe pkgs.rsync}" -a "${customTemplates}/" ${cfg.customDir}/templates/
       '';
   };

hosts/kommode/services/gitea/default.nix

@@ -1,9 +1,17 @@
-{ config, values, lib, pkgs, unstablePkgs, ... }:
+{
+  config,
+  values,
+  lib,
+  pkgs,
+  unstablePkgs,
+  ...
+}:
 let
   cfg = config.services.gitea;
   domain = "git.pvv.ntnu.no";
   sshPort = 2222;
-in {
+in
+{
   imports = [
     ./customization
     ./gpg.nix
@@ -11,13 +19,15 @@ in {
     ./web-secret-provider
   ];
 
-  sops.secrets = let
+  sops.secrets =
+    let
       defaultConfig = {
         owner = "gitea";
         group = "gitea";
         restartUnits = [ "gitea.service" ];
       };
-  in {
+    in
+    {
       "gitea/database" = defaultConfig;
       "gitea/email-password" = defaultConfig;
       "gitea/lfs-jwt-secret" = defaultConfig;
@@ -83,11 +93,24 @@ in {
         AUTO_WATCH_NEW_REPOS = false;
       };
       admin.DEFAULT_EMAIL_NOTIFICATIONS = "onmention";
-      session.COOKIE_SECURE = true;
       security = {
         SECRET_KEY = lib.mkForce "";
         SECRET_KEY_URI = "file:${config.sops.secrets."gitea/secret-key".path}";
       };
+      cache = {
+        ADAPTER = "redis";
+        HOST = "redis+socket://${config.services.redis.servers.gitea.unixSocket}?db=0";
+        ITEM_TTL = "72h";
+      };
+      session = {
+        COOKIE_SECURE = true;
+        PROVIDER = "redis";
+        PROVIDER_CONFIG = "redis+socket://${config.services.redis.servers.gitea.unixSocket}?db=1";
+      };
+      queue = {
+        TYPE = "redis";
+        CONN_STR = "redis+socket://${config.services.redis.servers.gitea.unixSocket}?db=2";
+      };
       database.LOG_SQL = false;
       repository = {
         PREFERRED_LICENSES = lib.concatStringsSep "," [
@@ -128,31 +151,6 @@ in {
         AVATAR_MAX_ORIGIN_SIZE = 1024 * 1024 * 2;
       };
       actions.ENABLED = true;
-      ui = {
-        REACTIONS = lib.concatStringsSep "," [
-          "+1"
-          "-1"
-          "laugh"
-          "confused"
-          "heart"
-          "hooray"
-          "rocket"
-          "eyes"
-          "100"
-          "anger"
-          "astonished"
-          "no_good"
-          "ok_hand"
-          "pensive"
-          "pizza"
-          "point_up"
-          "sob"
-          "skull"
-          "upside_down_face"
-          "shrug"
-        ];
-      };
-      "ui.meta".DESCRIPTION = "Bokstavelig talt programvareverkstedet";
     };
 
     dump = {
@@ -164,12 +162,26 @@ in {
 
   environment.systemPackages = [ cfg.package ];
 
-  systemd.services.gitea.serviceConfig.CPUSchedulingPolicy = "batch";
+  systemd.services.gitea = lib.mkIf cfg.enable {
+    wants = [ "redis-gitea.service" ];
+    after = [ "redis-gitea.service" ];
 
-  systemd.services.gitea.serviceConfig.CacheDirectory = "gitea/repo-archive";
-  systemd.services.gitea.serviceConfig.BindPaths = [
+    serviceConfig = {
+      CPUSchedulingPolicy = "batch";
+      CacheDirectory = "gitea/repo-archive";
+      BindPaths = [
         "%C/gitea/repo-archive:${cfg.stateDir}/data/repo-archive"
       ];
+    };
+  };
+
+  services.redis.servers.gitea = lib.mkIf cfg.enable {
+    enable = true;
+    user = config.services.gitea.user;
+    save = [ ];
+    openFirewall = false;
+    port = 5698;
+  };
 
   services.nginx.virtualHosts."${domain}" = {
     forceSSL = true;
@@ -202,6 +214,7 @@ in {
       rrsyncArgs.ro = true;
       authorizedKeysAttrs = [
         "restrict"
+        "from=\"principal.pvv.ntnu.no,${values.hosts.principal.ipv6},${values.hosts.principal.ipv4}\""
         "no-agent-forwarding"
         "no-port-forwarding"
         "no-pty"
@@ -212,7 +225,8 @@ in {
   };
 
   systemd.services.gitea-dump = {
-    serviceConfig.ExecStart = let
+    serviceConfig.ExecStart =
+      let
         args = lib.cli.toGNUCommandLineShell { } {
           type = cfg.dump.type;
 
@@ -225,13 +239,16 @@ in {
           # Logs are stored in the systemd journal
           skip-log = true;
         };
-    in lib.mkForce "${lib.getExe cfg.package} ${args}";
+      in
+      lib.mkForce "${lib.getExe cfg.package} ${args}";
 
     # Only keep n backup files at a time
-    postStop = let
+    postStop =
+      let
         cu = prog: "'${lib.getExe' pkgs.coreutils prog}'";
         backupCount = 3;
-    in ''
+      in
+      ''
         for file in $(${cu "ls"} -t1 '${cfg.dump.backupDir}' | ${cu "sort"} --reverse | ${cu "tail"} -n+${toString (backupCount + 1)}); do
           ${cu "rm"} "$file"
         done

hosts/kommode/services/gitea/gpg.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   cfg = config.services.gitea;
   GNUPGHOME = "${config.users.users.gitea.home}/gnupg";

hosts/kommode/services/gitea/import-users/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   cfg = config.services.gitea;
 in

hosts/kommode/services/gitea/web-secret-provider/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   organizations = [
     "Drift"
@@ -28,7 +33,7 @@ in
   users.users."gitea-web" = {
     group = "gitea-web";
     isSystemUser = true;
-    shell = pkgs.bash;
+    useDefaultShell = true;
   };
 
   sops.secrets."gitea/web-secret-provider/token" = {
@@ -36,7 +41,8 @@ in
     group = "gitea-web";
     restartUnits = [
       "gitea-web-secret-provider@"
-    ] ++ (map (org: "gitea-web-secret-provider@${org}") organizations);
+    ]
+    ++ (map (org: "gitea-web-secret-provider@${org}") organizations);
   };
 
   systemd.slices.system-giteaweb = {
@@ -48,11 +54,15 @@ in
   # %d - secrets directory
   systemd.services."gitea-web-secret-provider@" = {
     description = "Ensure all repos in %i has an SSH key to push web content";
-    requires = [ "gitea.service" "network.target" ];
+    requires = [
+      "gitea.service"
+      "network.target"
+    ];
     serviceConfig = {
       Slice = "system-giteaweb.slice";
       Type = "oneshot";
-      ExecStart = let
+      ExecStart =
+        let
           args = lib.cli.toGNUCommandLineShell { } {
             org = "%i";
             token-path = "%d/token";
@@ -66,7 +76,8 @@ in
             '';
             web-dir = "/var/lib/gitea-web/web";
           };
-      in "${giteaWebSecretProviderScript} ${args}";
+        in
+        "${giteaWebSecretProviderScript} ${args}";
 
       User = "gitea-web";
       Group = "gitea-web";
@@ -85,7 +96,10 @@ in
       ProtectControlGroups = true;
       ProtectKernelModules = true;
       ProtectKernelTunables = true;
-      RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
+      RestrictAddressFamilies = [
+        "AF_INET"
+        "AF_INET6"
+      ];
       RestrictRealtime = true;
       RestrictSUIDSGID = true;
       MemoryDenyWriteExecute = true;
@@ -105,7 +119,9 @@ in
 
   systemd.targets.timers.wants = map (org: "gitea-web-secret-provider@${org}.timer") organizations;
 
-  services.openssh.authorizedKeysFiles = map (org: "/var/lib/gitea-web/authorized_keys.d/${org}") organizations;
+  services.openssh.authorizedKeysFiles = map (
+    org: "/var/lib/gitea-web/authorized_keys.d/${org}"
+  ) organizations;
 
   users.users.nginx.extraGroups = [ "gitea-web" ];
   services.nginx.virtualHosts."pages.pvv.ntnu.no" = {

hosts/lupine/configuration.nix

@@ -1,4 +1,9 @@
-{ fp, values, lupineName, ... }:
+{
+  fp,
+  values,
+  lupineName,
+  ...
+}:
 {
   imports = [
     ./hardware-configuration/${lupineName}.nix
@@ -12,7 +17,10 @@
 
   systemd.network.networks."30-enp0s31f6" = values.defaultNetworkConfig // {
     matchConfig.Name = "enp0s31f6";
-    address = with values.hosts.${lupineName}; [ (ipv4 + "/25") (ipv6 + "/64") ];
+    address = with values.hosts.${lupineName}; [
+      (ipv4 + "/25")
+      (ipv6 + "/64")
+    ];
     networkConfig.LLDP = false;
   };
   systemd.network.wait-online = {

hosts/lupine/hardware-configuration/lupine-1.nix

@@ -1,31 +1,45 @@
 # Do not modify this file!  It was generated by 'nixos-generate-config'
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/a949e2e8-d973-4925-83e4-bcd815e65af7";
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/a949e2e8-d973-4925-83e4-bcd815e65af7";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/81D6-38D3";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/81D6-38D3";
     fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
   };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/82c2d7fa-7cd0-4398-8cf6-c892bc56264b"; }
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/82c2d7fa-7cd0-4398-8cf6-c892bc56264b"; }
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/lupine/hardware-configuration/lupine-2.nix

@@ -1,31 +1,45 @@
 # Do not modify this file!  It was generated by 'nixos-generate-config'
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/aa81d439-800b-403d-ac10-9d2aac3619d0";
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/aa81d439-800b-403d-ac10-9d2aac3619d0";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/4A34-6AE5";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/4A34-6AE5";
     fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
   };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/efb7cd0c-c1ae-4a86-8bc2-8e7fd0066650"; }
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/efb7cd0c-c1ae-4a86-8bc2-8e7fd0066650"; }
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/lupine/hardware-configuration/lupine-3.nix

@@ -1,31 +1,45 @@
 # Do not modify this file!  It was generated by 'nixos-generate-config'
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/39ba059b-3205-4701-a832-e72c0122cb88";
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/39ba059b-3205-4701-a832-e72c0122cb88";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/63FA-297B";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/63FA-297B";
     fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
   };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/9c72eb54-ea8c-4b09-808a-8be9b9a33869"; }
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/9c72eb54-ea8c-4b09-808a-8be9b9a33869"; }
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/lupine/hardware-configuration/lupine-4.nix

@@ -1,25 +1,36 @@
 # Do not modify this file!  It was generated by 'nixos-generate-config'
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/c7bbb293-a0a3-4995-8892-0ec63e8c67dd";
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/c7bbb293-a0a3-4995-8892-0ec63e8c67dd";
     fsType = "ext4";
   };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/a86ffda8-8ecb-42a1-bf9f-926072e90ca5"; }
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/a86ffda8-8ecb-42a1-bf9f-926072e90ca5"; }
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/lupine/hardware-configuration/lupine-5.nix

@@ -1,31 +1,45 @@
 # Do not modify this file!  It was generated by 'nixos-generate-config'
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/5f8418ad-8ec1-4f9e-939e-f3a4c36ef343";
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/5f8418ad-8ec1-4f9e-939e-f3a4c36ef343";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/F372-37DF";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/F372-37DF";
     fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
   };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/27bf292d-bbb3-48c4-a86e-456e0f1f648f"; }
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/27bf292d-bbb3-48c4-a86e-456e0f1f648f"; }
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/lupine/services/gitea-runner.nix

@@ -67,5 +67,8 @@
 
   networking.dhcpcd.IPv6rs = false;
 
-  networking.firewall.interfaces."podman+".allowedUDPPorts = [53 5353];
+  networking.firewall.interfaces."podman+".allowedUDPPorts = [
+    53
+    5353
+  ];
 }

hosts/shark/configuration.nix

@@ -1,4 +1,10 @@
-{ config, fp, pkgs, values, ... }:
+{
+  config,
+  fp,
+  pkgs,
+  values,
+  ...
+}:
 {
   imports = [
     # Include the results of the hardware scan.
@@ -8,7 +14,10 @@
 
   systemd.network.networks."30-ens18" = values.defaultNetworkConfig // {
     matchConfig.Name = "ens18";
-    address = with values.hosts.shark; [ (ipv4 + "/25") (ipv6 + "/64") ];
+    address = with values.hosts.shark; [
+      (ipv4 + "/25")
+      (ipv6 + "/64")
+    ];
   };
 
   services.qemuGuest.enable = true;

hosts/shark/hardware-configuration.nix

@@ -1,30 +1,43 @@
 # Do not modify this file!  It was generated by 'nixos-generate-config'
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [
+    "ata_piix"
+    "uhci_hcd"
+    "virtio_pci"
+    "virtio_scsi"
+    "sd_mod"
+    "sr_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/224c45db-9fdc-45d4-b3ad-aaf20b3efa8a";
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/224c45db-9fdc-45d4-b3ad-aaf20b3efa8a";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/CC37-F5FE";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/CC37-F5FE";
     fsType = "vfat";
   };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/a1ce3234-78b1-4565-9643-f4a05004424f"; }
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/a1ce3234-78b1-4565-9643-f4a05004424f"; }
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/skrot/configuration.nix

@@ -0,0 +1,63 @@
+{
+  fp,
+  lib,
+  config,
+  values,
+  ...
+}:
+
+{
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+    ./disk-config.nix
+    (fp /base)
+  ];
+
+  boot.consoleLogLevel = 0;
+
+  sops.defaultSopsFile = fp /secrets/skrot/skrot.yaml;
+
+  systemd.network.networks."enp2s0" = values.defaultNetworkConfig // {
+    matchConfig.Name = "enp2s0";
+    address = with values.hosts.skrot; [
+      (ipv4 + "/25")
+      (ipv6 + "/64")
+    ];
+  };
+
+  sops.secrets = {
+    "dibbler/postgresql/password" = {
+      owner = "dibbler";
+      group = "dibbler";
+    };
+  };
+
+  services.dibbler = {
+    enable = true;
+    kioskMode = true;
+    limitScreenWidth = 80;
+    limitScreenHeight = 42;
+
+    settings = {
+      general.quit_allowed = false;
+      database = {
+        type = "postgresql";
+        postgresql = {
+          username = "pvv_vv";
+          dbname = "pvv_vv";
+          host = "postgres.pvv.ntnu.no";
+          password_file = config.sops.secrets."dibbler/postgresql/password".path;
+        };
+      };
+    };
+  };
+
+  systemd.services."serial-getty@ttyUSB0" = lib.mkIf (!config.virtualisation.isVmVariant) {
+    enable = true;
+    wantedBy = [ "getty.target" ]; # to start at boot
+    serviceConfig.Restart = "always"; # restart when session is closed
+  };
+
+  system.stateVersion = "25.11"; # Did you read the comment? Nah bro
+}

hosts/skrot/disk-config.nix

@@ -0,0 +1,41 @@
+{
+  disko.devices = {
+    disk = {
+      main = {
+        device = "/dev/sda";
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              type = "EF00";
+              size = "1G";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "umask=0077" ];
+              };
+            };
+            plainSwap = {
+              size = "8G";
+              content = {
+                type = "swap";
+                discardPolicy = "both";
+                resumeDevice = false;
+              };
+            };
+            root = {
+              size = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/";
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}

hosts/skrot/hardware-configuration.nix

@@ -0,0 +1,26 @@
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/skrott/configuration.nix

@@ -1,4 +1,13 @@
-{ config, pkgs, lib, modulesPath, fp, values, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  modulesPath,
+  fp,
+  values,
+  ...
+}:
+{
   imports = [
     (modulesPath + "/profiles/perlless.nix")
 
@@ -59,19 +68,23 @@
   # zramSwap.enable = true;
 
   networking = {
-    hostName = "skrot";
+    hostName = "skrott";
     defaultGateway = values.hosts.gateway;
     defaultGateway6 = values.hosts.gateway6;
     interfaces.eth0 = {
       useDHCP = false;
-      ipv4.addresses = [{
+      ipv4.addresses = [
+        {
           address = values.hosts.skrott.ipv4;
           prefixLength = 25;
-      }];
-      ipv6.addresses = [{
+        }
+      ];
+      ipv6.addresses = [
+        {
           address = values.hosts.skrott.ipv6;
           prefixLength = 25;
-      }];
+        }
+      ];
     };
   };