Test run 2 for trying to implement fancy log inn page.

base/nix.nix

@@ -1,9 +1,4 @@
-{
+{ lib, config, inputs, ... }:
-  lib,
-  config,
-  inputs,
-  ...
-}:
 {
   nix = {
     gc = {
@@ -16,17 +11,12 @@
       allow-dirty = true;
       auto-allocate-uids = true;
       builders-use-substitutes = true;
-      experimental-features = [
+      experimental-features = [ "nix-command" "flakes" "auto-allocate-uids" ];
-        "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/services/auto-upgrade.nix

@@ -1,10 +1,4 @@
-{
+{ config, inputs, pkgs, lib, ... }:
-  config,
-  inputs,
-  pkgs,
-  lib,
-  ...
-}:
 
 let
   inputUrls = lib.mapAttrs (input: value: value.url) (import "${inputs.self}/flake.nix").inputs;
@@ -22,33 +16,25 @@ 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 (
+      (lib.mapAttrsToList (input: url: ["--override-input" input url]))
-        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 =
+  environment.etc = lib.mkIf (!config.virtualisation.isVmVariant && config.system.autoUpgrade.enable) {
-    lib.mkIf (!config.virtualisation.isVmVariant && config.system.autoUpgrade.enable)
+    "current-system-flake-inputs.json".source
-      {
+      = pkgs.writers.writeJSON "flake-inputs.json" (
-        "current-system-flake-inputs.json".source = pkgs.writers.writeJSON "flake-inputs.json" (
+        lib.flip lib.mapAttrs inputs (name: input:
-          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,9 +1,4 @@
-{
+{ config, lib, values, ... }:
-  config,
-  lib,
-  values,
-  ...
-}:
 let
   cfg = config.services.journald.upload;
 in

base/services/logrotate.nix

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

base/services/nginx.nix

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

base/services/openssh.nix

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

base/services/postfix.nix

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

base/services/prometheus-node-exporter.nix

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

base/services/prometheus-systemd-exporter.nix

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

base/services/promtail.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, values, ... }:
-  config,
-  lib,
-  values,
-  ...
-}:
 let
   cfg = config.services.prometheus.exporters.node;
 in
@@ -15,13 +10,10 @@ 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";
@@ -40,8 +32,7 @@ in
             target_label = "level";
           }
         ];
-        }
+      }];
-      ];
     };
   };
 }

base/services/smartd.nix

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

base/services/uptimed.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 let
   cfg = config.services.uptimed;
 in
@@ -20,19 +15,16 @@ in
     services.uptimed = {
       enable = true;
 
-      settings =
+      settings = let
-        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 =
+      serviceConfig = let
-        let
         uptimed = pkgs.uptimed.overrideAttrs (prev: {
           postPatch = ''
              substituteInPlace Makefile.am \
@@ -42,23 +34,23 @@ in
           '';
         });
 
-        in
+      in {
-        {
         Type = "notify";
 
         ExecStart = lib.mkForce "${uptimed}/sbin/uptimed -f";
 
-          BindReadOnlyPaths =
+        BindReadOnlyPaths = let
-            let
           configFile = lib.pipe cfg.settings [
-                (lib.mapAttrsToList (
+            (lib.mapAttrsToList
-                  k: v: if builtins.isList v then lib.mapConcatStringsSep "\n" (v': "${k}=${v'}") v else "${k}=${v}"
+              (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,15 +1,8 @@
+{ config, fp, lib, ... }:
 {
-  config,
+  sops.defaultSopsFile = let
-  fp,
-  lib,
-  ...
-}:
-{
-  sops.defaultSopsFile =
-    let
     secretsFilePath = fp /secrets/${config.networking.hostName}/${config.networking.hostName}.yaml;
-    in
+  in lib.mkIf (builtins.pathExists secretsFilePath) secretsFilePath;
-    lib.mkIf (builtins.pathExists secretsFilePath) secretsFilePath;
 
   sops.age = lib.mkIf (config.sops.defaultSopsFile != null) {
     sshKeyPaths = lib.mkDefault [ "/etc/ssh/ssh_host_ed25519_key" ];

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771267058,
+        "lastModified": 1770133120,
-        "narHash": "sha256-EEL4SmD1b3BPJPsSJJ4wDTXWMumJqbR+BLzhJJG0skE=",
+        "narHash": "sha256-RuAWONXb+U3omSsuIPCrPcgj0XYqv+2djG0cnPGEyKg=",
         "ref": "main",
-        "rev": "e3962d02c78b9c7b4d18148d931a9a4bf22e7902",
+        "rev": "3123b8b474319bc75ee780e0357dcdea69dc85e6",
-        "revCount": 254,
+        "revCount": 244,
         "type": "git",
         "url": "https://git.pvv.ntnu.no/Projects/dibbler.git"
       },

flake.nix

@@ -49,15 +49,7 @@
     qotd.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs =
+  outputs = { self, nixpkgs, nixpkgs-unstable, sops-nix, disko, ... }@inputs:
-    {
-      self,
-      nixpkgs,
-      nixpkgs-unstable,
-      sops-nix,
-      disko,
-      ...
-    }@inputs:
   let
     inherit (nixpkgs) lib;
     systems = [
@@ -74,27 +66,23 @@
       "georg"
       "ildkule"
     ];
-    in
+  in {
-    {
     inputs = lib.mapAttrs (_: src: src.outPath) inputs;
 
-      pkgs = forAllSystems (
+    pkgs = forAllSystems (system: import nixpkgs {
-        system:
-        import nixpkgs {
       inherit system;
-          config.allowUnfreePredicate =
+      config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg)
-            pkg:
+        [
-            builtins.elem (lib.getName pkg) [
           "nvidia-x11"
           "nvidia-settings"
         ];
-        }
+    });
-      );
 
-      nixosConfigurations =
+    nixosConfigurations = let
-        let
       nixosConfig =
-            nixpkgs: name: configurationPath:
+        nixpkgs:
+        name:
+        configurationPath:
         extraArgs@{
           localSystem ? "x86_64-linux", # buildPlatform
           crossSystem ? "x86_64-linux", # hostPlatform
@@ -107,25 +95,21 @@
         let
           commonPkgsConfig = {
             inherit localSystem crossSystem;
-                config.allowUnfreePredicate =
+            config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg)
-                  pkg:
+              [
-                  builtins.elem (lib.getName pkg) [
                 "nvidia-x11"
                 "nvidia-settings"
               ];
-                overlays =
+            overlays = (lib.optionals enableDefaults [
-                  (lib.optionals enableDefaults [
               # Global overlays go here
               inputs.roowho2.overlays.default
-                  ])
+            ]) ++ overlays;
-                  ++ overlays;
           };
 
           pkgs = import nixpkgs commonPkgsConfig;
           unstablePkgs = import nixpkgs-unstable commonPkgsConfig;
         in
-            lib.nixosSystem (
+        lib.nixosSystem (lib.recursiveUpdate
-              lib.recursiveUpdate
         {
           system = crossSystem;
 
@@ -135,38 +119,32 @@
             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 =
+      stableNixosConfig = name: extraArgs:
-            name: extraArgs: nixosConfig nixpkgs name ./hosts/${name}/configuration.nix extraArgs;
+          nixosConfig nixpkgs name ./hosts/${name}/configuration.nix extraArgs;
-        in
+    in {
-        {
       bakke = stableNixosConfig "bakke" {
         modules = [
           inputs.disko.nixosModules.disko
@@ -257,8 +235,8 @@
         ];
       };
     }
-        // (
+    //
-          let
+    (let
       skrottConfig = {
         modules = [
           (nixpkgs + "/nixos/modules/installer/sd-card/sd-image-aarch64.nix")
@@ -274,46 +252,30 @@
           })
         ];
       };
-          in
+    in {
-          {
       skrott = self.nixosConfigurations.skrott-native;
-            skrott-native = stableNixosConfig "skrott" (
+      skrott-native = stableNixosConfig "skrott" (skrottConfig // {
-              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 =
+      stableLupineNixosConfig = name: extraArgs:
-              name: extraArgs: nixosConfig nixpkgs name ./hosts/lupine/configuration.nix extraArgs;
+          nixosConfig nixpkgs name ./hosts/lupine/configuration.nix extraArgs;
-          in
+    in lib.genAttrs machineNames (name: stableLupineNixosConfig name {
-          lib.genAttrs machineNames (
-            name:
-            stableLupineNixosConfig name {
       modules = [{ networking.hostName = name; }];
       specialArgs.lupineName = name;
-            }
+    }));
-          )
-        );
 
     nixosModules = {
       bluemap = ./modules/bluemap.nix;
@@ -326,8 +288,7 @@
     };
 
     devShells = forAllSystems (system: {
-        default =
+      default = let
-          let
         pkgs = import nixpkgs-unstable {
           inherit system;
           overlays = [
@@ -336,10 +297,8 @@
             })
           ];
         };
-          in
+      in pkgs.callPackage ./shell.nix { };
-          pkgs.callPackage ./shell.nix { };
+      cuda = let
-        cuda =
-          let
         cuda-pkgs = import nixpkgs-unstable {
           inherit system;
           config = {
@@ -347,22 +306,19 @@
             cudaSupport = true;
           };
         };
-          in
+      in cuda-pkgs.callPackage ./shells/cuda.nix { };
-          cuda-pkgs.callPackage ./shells/cuda.nix { };
     });
 
     packages = {
-        "x86_64-linux" =
+      "x86_64-linux" = let
-          let
         system = "x86_64-linux";
         pkgs = nixpkgs.legacyPackages.${system};
-          in
+      in rec {
-          rec {
         default = important-machines;
-            important-machines = pkgs.linkFarm "important-machines" (
+        important-machines = pkgs.linkFarm "important-machines"
-              lib.getAttrs importantMachines self.packages.${system}
+          (lib.getAttrs importantMachines self.packages.${system});
-            );
+        all-machines = pkgs.linkFarm "all-machines"
-            all-machines = pkgs.linkFarm "all-machines" (lib.getAttrs allMachines self.packages.${system});
+          (lib.getAttrs allMachines self.packages.${system});
 
         simplesamlphp = pkgs.callPackage ./packages/simplesamlphp { };
 
@@ -374,15 +330,13 @@
       # Mediawiki extensions
       (lib.pipe null [
         (_: pkgs.callPackage ./packages/mediawiki-extensions { })
-              (lib.flip builtins.removeAttrs [
+        (lib.flip builtins.removeAttrs ["override" "overrideDerivation"])
-                "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
       {
@@ -395,8 +349,7 @@
       }
       //
       # Nix-topology
-            (
+      (let
-              let
         topology' = import inputs.nix-topology {
           pkgs = import nixpkgs {
             inherit system;
@@ -415,9 +368,7 @@
           modules = [
             ./topology
             {
-                      nixosConfigurations = lib.mapAttrs (
+              nixosConfigurations = lib.mapAttrs (_name: nixosCfg: nixosCfg.extendModules {
-                        _name: nixosCfg:
-                        nixosCfg.extendModules {
                 modules = [
                   inputs.nix-topology.nixosModules.default
                   ./topology/service-extractors/greg-ng.nix
@@ -425,27 +376,21 @@
                   ./topology/service-extractors/mysql.nix
                   ./topology/service-extractors/gitea-runners.nix
                 ];
-                        }
+              }) self.nixosConfigurations;
-                      ) self.nixosConfigurations;
             }
           ];
         };
-              in
+      in {
-              {
         topology = topology'.config.output;
-                topology-png =
+        topology-png = pkgs.runCommand "pvv-config-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,9 +1,4 @@
-{
+{ config, pkgs, values, ... }:
-  config,
-  pkgs,
-  values,
-  ...
-}:
 {
   imports = [
       ./hardware-configuration.nix
@@ -14,10 +9,7 @@
   networking.hostId = "99609ffc";
   systemd.network.networks."30-enp2s0" = values.defaultNetworkConfig // {
     matchConfig.Name = "enp2s0";
-    address = with values.hosts.bakke; [
+    address = with values.hosts.bakke; [ (ipv4 + "/25") (ipv6 + "/64") ];
-      (ipv4 + "/25")
-      (ipv6 + "/64")
-    ];
   };
 
   # Don't change (even during upgrades) unless you know what you are doing.

hosts/bakke/hardware-configuration.nix

@@ -1,58 +1,40 @@
 # 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 = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-    "ehci_pci"
-    "ahci"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/0f63c3d2-fc12-4ed5-a5a5-141bfd67a571";
+    { device = "/dev/disk/by-uuid/0f63c3d2-fc12-4ed5-a5a5-141bfd67a571";
       fsType = "btrfs";
       options = [ "subvol=root" ];
     };
 
-  fileSystems."/home" = {
+  fileSystems."/home" =
-    device = "/dev/disk/by-uuid/0f63c3d2-fc12-4ed5-a5a5-141bfd67a571";
+    { device = "/dev/disk/by-uuid/0f63c3d2-fc12-4ed5-a5a5-141bfd67a571";
       fsType = "btrfs";
       options = [ "subvol=home" ];
     };
 
-  fileSystems."/nix" = {
+  fileSystems."/nix" =
-    device = "/dev/disk/by-uuid/0f63c3d2-fc12-4ed5-a5a5-141bfd67a571";
+    { device = "/dev/disk/by-uuid/0f63c3d2-fc12-4ed5-a5a5-141bfd67a571";
       fsType = "btrfs";
-    options = [
+      options = [ "subvol=nix" "noatime" ];
-      "subvol=nix"
-      "noatime"
-    ];
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/sdc2";
+    { device = "/dev/sdc2";
       fsType = "vfat";
-    options = [
+      options = [ "fmask=0022" "dmask=0022" ];
-      "fmask=0022"
-      "dmask=0022"
-    ];
     };
 
   swapDevices = [ ];

hosts/bekkalokk/configuration.nix

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

hosts/bekkalokk/hardware-configuration.nix

@@ -1,42 +1,30 @@
 # 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 = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-    "ehci_pci"
-    "ahci"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/sda1";
+    { device = "/dev/sda1";
       fsType = "btrfs";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/CE63-3B9B";
+    { device = "/dev/disk/by-uuid/CE63-3B9B";
       fsType = "vfat";
     };
 
-  swapDevices = [
+  swapDevices =
-    { device = "/dev/disk/by-uuid/2df10c7b-0dec-45c6-a728-533f7da7f4b9"; }
+    [ { 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,15 +1,8 @@
-{
+{ 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" ];
 
@@ -24,11 +17,9 @@ in
 
     host = "minecraft.pvv.ntnu.no";
 
-    maps =
+    maps = let
-      let
       inherit (inputs.minecraft-kartverket.packages.${pkgs.stdenv.hostPlatform.system}) bluemap-export;
-      in
+    in {
-      {
       "verden" = {
         extraHoconMarkersFile = "${bluemap-export}/overworld.hocon";
         settings = {
@@ -62,11 +53,9 @@ 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" = {
@@ -94,8 +83,7 @@ in
   systemd.services."render-bluemap-maps" = {
     serviceConfig = {
       StateDirectory = [ "bluemap/world" ];
-      ExecStartPre =
+      ExecStartPre = let
-        let
         rsyncArgs = lib.cli.toCommandLineShellGNU { } {
           archive = true;
           compress = true;
@@ -104,8 +92,7 @@ in
           no-group = true;
           rsh = "${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=%d/ssh-known-hosts -i %d/sshkey";
         };
-        in
+      in "${lib.getExe pkgs.rsync} ${rsyncArgs} root@innovation.pvv.ntnu.no:/ ${vanillaSurvival}";
-        "${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/config.php

@@ -858,7 +858,11 @@ $config = [
     /*
      * Which theme directory should be used?
      */
-    'theme.use' => 'default',
+    'module.enable' => [
+	    'themepvv' => TRUE,
+    ],
+
+    'theme.use' => 'themepvv:pvv',
 
     /*
      * Set this option to the text you would like to appear at the header of each page. Set to false if you don't want

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

@@ -1,16 +1,8 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 let
   pwAuthScript = pkgs.writeShellApplication {
     name = "pwauth";
-    runtimeInputs = with pkgs; [
+    runtimeInputs = with pkgs; [ coreutils heimdal ];
-      coreutils
-      heimdal
-    ];
     text = ''
       read -r user1
       user2="$(echo -n "$user1" | tr -c -d '0123456789abcdefghijklmnopqrstuvwxyz')"
@@ -93,20 +85,14 @@ let
 
         substituteInPlace "$out" \
           --replace-warn '$SAML_COOKIE_SECURE' 'true' \
-          --replace-warn '$SAML_COOKIE_SALT' 'file_get_contents("${
+          --replace-warn '$SAML_COOKIE_SALT' 'file_get_contents("${config.sops.secrets."idp/cookie_salt".path}")' \
-            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("${
+          --replace-warn '$SAML_ADMIN_PASSWORD' 'file_get_contents("${config.sops.secrets."idp/admin_password".path}")' \
-            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("${
+          --replace-warn '$SAML_DATABASE_PASSWORD' 'file_get_contents("${config.sops.secrets."idp/postgres_password".path}")' \
-            config.sops.secrets."idp/postgres_password".path
-          }")' \
           --replace-warn '$CACHE_DIRECTORY' '/var/cache/idp'
       '';
 
@@ -172,12 +158,10 @@ in
     services.phpfpm.pools.idp = {
       user = "idp";
       group = "idp";
-      settings =
+      settings = let
-        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,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 {
   security.krb5 = {
     enable = true;

hosts/bekkalokk/services/mediawiki/default.nix

@@ -1,12 +1,4 @@
-{
+{ pkgs, lib, fp, config, values, ... }: let
-  pkgs,
-  lib,
-  fp,
-  config,
-  values,
-  ...
-}:
-let
   cfg = config.services.mediawiki;
 
   # "mediawiki"
@@ -17,9 +9,7 @@ let
 
   simplesamlphp = pkgs.simplesamlphp.override {
     extra_files = {
-      "metadata/saml20-idp-remote.php" = pkgs.writeText "mediawiki-saml20-idp-remote.php" (
+      "metadata/saml20-idp-remote.php" = pkgs.writeText "mediawiki-saml20-idp-remote.php" (import ../idp-simplesamlphp/metadata.php.nix);
-        import ../idp-simplesamlphp/metadata.php.nix
-      );
 
       "config/authsources.php" = ./simplesaml-authsources.php;
 
@@ -28,47 +18,34 @@ let
 
         substituteInPlace "$out" \
           --replace-warn '$SAML_COOKIE_SECURE' 'true' \
-          --replace-warn '$SAML_COOKIE_SALT' 'file_get_contents("${
+          --replace-warn '$SAML_COOKIE_SALT' 'file_get_contents("${config.sops.secrets."mediawiki/simplesamlphp/cookie_salt".path}")' \
-            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("${
+          --replace-warn '$SAML_ADMIN_PASSWORD' 'file_get_contents("${config.sops.secrets."mediawiki/simplesamlphp/admin_password".path}")' \
-            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("${
+          --replace-warn '$SAML_DATABASE_PASSWORD' 'file_get_contents("${config.sops.secrets."mediawiki/simplesamlphp/postgres_password".path}")' \
-            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 =
+  sops.secrets = lib.pipe [
-    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
   ];
 
@@ -238,9 +215,7 @@ in
 
   # Cache directory for simplesamlphp
   # systemd.services.phpfpm-mediawiki.serviceConfig.CacheDirectory = "mediawiki/simplesamlphp";
-  systemd.tmpfiles.settings."10-mediawiki"."/var/cache/mediawiki/simplesamlphp".d =
+  systemd.tmpfiles.settings."10-mediawiki"."/var/cache/mediawiki/simplesamlphp".d = lib.mkIf cfg.enable {
-    lib.mkIf cfg.enable
-      {
     user = "mediawiki";
     group = "mediawiki";
     mode = "0770";
@@ -278,12 +253,9 @@ 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 =
+      "= /favicon.ico".alias = pkgs.runCommandLocal "mediawiki-favicon.ico" {
-        pkgs.runCommandLocal "mediawiki-favicon.ico"
-          {
         buildInputs = with pkgs; [ imagemagick ];
-          }
+      } ''
-          ''
         magick \
           ${fp /assets/logo_blue_regular.png} \
           -resize x64 \
@@ -301,9 +273,7 @@ in
   systemd.services.mediawiki-init = lib.mkIf cfg.enable {
     after = [ "sops-install-secrets.service" ];
     serviceConfig = {
-      BindReadOnlyPaths = [
+      BindReadOnlyPaths = [ "/run/credentials/mediawiki-init.service/secret-key:/var/lib/mediawiki/secret.key" ];
-        "/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";
     };
@@ -312,9 +282,7 @@ in
   systemd.services.phpfpm-mediawiki = lib.mkIf cfg.enable {
     after = [ "sops-install-secrets.service" ];
     serviceConfig = {
-      BindReadOnlyPaths = [
+      BindReadOnlyPaths = [ "/run/credentials/phpfpm-mediawiki.service/secret-key:/var/lib/mediawiki/secret.key" ];
-        "/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,8 +11,7 @@ in
 {
   # Source: https://www.pierreblazquez.com/2023/06/17/how-to-harden-apache-php-fpm-daemons-using-systemd/
   systemd.services = lib.genAttrs pools (_: {
-    serviceConfig =
+    serviceConfig = let
-      let
       caps = [
         "CAP_NET_BIND_SERVICE"
         "CAP_SETGID"
@@ -22,8 +21,7 @@ in
         "CAP_IPC_LOCK"
         "CAP_DAC_OVERRIDE"
       ];
-      in
+    in {
-      {
       AmbientCapabilities = caps;
       CapabilityBoundingSet = caps;
       DeviceAllow = [ "" ];

hosts/bekkalokk/services/vaultwarden.nix

@@ -1,18 +1,11 @@
-{
+{ config, pkgs, lib, values, ... }:
-  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";

hosts/bekkalokk/services/webmail/default.nix

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

hosts/bekkalokk/services/webmail/roundcube.nix

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

hosts/bekkalokk/services/webmail/snappymail.nix

@@ -1,15 +1,7 @@
-{
+{ config, lib, fp, pkgs, values, ... }:
-  config,
-  lib,
-  fp,
-  pkgs,
-  values,
-  ...
-}:
 let
   cfg = config.services.snappymail;
-in
+in {
-{
   imports = [ (fp /modules/snappymail.nix) ];
 
   services.snappymail = {

hosts/bekkalokk/services/website/default.nix

@@ -1,27 +1,18 @@
-{
+{ pkgs, lib, config, ... }:
-  pkgs,
-  lib,
-  config,
-  ...
-}:
 let
   format = pkgs.formats.php { };
   cfg = config.services.pvv-nettsiden;
-in
+in {
-{
   imports = [
     ./fetch-gallery.nix
   ];
 
-  sops.secrets =
+  sops.secrets = lib.genAttrs [
-    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" ];
@@ -44,10 +35,8 @@ in
 
     package = pkgs.pvv-nettsiden.override {
       extra_files = {
-        "${pkgs.pvv-nettsiden.passthru.simplesamlphpPath}/metadata/saml20-idp-remote.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.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}/config/authsources.php" =
-          pkgs.writeText "pvv-nettsiden-authsources.php" ''
           <?php
           $config = array(
               'admin' => array(
@@ -65,12 +54,9 @@ in
 
     domainName = "www.pvv.ntnu.no";
 
-    settings =
+    settings = let
-      let
+      includeFromSops = path: format.lib.mkRaw "file_get_contents('${config.sops.secrets."nettsiden/${path}".path}')";
-        includeFromSops =
+    in {
-          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,15 +1,8 @@
-{
+{ pkgs, lib, config, values, ... }:
-  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?
@@ -44,20 +37,14 @@ in
   };
 
   systemd.services.pvv-nettsiden-gallery-update = {
-    path = with pkgs; [
+    path = with pkgs; [ imagemagick gnutar gzip ];
-      imagemagick
-      gnutar
-      gzip
-    ];
 
     script = ''
-      tar ${
+      tar ${lib.cli.toGNUCommandLineShell {} {
-        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,14 +1,11 @@
 { lib, ... }:
 {
-  services.nginx.virtualHosts =
+  services.nginx.virtualHosts = lib.genAttrs [
-    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,9 +1,4 @@
-{
+{ fp, pkgs, values, ... }:
-  fp,
-  pkgs,
-  values,
-  ...
-}:
 {
   imports = [
     ./hardware-configuration.nix
@@ -24,16 +19,8 @@
   systemd.network.networks."30-ens18" = values.defaultNetworkConfig // {
     #matchConfig.Name = "enp6s0f0";
     matchConfig.Name = "ens18";
-    address =
+    address = with values.hosts.bicep; [ (ipv4 + "/25") (ipv6 + "/64") ]
-      with values.hosts.bicep;
+      ++ (with values.services.turn; [ (ipv4 + "/25") (ipv6 + "/64") ]);
-      [
-        (ipv4 + "/25")
-        (ipv6 + "/64")
-      ]
-      ++ (with values.services.turn; [
-        (ipv4 + "/25")
-        (ipv6 + "/64")
-      ]);
   };
   systemd.network.wait-online = {
     anyInterface = true;

hosts/bicep/hardware-configuration.nix

@@ -1,48 +1,33 @@
 # 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 = [
+  imports =
-    (modulesPath + "/profiles/qemu-guest.nix")
+    [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ahci" "sd_mod" "sr_mod" ];
-    "ata_piix"
-    "uhci_hcd"
-    "ahci"
-    "sd_mod"
-    "sr_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/20e06202-7a09-47cc-8ef6-5e7afe19453a";
+    { 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" = {
+  fileSystems."/data" =
-    device = "/dev/disk/by-uuid/c81af266-0781-4084-b8eb-c2587cbcf1ba";
+    { device = "/dev/disk/by-uuid/c81af266-0781-4084-b8eb-c2587cbcf1ba";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/198B-E363";
+    { device = "/dev/disk/by-uuid/198B-E363";
       fsType = "vfat";
-    options = [
+      options = [ "fmask=0022" "dmask=0022" ];
-      "fmask=0022"
-      "dmask=0022"
-    ];
     };
 
   swapDevices = [ ];

hosts/bicep/services/calendar-bot.nix

@@ -1,14 +1,7 @@
-{
+{ 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,10 +1,4 @@
-{
+{ config, pkgs, lib, fp, ... }:
-  config,
-  pkgs,
-  lib,
-  fp,
-  ...
-}:
 let
   cfg = config.services.gickup;
 in
@@ -26,16 +20,14 @@ in
       lfs = false;
     };
 
-    instances =
+    instances = let
-      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;
@@ -66,11 +58,9 @@ in
     };
   };
 
-  services.cgit =
+  services.cgit = let
-    let
     domain = "mirrors.pvv.ntnu.no";
-    in
+  in {
-    {
     ${domain} = {
       enable = true;
       package = pkgs.callPackage (fp /packages/cgit.nix) { };
@@ -96,18 +86,13 @@ in
     forceSSL = true;
     enableACME = true;
 
-    locations."= /PVV-logo.png".alias =
+    locations."= /PVV-logo.png".alias = let
-      let
+      small-pvv-logo = pkgs.runCommandLocal "pvv-logo-96x96" {
-        small-pvv-logo =
-          pkgs.runCommandLocal "pvv-logo-96x96"
-            {
         nativeBuildInputs = [ pkgs.imagemagick ];
-            }
+      } ''
-            ''
         magick '${fp /assets/logo_blue_regular.svg}' -resize 96x96 PNG:"$out"
       '';
-      in
+    in toString small-pvv-logo;
-      toString small-pvv-logo;
   };
 
   systemd.services."fcgiwrap-cgit-mirrors.pvv.ntnu.no" = {

hosts/bicep/services/matrix/coturn.nix

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

hosts/bicep/services/matrix/discord.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, fp, ... }:
-  config,
-  lib,
-  fp,
-  ...
-}:
 
 let
   cfg = config.services.mx-puppet-discord;
@@ -49,6 +44,7 @@ in
     ];
   };
 
+
   services.mx-puppet-discord.enable = false;
   services.mx-puppet-discord.settings = {
     bridge = {
@@ -56,21 +52,16 @@ in
       domain = "pvv.ntnu.no";
       homeserverUrl = "https://matrix.pvv.ntnu.no";
     };
-    provisioning.whitelist = [
+    provisioning.whitelist = [ "@dandellion:dodsorf\\.as" "@danio:pvv\\.ntnu\\.no"];
-      "@dandellion:dodsorf\\.as"
-      "@danio:pvv\\.ntnu\\.no"
-    ];
     relay.whitelist = [ ".*" ];
-    selfService.whitelist = [
+    selfService.whitelist = [ "@danio:pvv\\.ntnu\\.no" "@dandellion:dodsorf\\.as" ];
-      "@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,13 +1,7 @@
-{
+{ 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,11 +1,4 @@
-{
+{ config, lib, fp, unstablePkgs, inputs, ... }:
-  config,
-  lib,
-  fp,
-  unstablePkgs,
-  inputs,
-  ...
-}:
 
 let
   cfg = config.services.matrix-hookshot;
@@ -107,8 +100,7 @@ in
       };
 
       serviceBots = [
-        {
+        { localpart = "bot_feeds";
-          localpart = "bot_feeds";
           displayname = "Aya";
           avatar = ./feeds.png;
           prefix = "!aya";
@@ -123,44 +115,20 @@ in
 
       permissions = [
         # Users of the PVV Server
-        {
+        { actor = "pvv.ntnu.no";
-          actor = "pvv.ntnu.no";
+          services = [ { service = "*"; level = "commands"; } ];
-          services = [
-            {
-              service = "*";
-              level = "commands";
-            }
-          ];
         }
         # Members of Medlem space (for people with their own hs)
-        {
+        { actor = "!pZOTJQinWyyTWaeOgK:pvv.ntnu.no";
-          actor = "!pZOTJQinWyyTWaeOgK:pvv.ntnu.no";
+          services = [ { service = "*"; level = "commands"; } ];
-          services = [
-            {
-              service = "*";
-              level = "commands";
-            }
-          ];
         }
         # Members of Drift
-        {
+        { actor = "!eYgeufLrninXxQpYml:pvv.ntnu.no";
-          actor = "!eYgeufLrninXxQpYml:pvv.ntnu.no";
+          services = [ { service = "*"; level = "admin"; } ];
-          services = [
-            {
-              service = "*";
-              level = "admin";
-            }
-          ];
         }
         # Dan bootstrap
-        {
+        { actor = "@dandellion:dodsorf.as";
-          actor = "@dandellion:dodsorf.as";
+          services = [ { service = "*"; level = "admin"; } ];
-          services = [
-            {
-              service = "*";
-              level = "admin";
-            }
-          ];
         }
       ];
     };

hosts/bicep/services/matrix/livekit.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, fp, ... }:
-  config,
-  lib,
-  fp,
-  ...
-}:
 let
   synapseConfig = config.services.matrix-synapse-next;
   matrixDomain = "matrix.pvv.ntnu.no";
@@ -25,12 +20,10 @@ 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 = {
@@ -50,12 +43,7 @@ in
     keyFile = config.sops.templates."matrix-livekit-keyfile".path;
   };
 
-  systemd.services.lk-jwt-service.environment.LIVEKIT_FULL_ACCESS_HOMESERVERS = lib.mkIf cfg.enable (
+  systemd.services.lk-jwt-service.environment.LIVEKIT_FULL_ACCESS_HOMESERVERS = lib.mkIf cfg.enable (builtins.concatStringsSep "," [ "pvv.ntnu.no" "dodsorf.as" ]);
-    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,9 +1,4 @@
-{
+{ config, lib, fp, ... }:
-  config,
-  lib,
-  fp,
-  ...
-}:
 
 {
   sops.secrets."matrix/mjolnir/access_token" = {

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

@@ -1,11 +1,4 @@
-{
+{ config, pkgs, lib, values, fp, ... }:
-  config,
-  pkgs,
-  lib,
-  values,
-  fp,
-  ...
-}:
 let
   cfg = config.services.matrix-ooye;
 in

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

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

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

@@ -1,9 +1,5 @@
-{
+{ 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,9 +1,4 @@
-{
+{ config, lib, utils, ... }:
-  config,
-  lib,
-  utils,
-  ...
-}:
 let
   cfg = config.services.synapse-auto-compressor;
 in

hosts/bicep/services/matrix/synapse.nix

@@ -1,23 +1,13 @@
-{
+{ 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 =
+  imap0Attrs = with lib; f: set:
-    with lib;
+    listToAttrs (imap0 (i: attr: nameValuePair attr (f i attr set.${attr})) (attrNames set));
-    f: set: listToAttrs (imap0 (i: attr: nameValuePair attr (f i attr set.${attr})) (attrNames set));
+in {
-in
-{
   sops.secrets."matrix/synapse/signing_key" = {
     key = "synapse/signing_key";
     sopsFile = fp /secrets/bicep/matrix.yaml;
@@ -33,9 +23,7 @@ in
     owner = config.users.users.matrix-synapse.name;
     group = config.users.users.matrix-synapse.group;
     content = ''
-      registration_shared_secret: ${
+      registration_shared_secret: ${config.sops.placeholder."matrix/synapse/user_registration/registration_shared_secret"}
-        config.sops.placeholder."matrix/synapse/user_registration/registration_shared_secret"
-      }
     '';
   };
 
@@ -122,8 +110,7 @@ in
       password_config.enabled = true;
 
       modules = [
-        {
+        { module = "smtp_auth_provider.SMTPAuthProvider";
-          module = "smtp_auth_provider.SMTPAuthProvider";
           config = {
             smtp_host = "smtp.pvv.ntnu.no";
           };
@@ -212,30 +199,22 @@ in
     };
   }
   {
-      locations =
+    locations = let
-        let
       connectionInfo = w: matrix-lib.workerConnectionResource "metrics" w;
-          socketAddress =
+      socketAddress = w: let c = connectionInfo w; in "${c.host}:${toString c.port}";
-            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
+    in lib.mapAttrs' (n: v: lib.nameValuePair
-        lib.mapAttrs' (
+      (metricsPath v) {
-          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" = {
@@ -247,28 +226,18 @@ in
       '';
     };
 
-      locations."/metrics/" =
+    locations."/metrics/" = let
-        let
+      endpoints = lib.pipe cfg.workers.instances [
-          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" ];
-            ++ [ "matrix.pvv.ntnu.no/metrics/master/1" ];
+    in {
-        in
+      alias = pkgs.writeTextDir "/config.json"
-        {
+        (builtins.toJSON [
-          alias =
+          { targets = endpoints;
-            pkgs.writeTextDir "/config.json" (
-              builtins.toJSON [
-                {
-                  targets = endpoints;
             labels = { };
-                }
+          }]) + "/";
-              ]
-            )
-            + "/";
     };
-    }
+  }];
-  ];
 }

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

@@ -1,9 +1,4 @@
-{
+{ 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,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 let
   cfg = config.services.minecraft-heatmap;
 in
@@ -32,15 +27,13 @@ in
       "sshkey:${config.sops.secrets."minecraft-heatmap/ssh-key/private".path}"
     ];
 
-    preStart =
+    preStart = let
-      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,10 +1,4 @@
-{
+{ config, lib, pkgs, values, ... }:
-  config,
-  lib,
-  pkgs,
-  values,
-  ...
-}:
 let
   cfg = config.services.mysql;
   backupDir = "/data/mysql-backups";
@@ -50,11 +44,9 @@ in
       zstd
     ];
 
-    script =
+    script = let
-      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,10 +1,4 @@
-{
+{ config, pkgs, lib, values, ... }:
-  config,
-  pkgs,
-  lib,
-  values,
-  ...
-}:
 let
   cfg = config.services.mysql;
   dataDir = "/data/mysql";
@@ -42,14 +36,12 @@ 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,10 +1,4 @@
-{
+{ config, lib, pkgs, values, ... }:
-  config,
-  lib,
-  pkgs,
-  values,
-  ...
-}:
 let
   cfg = config.services.postgresql;
   backupDir = "/data/postgresql-backups";
@@ -51,11 +45,9 @@ in
       cfg.package
     ];
 
-    script =
+    script = let
-      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,10 +1,4 @@
-{
+{ config, lib, pkgs, values, ... }:
-  config,
-  lib,
-  pkgs,
-  values,
-  ...
-}:
 let
   cfg = config.services.postgresql;
 in

hosts/bikkje/configuration.nix

@@ -1,10 +1,4 @@
-{
+{ config, pkgs, values, ... }:
-  lib,
-  config,
-  pkgs,
-  values,
-  ...
-}:
 {
   networking.nat = {
     enable = true;
@@ -16,9 +10,7 @@
 
   containers.bikkje = {
     autoStart = true;
-    config =
+    config = { config, pkgs, ... }: {
-      { config, pkgs, ... }:
-      {
       #import packages
       packages = with pkgs; [
           alpine
@@ -37,52 +29,12 @@
         firewall = {
           enable = true;
           # Allow SSH and HTTP and ports for email and irc
-            allowedTCPPorts = [
+          allowedTCPPorts = [ 80 22 194 994 6665 6666 6667 6668 6669 6697 995 993 25 465 587 110 143 993 995 ];
-              80
+          allowedUDPPorts = [ 80 22 194 994 6665 6666 6667 6668 6669 6697 995 993 25 465 587 110 143 993 995 ];
-              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 = lib.mkForce false;
+        useHostResolvConf = mkForce false;
       };
 
       services.resolved.enable = true;
@@ -92,4 +44,4 @@
       system.stateVersion = "23.11";
     };
   };
-}
+};

hosts/brzeczyszczykiewicz/configuration.nix

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

hosts/brzeczyszczykiewicz/hardware-configuration.nix

@@ -1,44 +1,30 @@
 # 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 = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
-    "xhci_pci"
-    "ehci_pci"
-    "ahci"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-    "sr_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/4e8667f8-55de-4103-8369-b94665f42204";
+    { device = "/dev/disk/by-uuid/4e8667f8-55de-4103-8369-b94665f42204";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/82E3-3D03";
+    { device = "/dev/disk/by-uuid/82E3-3D03";
       fsType = "vfat";
     };
 
-  swapDevices = [
+  swapDevices =
-    { device = "/dev/disk/by-uuid/d0bf9a21-44bc-44a3-ae55-8f0971875883"; }
+    [ { 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,10 +1,4 @@
-{
+{ config, fp, pkgs, values, ... }:
-  config,
-  fp,
-  pkgs,
-  values,
-  ...
-}:
 {
   imports = [
       # Include the results of the hardware scan.
@@ -16,10 +10,7 @@
 
   systemd.network.networks."30-eno1" = values.defaultNetworkConfig // {
     matchConfig.Name = "eno1";
-    address = with values.hosts.georg; [
+    address = with values.hosts.georg; [ (ipv4 + "/25") (ipv6 + "/64") ];
-      (ipv4 + "/25")
-      (ipv6 + "/64")
-    ];
   };
 
   services.spotifyd = {

hosts/georg/hardware-configuration.nix

@@ -1,43 +1,30 @@
 # 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 = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-    "xhci_pci"
-    "ehci_pci"
-    "ahci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/33825f0d-5a63-40fc-83db-bfa1ebb72ba0";
+    { device = "/dev/disk/by-uuid/33825f0d-5a63-40fc-83db-bfa1ebb72ba0";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/145E-7362";
+    { device = "/dev/disk/by-uuid/145E-7362";
       fsType = "vfat";
     };
 
-  swapDevices = [
+  swapDevices =
-    { device = "/dev/disk/by-uuid/7ed27e21-3247-44cd-8bcc-5d4a2efebf57"; }
+    [ { device = "/dev/disk/by-uuid/7ed27e21-3247-44cd-8bcc-5d4a2efebf57"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/ildkule/configuration.nix

@@ -1,11 +1,4 @@
-{
+{ config, fp, pkgs, lib, values, ... }:
-  config,
-  fp,
-  pkgs,
-  lib,
-  values,
-  ...
-}:
 {
   imports = [
       # Include the results of the hardware scan.
@@ -24,11 +17,9 @@
 
   # Openstack Neutron and systemd-networkd are not best friends, use something else:
   systemd.network.enable = lib.mkForce false;
-  networking =
+  networking = let
-    let
     hostConf = values.hosts.ildkule;
-    in
+  in {
-    {
     tempAddresses = "disabled";
     useDHCP = lib.mkForce true;
 
@@ -38,20 +29,11 @@
 
     interfaces."ens4" = {
       ipv4.addresses = [
-          {
+        { address = hostConf.ipv4;          prefixLength = 32; }
-            address = hostConf.ipv4;
+        { address = hostConf.ipv4_internal; prefixLength = 24; }
-            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,12 +1,7 @@
 { modulesPath, lib, ... }:
 {
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
-    "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,9 +1,4 @@
-{
+{ config, lib, values, ... }:
-  config,
-  lib,
-  values,
-  ...
-}:
 let
   cfg = config.services.journald.remote;
   domainName = "journald.pvv.ntnu.no";
@@ -27,11 +22,9 @@ in
 
   services.journald.remote = {
     enable = true;
-    settings.Remote =
+    settings.Remote = let
-      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 = "-";
@@ -54,11 +47,9 @@ in
 
   systemd.services."systemd-journal-remote" = {
     serviceConfig = {
-      LoadCredential =
+      LoadCredential = let
-        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,19 +1,10 @@
-{
+{ config, pkgs, values, ... }: let
-  config,
-  pkgs,
-  values,
-  ...
-}:
-let
   cfg = config.services.grafana;
-in
+in {
-{
+  sops.secrets = let
-  sops.secrets =
-    let
     owner = "grafana";
     group = "grafana";
-    in
+  in {
-    {
     "keys/grafana/secret_key" = { inherit owner group; };
     "keys/grafana/admin_password" = { inherit owner group; };
   };
@@ -21,12 +12,10 @@ in
   services.grafana = {
     enable = true;
 
-    settings =
+    settings = let
-      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,8 +3,7 @@
 let
   cfg = config.services.loki;
   stateDir = "/data/monitoring/loki";
-in
+in {
-{
   services.loki = {
     enable = true;
     configuration = {

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

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

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

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

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

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

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

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

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

@@ -1,16 +1,13 @@
 { ... }:
 {
-  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 = [
       {
@@ -39,6 +36,5 @@
         target_label = "__address__";
       }
     ];
-    }
+  }];
-  ];
 }

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

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

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

@@ -1,14 +1,6 @@
-{
+{ 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" = {};
@@ -19,26 +11,22 @@ 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";
           };
-          }
+        }];
-        ];
       }
     ];
 
@@ -49,11 +37,9 @@ in
     };
   };
 
-  systemd.services.prometheus-postgres-exporter-knakelibrak.serviceConfig =
+  systemd.services.prometheus-postgres-exporter-knakelibrak.serviceConfig = let
-    let
     localCfg = config.services.prometheus.exporters.postgres;
-    in
+  in lib.recursiveUpdate config.systemd.services.prometheus-postgres-exporter.serviceConfig {
-    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,15 +1,9 @@
-{
+{ 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,9 +1,4 @@
-{
+{ pkgs, values, fp, ... }:
-  pkgs,
-  values,
-  fp,
-  ...
-}:
 {
   imports = [
     # Include the results of the hardware scan.
@@ -17,10 +12,7 @@
 
   systemd.network.networks."30-ens18" = values.defaultNetworkConfig // {
     matchConfig.Name = "ens18";
-    address = with values.hosts.kommode; [
+    address = with values.hosts.kommode; [ (ipv4 + "/25") (ipv6 + "/64") ];
-      (ipv4 + "/25")
-      (ipv6 + "/64")
-    ];
   };
 
   services.btrfs.autoScrub.enable = true;

hosts/kommode/hardware-configuration.nix

@@ -1,27 +1,14 @@
 # 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 = [
+  imports =
-    (modulesPath + "/profiles/qemu-guest.nix")
+    [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
-    "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,10 +1,4 @@
-{
+{ config, pkgs, lib, fp, ... }:
-  config,
-  pkgs,
-  lib,
-  fp,
-  ...
-}:
 let
   cfg = config.services.gitea;
 in
@@ -80,8 +74,7 @@ in
       Group = cfg.group;
     };
 
-    script =
+    script = let
-      let
       logo-svg = fp /assets/logo_blue_regular.svg;
       logo-png = fp /assets/logo_blue_regular.png;
 
@@ -99,21 +92,17 @@ in
         labels = lib.importJSON ./labels/projects.json;
       };
 
-        customTemplates =
+      customTemplates = pkgs.runCommandLocal "gitea-templates" {
-          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

hosts/kommode/services/gitea/default.nix

@@ -1,17 +1,9 @@
-{
+{ 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
@@ -19,15 +11,13 @@ in
     ./web-secret-provider
   ];
 
-  sops.secrets =
+  sops.secrets = let
-    let
     defaultConfig = {
       owner = "gitea";
       group = "gitea";
       restartUnits = [ "gitea.service" ];
     };
-    in
+  in {
-    {
     "gitea/database" = defaultConfig;
     "gitea/email-password" = defaultConfig;
     "gitea/lfs-jwt-secret" = defaultConfig;
@@ -225,8 +215,7 @@ in
   };
 
   systemd.services.gitea-dump = {
-    serviceConfig.ExecStart =
+    serviceConfig.ExecStart = let
-      let
       args = lib.cli.toGNUCommandLineShell { } {
         type = cfg.dump.type;
 
@@ -239,16 +228,13 @@ in
         # Logs are stored in the systemd journal
         skip-log = true;
       };
-      in
+    in lib.mkForce "${lib.getExe cfg.package} ${args}";
-      lib.mkForce "${lib.getExe cfg.package} ${args}";
 
     # Only keep n backup files at a time
-    postStop =
+    postStop = let
-      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,9 +1,4 @@
-{
+{ 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,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 let
   cfg = config.services.gitea;
 in

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

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 let
   organizations = [
     "Drift"
@@ -41,8 +36,7 @@ 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 = {
@@ -54,15 +48,11 @@ 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 = [
+    requires = [ "gitea.service" "network.target" ];
-      "gitea.service"
-      "network.target"
-    ];
     serviceConfig = {
       Slice = "system-giteaweb.slice";
       Type = "oneshot";
-      ExecStart =
+      ExecStart = let
-        let
         args = lib.cli.toGNUCommandLineShell { } {
           org = "%i";
           token-path = "%d/token";
@@ -76,8 +66,7 @@ in
           '';
           web-dir = "/var/lib/gitea-web/web";
         };
-        in
+      in "${giteaWebSecretProviderScript} ${args}";
-        "${giteaWebSecretProviderScript} ${args}";
 
       User = "gitea-web";
       Group = "gitea-web";
@@ -96,10 +85,7 @@ in
       ProtectControlGroups = true;
       ProtectKernelModules = true;
       ProtectKernelTunables = true;
-      RestrictAddressFamilies = [
+      RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
-        "AF_INET"
-        "AF_INET6"
-      ];
       RestrictRealtime = true;
       RestrictSUIDSGID = true;
       MemoryDenyWriteExecute = true;
@@ -119,9 +105,7 @@ in
 
   systemd.targets.timers.wants = map (org: "gitea-web-secret-provider@${org}.timer") organizations;
 
-  services.openssh.authorizedKeysFiles = map (
+  services.openssh.authorizedKeysFiles = map (org: "/var/lib/gitea-web/authorized_keys.d/${org}") organizations;
-    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,9 +1,4 @@
-{
+{ fp, values, lupineName, ... }:
-  fp,
-  values,
-  lupineName,
-  ...
-}:
 {
   imports = [
     ./hardware-configuration/${lupineName}.nix
@@ -17,10 +12,7 @@
 
   systemd.network.networks."30-enp0s31f6" = values.defaultNetworkConfig // {
     matchConfig.Name = "enp0s31f6";
-    address = with values.hosts.${lupineName}; [
+    address = with values.hosts.${lupineName}; [ (ipv4 + "/25") (ipv6 + "/64") ];
-      (ipv4 + "/25")
-      (ipv6 + "/64")
-    ];
     networkConfig.LLDP = false;
   };
   systemd.network.wait-online = {

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

@@ -1,45 +1,31 @@
 # 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 = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
-    "xhci_pci"
-    "ahci"
-    "usbhid"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/a949e2e8-d973-4925-83e4-bcd815e65af7";
+    { device = "/dev/disk/by-uuid/a949e2e8-d973-4925-83e4-bcd815e65af7";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/81D6-38D3";
+    { device = "/dev/disk/by-uuid/81D6-38D3";
       fsType = "vfat";
-    options = [
+      options = [ "fmask=0077" "dmask=0077" ];
-      "fmask=0077"
-      "dmask=0077"
-    ];
     };
 
-  swapDevices = [
+  swapDevices =
-    { device = "/dev/disk/by-uuid/82c2d7fa-7cd0-4398-8cf6-c892bc56264b"; }
+    [ { 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,45 +1,31 @@
 # 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 = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
-    "xhci_pci"
-    "ahci"
-    "usbhid"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/aa81d439-800b-403d-ac10-9d2aac3619d0";
+    { device = "/dev/disk/by-uuid/aa81d439-800b-403d-ac10-9d2aac3619d0";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/4A34-6AE5";
+    { device = "/dev/disk/by-uuid/4A34-6AE5";
       fsType = "vfat";
-    options = [
+      options = [ "fmask=0077" "dmask=0077" ];
-      "fmask=0077"
-      "dmask=0077"
-    ];
     };
 
-  swapDevices = [
+  swapDevices =
-    { device = "/dev/disk/by-uuid/efb7cd0c-c1ae-4a86-8bc2-8e7fd0066650"; }
+    [ { 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,45 +1,31 @@
 # 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 = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
-    "xhci_pci"
-    "ahci"
-    "usbhid"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/39ba059b-3205-4701-a832-e72c0122cb88";
+    { device = "/dev/disk/by-uuid/39ba059b-3205-4701-a832-e72c0122cb88";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/63FA-297B";
+    { device = "/dev/disk/by-uuid/63FA-297B";
       fsType = "vfat";
-    options = [
+      options = [ "fmask=0077" "dmask=0077" ];
-      "fmask=0077"
-      "dmask=0077"
-    ];
     };
 
-  swapDevices = [
+  swapDevices =
-    { device = "/dev/disk/by-uuid/9c72eb54-ea8c-4b09-808a-8be9b9a33869"; }
+    [ { 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,36 +1,25 @@
 # 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 = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
-    "xhci_pci"
-    "ahci"
-    "usbhid"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/c7bbb293-a0a3-4995-8892-0ec63e8c67dd";
+    { device = "/dev/disk/by-uuid/c7bbb293-a0a3-4995-8892-0ec63e8c67dd";
       fsType = "ext4";
     };
 
-  swapDevices = [
+  swapDevices =
-    { device = "/dev/disk/by-uuid/a86ffda8-8ecb-42a1-bf9f-926072e90ca5"; }
+    [ { 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,45 +1,31 @@
 # 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 = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
-    "xhci_pci"
-    "ahci"
-    "usbhid"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/5f8418ad-8ec1-4f9e-939e-f3a4c36ef343";
+    { device = "/dev/disk/by-uuid/5f8418ad-8ec1-4f9e-939e-f3a4c36ef343";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/F372-37DF";
+    { device = "/dev/disk/by-uuid/F372-37DF";
       fsType = "vfat";
-    options = [
+      options = [ "fmask=0077" "dmask=0077" ];
-      "fmask=0077"
-      "dmask=0077"
-    ];
     };
 
-  swapDevices = [
+  swapDevices =
-    { device = "/dev/disk/by-uuid/27bf292d-bbb3-48c4-a86e-456e0f1f648f"; }
+    [ { 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,8 +67,5 @@
 
   networking.dhcpcd.IPv6rs = false;
 
-  networking.firewall.interfaces."podman+".allowedUDPPorts = [
+  networking.firewall.interfaces."podman+".allowedUDPPorts = [53 5353];
-    53
-    5353
-  ];
 }

hosts/shark/configuration.nix

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

hosts/shark/hardware-configuration.nix

@@ -1,43 +1,30 @@
 # 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 = [
+  imports =
-    (modulesPath + "/profiles/qemu-guest.nix")
+    [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
-    "ata_piix"
-    "uhci_hcd"
-    "virtio_pci"
-    "virtio_scsi"
-    "sd_mod"
-    "sr_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/224c45db-9fdc-45d4-b3ad-aaf20b3efa8a";
+    { device = "/dev/disk/by-uuid/224c45db-9fdc-45d4-b3ad-aaf20b3efa8a";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/CC37-F5FE";
+    { device = "/dev/disk/by-uuid/CC37-F5FE";
       fsType = "vfat";
     };
 
-  swapDevices = [
+  swapDevices =
-    { device = "/dev/disk/by-uuid/a1ce3234-78b1-4565-9643-f4a05004424f"; }
+    [ { 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/hardware-configuration.nix

@@ -1,22 +1,11 @@
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
-  imports = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
-    "xhci_pci"
-    "ahci"
-    "usbhid"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];

hosts/skrott/configuration.nix

@@ -1,13 +1,4 @@
-{
+{ config, pkgs, lib, modulesPath, fp, values, ... }: {
-  config,
-  pkgs,
-  lib,
-  modulesPath,
-  fp,
-  values,
-  ...
-}:
-{
   imports = [
     (modulesPath + "/profiles/perlless.nix")
 
@@ -73,18 +64,14 @@
     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;
-        }
+      }];
-      ];
     };
   };
 

hosts/temmie/configuration.nix

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

hosts/temmie/hardware-configuration.nix

@@ -1,43 +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 = [
+  imports =
-    (modulesPath + "/profiles/qemu-guest.nix")
+    [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
-    "ata_piix"
-    "uhci_hcd"
-    "virtio_pci"
-    "virtio_scsi"
-    "sd_mod"
-    "sr_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/c3aed415-0054-4ac5-8d29-75a99cc26451";
+    { device = "/dev/disk/by-uuid/c3aed415-0054-4ac5-8d29-75a99cc26451";
       fsType = "btrfs";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/A367-83FD";
+    { device = "/dev/disk/by-uuid/A367-83FD";
       fsType = "vfat";
-    options = [
+      options = [ "fmask=0022" "dmask=0022" ];
-      "fmask=0022"
-      "dmask=0022"
-    ];
     };
 
   swapDevices = [ ];

hosts/temmie/services/nfs-mounts.nix

@@ -1,19 +1,7 @@
 { lib, values, ... }:
 let
   # See microbel:/etc/exports
-  letters = [
+  letters = [ "a" "b" "c" "d" "h" "i" "j" "k" "l" "m" "z" ];
-    "a"
-    "b"
-    "c"
-    "d"
-    "h"
-    "i"
-    "j"
-    "k"
-    "l"
-    "m"
-    "z"
-  ];
 in
 {
   systemd.targets."pvv-homedirs" = {

hosts/temmie/services/userweb.nix

@@ -1,32 +1,12 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 let
   cfg = config.services.httpd;
 
-  homeLetters = [
+  homeLetters = [ "a" "b" "c" "d" "h" "i" "j" "k" "l" "m" "z" ];
-    "a"
-    "b"
-    "c"
-    "d"
-    "h"
-    "i"
-    "j"
-    "k"
-    "l"
-    "m"
-    "z"
-  ];
 
   # https://nixos.org/manual/nixpkgs/stable/#ssec-php-user-guide-installing-with-extensions
   phpEnv = pkgs.php.buildEnv {
-    extensions =
+    extensions = { all, ... }: with all; [
-      { all, ... }:
-      with all;
-      [
       imagick
       opcache
       protobuf
@@ -39,8 +19,7 @@ let
     '';
   };
 
-  perlEnv = pkgs.perl.withPackages (
+  perlEnv = pkgs.perl.withPackages (ps: with ps; [
-    ps: with ps; [
     pkgs.exiftool
     pkgs.ikiwiki
     pkgs.irssi
@@ -78,8 +57,7 @@ let
     Tk
     URI
     XMLLibXML
-    ]
+  ]);
-  );
 
   # https://nixos.org/manual/nixpkgs/stable/#python.buildenv-function
   pythonEnv = pkgs.python3.buildEnv.override {
@@ -95,9 +73,7 @@ let
   # https://nixos.org/manual/nixpkgs/stable/#sec-building-environment
   fhsEnv = pkgs.buildEnv {
     name = "userweb-env";
-    paths =
+    paths = with pkgs; [
-      with pkgs;
-      [
       bash
 
       perlEnv
@@ -341,8 +317,7 @@ in
         "${fhsEnv}/sbin:/sbin"
         "${fhsEnv}/lib:/lib"
         "${fhsEnv}/share:/share"
-      ]
+      ] ++ (lib.mapCartesianProduct ({ parent, child }: "${fhsEnv}${child}:${parent}${child}") {
-      ++ (lib.mapCartesianProduct ({ parent, child }: "${fhsEnv}${child}:${parent}${child}") {
         parent = [
           "/local"
           "/opt"

hosts/ustetind/configuration.nix

@@ -1,11 +1,4 @@
-{
+{ config, fp, pkgs, lib, values, ... }:
-  config,
-  fp,
-  pkgs,
-  lib,
-  values,
-  ...
-}:
 
 {
   imports = [
@@ -27,10 +20,7 @@
           "eth*"
         ];
       };
-      address = with values.hosts.ustetind; [
+      address = with values.hosts.ustetind; [ (ipv4 + "/25") (ipv6 + "/64") ];
-        (ipv4 + "/25")
-        (ipv6 + "/64")
-      ];
     };
     "40-podman-veth" = values.defaultNetworkConfig // {
       matchConfig = {

hosts/ustetind/services/gitea-runners.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, values, ... }:
-  config,
-  lib,
-  values,
-  ...
-}:
 let
   mkRunner = name: {
     # This is unfortunately state, and has to be generated one at a time :(
@@ -18,8 +13,7 @@ let
     services.gitea-actions-runner.instances = {
       ${name} = {
         enable = true;
-        name = "git-runner-${name}";
+        name = "git-runner-${name}"; url = "https://git.pvv.ntnu.no";
-        url = "https://git.pvv.ntnu.no";
         labels = [
           "debian-latest:docker://node:current-bookworm"
           "ubuntu-latest:docker://node:current-bookworm"
@@ -42,9 +36,6 @@ lib.mkMerge [
 
     networking.dhcpcd.IPv6rs = false;
 
-    networking.firewall.interfaces."podman+".allowedUDPPorts = [
+    networking.firewall.interfaces."podman+".allowedUDPPorts = [53 5353];
-      53
-      5353
-    ];
   }
 ]

hosts/wenche/configuration.nix

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

hosts/wenche/hardware-configuration.nix

@@ -1,39 +1,24 @@
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
-  imports = [
+  imports =
-    (modulesPath + "/profiles/qemu-guest.nix")
+    [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
-    "ata_piix"
-    "uhci_hcd"
-    "virtio_pci"
-    "virtio_scsi"
-    "sd_mod"
-    "sr_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "nvidia"  ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/4e8ecdd2-d453-4fff-b952-f06da00f3b85";
+    { device = "/dev/disk/by-uuid/4e8ecdd2-d453-4fff-b952-f06da00f3b85";
       fsType = "ext4";
     };
 
-  swapDevices = [
+  swapDevices = [ {
-    {
     device = "/var/lib/swapfile";
     size = 16*1024;
-    }
+  } ];
-  ];
 
   networking.useDHCP = lib.mkDefault false;
   # networking.interfaces.ens18.useDHCP = lib.mkDefault true;

modules/bluemap.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 let
   cfg = config.services.bluemap;
   format = pkgs.formats.hocon { };
@@ -12,48 +7,36 @@ let
   webappConfig = format.generate "webapp.conf" cfg.webappSettings;
   webserverConfig = format.generate "webserver.conf" cfg.webserverSettings;
 
-  storageFolder = pkgs.linkFarm "storage" (
+  storageFolder = pkgs.linkFarm "storage"
-    lib.attrsets.mapAttrs' (
+    (lib.attrsets.mapAttrs' (name: value:
-      name: value: lib.nameValuePair "${name}.conf" (format.generate "${name}.conf" value)
+      lib.nameValuePair "${name}.conf"
-    ) cfg.storage
+        (format.generate "${name}.conf" value))
-  );
+      cfg.storage);
 
-  generateMapConfigWithMarkerData =
+  generateMapConfigWithMarkerData = name: { extraHoconMarkersFile, settings, ... }:
-    name:
-    { extraHoconMarkersFile, settings, ... }:
     assert (extraHoconMarkersFile == null) != ((settings.marker-sets or { }) == { });
     lib.pipe settings (
       (lib.optionals (extraHoconMarkersFile != null) [
-        (
+        (settings: lib.recursiveUpdate settings {
-          settings:
-          lib.recursiveUpdate settings {
           marker-placeholder = "###ASDF###";
-          }
+        })
-        )
+      ]) ++ [
-      ])
-      ++ [
         (format.generate "${name}.conf")
-      ]
+      ] ++ (lib.optionals (extraHoconMarkersFile != null) [
-      ++ (lib.optionals (extraHoconMarkersFile != null) [
+        (hoconFile: pkgs.runCommand "${name}-patched.conf" { } ''
-        (
-          hoconFile:
-          pkgs.runCommand "${name}-patched.conf" { } ''
           mkdir -p "$(dirname "$out")"
           cp '${hoconFile}' "$out"
           substituteInPlace "$out" \
             --replace-fail '"marker-placeholder" = "###ASDF###"' "\"marker-sets\" = $(cat '${extraHoconMarkersFile}')"
-          ''
+        '')
-        )
       ])
     );
 
   mapsFolder = lib.pipe cfg.maps [
-    (lib.attrsets.mapAttrs' (
+    (lib.attrsets.mapAttrs' (name: value: {
-      name: value: {
       name = "${name}.conf";
       value = generateMapConfigWithMarkerData name value;
-      }
+    }))
-    ))
     (pkgs.linkFarm "maps")
   ];
 
@@ -66,24 +49,19 @@ let
     "packs" = cfg.packs;
   };
 
-  renderConfigFolder =
+  renderConfigFolder = name: value: pkgs.linkFarm "bluemap-${name}-config" {
-    name: value:
-    pkgs.linkFarm "bluemap-${name}-config" {
     "maps" = pkgs.linkFarm "maps" {
       "${name}.conf" = generateMapConfigWithMarkerData name value;
     };
     "storages" = storageFolder;
     "core.conf" = coreConfig;
-      "webapp.conf" = format.generate "webapp.conf" (
+    "webapp.conf" = format.generate "webapp.conf" (cfg.webappSettings // { "update-settings-file" = false; });
-        cfg.webappSettings // { "update-settings-file" = false; }
-      );
     "webserver.conf" = webserverConfig;
     "packs" = value.packs;
   };
 
   inherit (lib) mkOption;
-in
+in {
-{
   options.services.bluemap = {
     enable = lib.mkEnableOption "bluemap";
     package = lib.mkPackageOption pkgs "bluemap" { };
@@ -195,10 +173,7 @@ in
     };
 
     maps = mkOption {
-      type = lib.types.attrsOf (
+      type = lib.types.attrsOf (lib.types.submodule ({ name, ... }: {
-        lib.types.submodule (
-          { name, ... }:
-          {
         options = {
           packs = mkOption {
             type = lib.types.path;
@@ -219,8 +194,7 @@ in
           };
 
           settings = mkOption {
-                type = (
+            type = (lib.types.submodule {
-                  lib.types.submodule {
               freeformType = format.type;
               options = {
                 world = mkOption {
@@ -254,8 +228,7 @@ in
                   ];
                 };
               };
-                  }
+            });
-                );
             description = ''
               Settings for files in `maps/`.
               See the default for an example with good options for the different world types.
@@ -263,9 +236,7 @@ in
             '';
           };
         };
-          }
+      }));
-        )
-      );
       default = {
         "overworld".settings = {
           world = cfg.defaultWorld;
@@ -349,21 +320,16 @@ in
     };
 
     storage = mkOption {
-      type = lib.types.attrsOf (
+      type = lib.types.attrsOf (lib.types.submodule {
-        lib.types.submodule {
         freeformType = format.type;
         options = {
           storage-type = mkOption {
-              type = lib.types.enum [
+            type = lib.types.enum [ "FILE" "SQL" ];
-                "FILE"
-                "SQL"
-              ];
             description = "Type of storage config";
             default = "FILE";
           };
         };
-        }
+      });
-      );
       description = ''
         Where the rendered map will be stored.
         Unless you are doing something advanced you should probably leave this alone and configure webRoot instead.
@@ -393,10 +359,10 @@ in
     };
   };
 
+
   config = lib.mkIf cfg.enable {
-    assertions = [
+    assertions =
-      {
+      [ { assertion = config.services.bluemap.eula;
-        assertion = config.services.bluemap.eula;
           message = ''
             You have enabled bluemap but have not accepted minecraft's EULA.
             You can achieve this through setting `services.bluemap.eula = true`
@@ -418,9 +384,9 @@ in
         ]
         ++
           # Render each minecraft map
-          lib.attrsets.mapAttrsToList (
+          lib.attrsets.mapAttrsToList
-            name: value: "${lib.getExe cfg.package} -c ${renderConfigFolder name value} -r"
+            (name: value: "${lib.getExe cfg.package} -c ${renderConfigFolder name value} -r")
-          ) cfg.maps
+            cfg.maps
         ++ [
           # Generate updated webapp
           "${lib.getExe cfg.package} -c ${webappConfigFolder} -gs"
@@ -451,9 +417,6 @@ in
   };
 
   meta = {
-    maintainers = with lib.maintainers; [
+    maintainers = with lib.maintainers; [ dandellion h7x4 ];
-      dandellion
-      h7x4
-    ];
   };
 }

modules/gickup/default.nix

@@ -1,10 +1,4 @@
-{
+{ config, pkgs, lib, utils, ... }:
-  config,
-  pkgs,
-  lib,
-  utils,
-  ...
-}:
 let
   cfg = config.services.gickup;
   format = pkgs.formats.yaml { };
@@ -51,43 +45,33 @@ in
     };
 
     instances = lib.mkOption {
-      type = lib.types.attrsOf (
+      type = lib.types.attrsOf (lib.types.submodule (submoduleInputs@{ name, ... }: let
-        lib.types.submodule (
-          submoduleInputs@{ name, ... }:
-          let
         submoduleName = name;
 
         nameParts = rec {
           repoType = builtins.head (lib.splitString ":" submoduleName);
 
-              owner =
+          owner = if repoType == "any"
-                if repoType == "any" then
+                  then null
-                  null
+                  else lib.pipe submoduleName [
-                else
-                  lib.pipe submoduleName [
                     (lib.removePrefix "${repoType}:")
                     (lib.splitString "/")
                     builtins.head
                   ];
 
-              repo =
+          repo = if repoType == "any"
-                if repoType == "any" then
+                 then null
-                  null
+                 else lib.pipe submoduleName [
-                else
-                  lib.pipe submoduleName [
                     (lib.removePrefix "${repoType}:")
                     (lib.splitString "/")
                     lib.last
                   ];
 
-              slug =
+          slug = if repoType == "any"
-                if repoType == "any" then
+                 then lib.toLower (builtins.replaceStrings [ ":" "/" ] [ "-" "-" ] submoduleName)
-                  lib.toLower (builtins.replaceStrings [ ":" "/" ] [ "-" "-" ] submoduleName)
+                 else "${lib.toLower repoType}-${lib.toLower owner}-${lib.toLower repo}";
-                else
-                  "${lib.toLower repoType}-${lib.toLower owner}-${lib.toLower repo}";
         };
-          in
+      in {
-          {
         options = {
           interval = lib.mkOption {
             type = lib.types.str;
@@ -167,9 +151,7 @@ in
             };
           };
         };
-          }
+      }));
-        )
-      );
     };
   };
 
@@ -219,29 +201,22 @@ in
     (lib.pipe cfg.instances [
       builtins.attrValues
       (builtins.filter (instance: instance.interval != "daily"))
-        (map (
+      (map ({ slug, interval, ... }: {
-          { slug, interval, ... }:
-          {
         name = "gickup@${slug}";
         value = {
           overrideStrategy = "asDropin";
           timerConfig.OnCalendar = interval;
         };
-          }
+      }))
-        ))
       builtins.listToAttrs
     ]);
 
-    systemd.targets.timers.wants = map ({ slug, ... }: "gickup@${slug}.timer") (
+    systemd.targets.timers.wants = map ({ slug, ... }: "gickup@${slug}.timer") (lib.attrValues cfg.instances);
-      lib.attrValues cfg.instances
-    );
 
     systemd.services = {
-      "gickup@" =
+      "gickup@" = let
-        let
         configDir = lib.pipe cfg.instances [
-            (lib.mapAttrsToList (
+          (lib.mapAttrsToList (name: instance: {
-              name: instance: {
             name = "${instance.slug}.yml";
             path = format.generate "gickup-configuration-${name}.yml" {
               destination.local = [ cfg.destinationSettings ];
@@ -252,16 +227,15 @@ in
                     includeorgs = [ instance.owner ];
                     include = [ instance.repo ];
                   })
-                      // instance.settings
+                  //
+                  instance.settings
                 )
               ];
             };
-              }
+          }))
-            ))
           (pkgs.linkFarm "gickup-configuration-files")
         ];
-        in
+      in {
-        {
         description = "Gickup git repository mirroring service for %i";
         after = [ "network.target" ];
 

modules/gickup/hardlink-files.nix

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