Format project using nixfmt rfc candidate.

config/etc.nix

@@ -4,7 +4,8 @@
   pkgs,
   ...
 }:
-with lib; {
+with lib;
+{
   environment.etc = mkIf (elem "etcfiles" config.machine.conffiles) {
     "rofi.rasi".source = import ./etc/rofi.rasi.nix { inherit pkgs; };
     "i3/py3status".source = ./etc/i3/py3status;

config/etc/i3/config.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: (pkgs.writeText "config" ''
+{ pkgs, ... }:
+(pkgs.writeText "config" ''
   # i3 config file (v4)
   #
   # Please see http://i3wm.org/docs/userguide.html for a complete reference!

config/etc/rofi.rasi.nix

@@ -1,5 +1,8 @@
-{pkgs}: let
+{ pkgs }:
-  tabMode = pkgs.writeScript "tab-finder.sh" (with pkgs; /* bash */ ''
+let
+  tabMode = pkgs.writeScript "tab-finder.sh" (
+    with pkgs; # bash
+    ''
       #!/usr/bin/env bash
       if [ -z ''${1} ]; then
         ${brotab}/bin/bt list;
@@ -12,7 +15,8 @@
         fi
       fi
       exit 0;
-  '');
+    ''
+  );
 in
 pkgs.writeText "rofi.rasi" ''
   configuration {

config/etc/sway/config.nix

@@ -2,7 +2,9 @@
 
 let
   # TODO/FIX: pkgs.sway-unwrapped is not the same sway derivation as the one running the desktop
-  grim-wrapper = pkgs.writeShellScript "grim-wrapper" /* bash */ ''
+  grim-wrapper =
+    pkgs.writeShellScript "grim-wrapper" # bash
+      ''
         OUTPUT_DIR="$(${pkgs.xdg-user-dirs}/bin/xdg-user-dir PICTURES)"
         DATE="$(${pkgs.coreutils}/bin/date +'%Y-%m-%d;%H:%M:%S;')";
         WINDOW_LIST="$(${pkgs.sway-unwrapped}/bin/swaymsg -t get_tree | ${pkgs.jq}/bin/jq -r '.. | select(.pid? and .visible?) | "\(.rect.x+.window_rect.x),\(.rect.y+.window_rect.y) \(.window_rect.width)x\(.window_rect.height) \(.app_id):\(.name)"' | ${pkgs.coreutils}/bin/tr -d '"/;\\')";
@@ -29,8 +31,8 @@ let
             ;;
         esac;
       '';
-in pkgs.writeText "config"
+in
-''
+pkgs.writeText "config" ''
   include /etc/sway/config.d/*
 
   # Read `man 5 sway` for a complete reference.

config/locale.nix

@@ -3,7 +3,8 @@
   lib,
   pkgs,
   ...
-}: {
+}:
+{
   console.keyMap = "de";
   i18n = {
     defaultLocale = "en_US.UTF-8";
@@ -13,7 +14,11 @@
       type = "fcitx5";
       fcitx5 = {
         waylandFrontend = true;
-        addons = with pkgs; [fcitx5-chinese-addons fcitx5-mozc fcitx5-table-extra];
+        addons = with pkgs; [
+          fcitx5-chinese-addons
+          fcitx5-mozc
+          fcitx5-table-extra
+        ];
       };
     };
   };

config/networking.nix

@@ -3,9 +3,11 @@
   lib,
   ...
 }:
-with lib; let
+with lib;
+let
   inherit (config.machine) networkD;
-in {
+in
+{
   networking = {
     inherit (config.machine) hostName;
     useNetworkd = networkD.enable;
@@ -16,14 +18,19 @@ in {
   # https://github.com/NixOS/nixpkgs/issues/10001#issuecomment-905532069
   systemd.network = mkIf networkD.enable {
     enable = true;
-    networks = let
+    networks =
+      let
         networkConfig = {
           DHCP = "yes";
           DNSSEC = "yes";
           DNSOverTLS = "yes";
-        DNS = ["1.1.1.1" "1.0.0.1"];
+          DNS = [
+            "1.1.1.1"
+            "1.0.0.1"
+          ];
         };
-    in {
+      in
+      {
         "40-wired" = {
           enable = true;
           name = "en*";

config/nix.nix

@@ -6,10 +6,12 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   cfg = config.machine;
   emptyGlobalRegistry = pkgs.writeText "registry.json" ''{ "flakes": [], "version": 2 }'';
-in {
+in
+{
   nix = {
     package = pkgs.nix;
     registry = {
@@ -22,18 +24,14 @@ in {
       cores = 1;
       sandbox = true;
       auto-optimise-store = true;
-      trusted-substituters =
+      trusted-substituters = [
-        [
         "https://cache.nixos.org"
-        ]
+      ] ++ cfg.binaryCaches;
-        ++ cfg.binaryCaches;
       # TODO: integrate into sops
       # trusted-public-keys = [ (lib.fileContents "${cfg.secretPath}/hydra_cache.pub") ];
-      substituters =
+      substituters = [
-        [
         "https://cache.nixos.org"
-        ]
+      ] ++ cfg.binaryCaches;
-        ++ cfg.binaryCaches;
       allowed-users = [ "root" ] ++ (map (n: n.name) cfg.administrators);
     };
     extraOptions = ''

config/users.nix

@@ -5,15 +5,18 @@
   pkgs,
   ...
 }:
-with lib; let
+with lib;
+let
   withDocker = config.virtualisation.docker.enable;
   withPodman = config.virtualisation.podman.enable;
   administrators = user: {
     inherit (user) name;
-    value = let
+    value =
+      let
         cfg = config.services;
         passPath = config.sops.secrets."users/${user.name}/password".path;
-    in {
+      in
+      {
         isNormalUser = true;
         inherit (user) name;
         uid = user.id;
@@ -30,9 +33,19 @@ with lib; let
         description = "Administrative user ${user.name}.";
         group = user.name;
         extraGroups =
-        ["audio" "wheel" "network"]
+          [
-        ++ (optionals (lib.elem "desktop" config.machine.services) ["input" "video"])
+            "audio"
-        ++ (optionals cfg.printing.enable ["cups" "lp"])
+            "wheel"
+            "network"
+          ]
+          ++ (optionals (lib.elem "desktop" config.machine.services) [
+            "input"
+            "video"
+          ])
+          ++ (optionals cfg.printing.enable [
+            "cups"
+            "lp"
+          ])
           ++ (optional (withDocker && !withPodman) "docker")
           ++ (optional withPodman "podman");
         shell = "${pkgs.zsh}/bin/zsh";
@@ -48,12 +61,11 @@ with lib; let
       members = [ user.name ];
     };
   };
-in {
+in
-  sops.secrets =
+{
-    fn.sopsHelper
+  sops.secrets = fn.sopsHelper (user: "users/${user.name}/password") config.machine.administrators {
-    (user: "users/${user.name}/password")
+    neededForUsers = true;
-    config.machine.administrators
+  };
-    {neededForUsers = true;};
   users = {
     mutableUsers = false;
     users = listToAttrs (map administrators config.machine.administrators);

config/zsh.nix

@@ -31,7 +31,16 @@ with lib;
 
     ohMyZsh = {
       enable = true;
-        plugins = ["cabal" "docker" "gitfast" "python" "pip" "sudo" "systemd" "man"];
+      plugins = [
+        "cabal"
+        "docker"
+        "gitfast"
+        "python"
+        "pip"
+        "sudo"
+        "systemd"
+        "man"
+      ];
       theme = "gentoo";
     };
   };

flake.nix

@@ -18,7 +18,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
-  outputs = {
+  outputs =
+    {
       self,
       nixpkgs,
       flake-utils,
@@ -28,7 +29,8 @@
       ...
     }@attrs:
     flake-utils.lib.eachDefaultSystem (
-      system: let
+      system:
+      let
         inherit (nixpkgs) lib;
         fn = import ./fn.nix { inherit lib; };
         pkgs = nixpkgs.legacyPackages."${system}";
@@ -39,7 +41,8 @@
         };
         nixosSystemFor = machine: {
           name = machine;
-          value = let
+          value =
+            let
               configFiles = fn.lst {
                 p = toString ./config;
                 b = true;
@@ -52,33 +55,38 @@
                 p = toString ./services;
                 b = true;
               };
-            machinePath = lib.concatStringsSep "/" [(toString ./.) "machines" machine];
+              machinePath = lib.concatStringsSep "/" [
-            machineFiles = lib.filter (lib.strings.hasSuffix ".nix") (fn.lst {
+                (toString ./.)
+                "machines"
+                machine
+              ];
+              machineFiles = lib.filter (lib.strings.hasSuffix ".nix") (
+                fn.lst {
                   p = machinePath;
                   b = true;
-            });
+                }
+              );
             in
             nixpkgs.lib.nixosSystem {
               inherit system;
-              specialArgs =
+              specialArgs = attrs // {
-                attrs
-                // {
                 inherit system;
                 inherit fn;
               };
-              modules =
+              modules = [
-                [
+                (
-                  ({config, ...}: {config.nixpkgs.overlays = [nixpkgs-wayland.overlay];})
+                  { config, ... }:
+                  {
+                    config.nixpkgs.overlays = [ nixpkgs-wayland.overlay ];
+                  }
+                )
                 (toString ./options/machine.nix)
                 sops-nix.nixosModules.sops
-                ]
+              ] ++ machineFiles ++ configFiles ++ pkgsFiles ++ serviceFiles;
-                ++ machineFiles
-                ++ configFiles
-                ++ pkgsFiles
-                ++ serviceFiles;
             };
         };
-      in {
+      in
+      {
         apps = {
           "lint" = {
             type = "app";

fn.nix

@@ -1,73 +1,82 @@
 { lib }:
 with builtins;
-with lib; rec {
+with lib;
-  ifelse = a: b: c:
+rec {
-    if a
+  ifelse =
-    then b
+    a: b: c:
-    else c;
+    if a then b else c;
-  fileContentsOr = a: b: (ifelse
+  fileContentsOr = a: b: (ifelse (pathIsRegularFile a) a b);
-    (pathIsRegularFile a)
-    a
-    b);
   cwd = builtins.getEnv "PWD";
 
   # lst (string PATH) (string FILETYPE) (bool RETURNFULLPATH)
-  lst = {
+  lst =
+    {
       p ? cwd,
       t ? "regular",
       b ? false,
-  }: (lists.forEach
+    }:
-    (attrNames
+    (lists.forEach (attrNames (filterAttrs (n: v: v == t) (readDir p))) (
-      (filterAttrs (n: v: v == t)
+      v: ((optionalString b "${p}/") + v)
-        (readDir p)))
+    ));
-    (v: ((optionalString b "${p}/") + v)));
   lsf = p: (lst { inherit p; });
-  lsd = p: (lst {
+  lsd =
+    p:
+    (lst {
       inherit p;
       t = "directory";
       b = true;
     });
-  lsfRec = p: b:
+  lsfRec =
-    flatten ((map (np: lsfRec np b) (lsd p))
+    p: b:
+    flatten (
+      (map (np: lsfRec np b) (lsd p))
       ++ (lst {
         inherit p;
         inherit b;
-      }));
+      })
-  hasAttrs = aList: d: (map
+    );
-    (a: (ifelse (isList a)
+  hasAttrs = aList: d: (map (a: (ifelse (isList a) (hasAttrByPath a d) (hasAttr a d))) aList);
-      (hasAttrByPath a d)
-      (hasAttr a d)))
-    aList);
 
   # Not sure how list operations are implemented in Nix
   # This might be a tad bit inefficient.
   # TODO: look for better implementation (map is a builtin function so checking that probably won't help)
   # Sequentially checks elements of list (l) for condition (cond) and executes do on first match.
-  meetsConDo = cond: do: l:
+  meetsConDo =
-    ifelse (l == []) false
+    cond: do: l:
-    (let
+    ifelse (l == [ ]) false (
+      let
         h = head l;
         t = tail l;
       in
-      ifelse (cond h) (do h)
+      ifelse (cond h) (do h) (meetsConDo cond do t)
-      (meetsConDo cond do t));
+    );
-  deps = p:
+  deps =
-    ifelse (isAttrs p) (
+    p:
-      filter isAttrs
+    ifelse (isAttrs p) (filter isAttrs (
-      (p.buildInputs ++ p.nativeBuildInputs ++ p.propagatedBuildInputs ++ p.propagatedNativeBuildInputs)
+      p.buildInputs ++ p.nativeBuildInputs ++ p.propagatedBuildInputs ++ p.propagatedNativeBuildInputs
-    ) [];
+    )) [ ];
   importFilter = l: filter (n: elem (nameFromURL (toString n) ".") l);
-  depsRec = ld: ifelse (ld == []) [] ((toList ld) ++ (depsRec (lists.unique (lists.flatten (map deps (toList ld))))));
+  depsRec =
-  isBroken = p:
+    ld:
-    meetsConDo (s: ((hasAttrByPath s.path p) && (s.check (getAttrFromPath s.path p)))) (s: s.msg)
+    ifelse (ld == [ ]) [ ] (
-    [
+      (toList ld) ++ (depsRec (lists.unique (lists.flatten (map deps (toList ld)))))
+    );
+  isBroken =
+    p:
+    meetsConDo (s: ((hasAttrByPath s.path p) && (s.check (getAttrFromPath s.path p)))) (s: s.msg) [
       {
-        path = ["meta" "broken"];
+        path = [
+          "meta"
+          "broken"
+        ];
         msg = warn "Package ${p.name} is marked as broken." true;
         check = m: m;
       }
       {
-        path = ["meta" "knownVulnerabilities"];
+        path = [
+          "meta"
+          "knownVulnerabilities"
+        ];
         msg = warn "Package ${p.name} has known Vulnerabilities.." true;
         check = m: m != [ ];
       }
@@ -87,35 +96,45 @@ with lib; rec {
   depsBroken = p: lists.any (p: (isBroken p)) (deps p);
   # No more magic 🧙 here 😢
   # But at least it now (hopefully) checks ONLY dependencies (and all of them at that).
-  depsBrokenRec = p: (
+  depsBrokenRec =
-    meetsConDo
+    p: (meetsConDo (p: ifelse (depsBroken p) true (depsBrokenRec (deps p))) (p: true) (deps p));
-    (p: ifelse (depsBroken p) true (depsBrokenRec (deps p)))
+  sopsHelper =
-    (p: true) (deps p)
+    template: names: options:
-  );
+    let
-  sopsHelper = template: names: options: let
       optionsIsFunction = (typeOf options) == "lambda";
     in
-    listToAttrs (map
+    listToAttrs (
-      (name: {
+      map (name: {
         name = template name;
         value = ifelse optionsIsFunction (options name) options;
-      })
+      }) names
-      names);
+    );
-  pkgFilter = ld: (filter
+  pkgFilter =
-    (p: (
+    ld:
-      ifelse (isBroken p)
+    (filter (
-      false
+      p:
-      (ifelse (depsBrokenRec p)
+      (ifelse (isBroken p) false (
-        (warn "Dependency of ${p.name} is marked as broken." false)
+        ifelse (depsBrokenRec p) (warn "Dependency of ${p.name} is marked as broken." false) true
-        true)
       ))
-    ld);
+    ) ld);
-  makeOptionTypeList = path: (
+  makeOptionTypeList =
-    lists.forEach
+    path:
+    (lists.forEach
       # get a list of all files ending in .nix in path
-    (filter (hasSuffix ".nix")
+      (filter (hasSuffix ".nix") (lsfRec path true))
-      (lsfRec path true))
       # remove leading path and trailing ".nix", replace every slash with "::"
-    (replaceStrings ["${path}/" "/" ".nix"] ["" "::" ""])
+      (
+        replaceStrings
+          [
+            "${path}/"
+            "/"
+            ".nix"
+          ]
+          [
+            ""
+            "::"
+            ""
+          ]
+      )
     );
 }

machines/Lilim/configuration.nix

@@ -2,7 +2,8 @@
   pkgs,
   lib,
   ...
-}: {
+}:
+{
   services.cron.enable = false;
 
   networking.dhcpcd.extraConfig = "noarp";
@@ -64,7 +65,12 @@
     };
   };
   boot = {
-    kernelModules = ["snd-usb-audio" "snd-aloop" "snd-seq" "snd-rawmidi"];
+    kernelModules = [
+      "snd-usb-audio"
+      "snd-aloop"
+      "snd-seq"
+      "snd-rawmidi"
+    ];
     kernelParams = [ "threadirq" ];
     extraModprobeConfig = ''
       options snd-usb-audio nrpacks=1

machines/Lilim/hardware-configuration.nix

@@ -3,9 +3,11 @@
   config,
   pkgs,
   ...
-}: let
+}:
+let
   cfg = config.machine;
-in {
+in
+{
   imports = [ "${nixpkgs}/nixos/modules/installer/scan/not-detected.nix" ];
 
   boot = {
@@ -22,8 +24,18 @@ in {
     };
 
     kernelPackages = pkgs.linuxPackages_latest;
-    initrd.availableKernelModules = ["xhci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc"];
+    initrd.availableKernelModules = [
-    kernelModules = ["acpi_call" "i915" "kvm-intel" "uinput"];
+      "xhci_pci"
+      "ahci"
+      "sd_mod"
+      "rtsx_pci_sdmmc"
+    ];
+    kernelModules = [
+      "acpi_call"
+      "i915"
+      "kvm-intel"
+      "uinput"
+    ];
     # 5_10 breaks my touchpad/mouse buttons
     # https://bbs.archlinux.org/viewtopic.php?id=254885
     # maybe modprobe hid_rmi or i2c_i801
@@ -57,7 +69,9 @@ in {
     ksm.enable = true;
     graphics = {
       extraPackages = with pkgs; [ (intel-vaapi-driver.override { enableHybridCodec = true; }) ];
-      extraPackages32 = with pkgs.pkgsi686Linux; [  (intel-vaapi-driver.override { enableHybridCodec = true; }) ];
+      extraPackages32 = with pkgs.pkgsi686Linux; [
+        (intel-vaapi-driver.override { enableHybridCodec = true; })
+      ];
     };
 
     pulseaudio = {

machines/Lilim/options.nix

@@ -3,7 +3,8 @@
   lib,
   ...
 }:
-with lib; {
+with lib;
+{
   imports = [
     ../../options/copySysConf.nix
   ];

machines/Lilim/sops.nix

@@ -2,7 +2,8 @@
   config,
   lib,
   ...
-}: {
+}:
+{
   sops = {
     defaultSopsFile = ./secrets.yaml;
     age = {

machines/Marid/configuration.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   services.cron.enable = false;
   security.pki.certificateFiles = [
     ./certs/proxy

machines/Marid/hardware-configuration.nix

@@ -3,9 +3,11 @@
   pkgs,
   modulesPath,
   ...
-}: let
+}:
+let
   cfg = config.machine;
-in {
+in
+{
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot = {
@@ -19,7 +21,13 @@ in {
     };
 
     kernelPackages = pkgs.linuxPackages_latest;
-    initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
+    initrd.availableKernelModules = [
+      "nvme"
+      "xhci_pci"
+      "usb_storage"
+      "sd_mod"
+      "rtsx_pci_sdmmc"
+    ];
     kernelModules = [ "kvm-amd" ];
     kernelParams = [
       # get backlight service to work part one (fixes systemd backlight service)

machines/Marid/options.nix

@@ -3,7 +3,8 @@
   lib,
   ...
 }:
-with lib; {
+with lib;
+{
   imports = [
     ../../options/copySysConf.nix
   ];

machines/Marid/sops.nix

@@ -2,7 +2,8 @@
   config,
   lib,
   ...
-}: {
+}:
+{
   sops = {
     defaultSopsFile = ./secrets.yaml;
     age = {

machines/Ophanim/hardware-configuration.nix

@@ -2,13 +2,20 @@
   nixpkgs,
   pkgs,
   ...
-}: {
+}:
+{
   imports = [
     "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
   ];
 
   boot = {
-    initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod"];
+    initrd.availableKernelModules = [
+      "ata_piix"
+      "uhci_hcd"
+      "virtio_pci"
+      "sd_mod"
+      "sr_mod"
+    ];
     kernelPackages = pkgs.linuxPackages_latest;
     kernelModules = [ ];
     extraModulePackages = [ ];

machines/Ophanim/options.nix

@@ -3,9 +3,11 @@
   lib,
   ...
 }:
-with lib; let
+with lib;
+let
   cfg = config.machine;
-in {
+in
+{
   config.machine = rec {
     hostName = "Ophanim";
     domain = "ophanim.de";
@@ -18,7 +20,10 @@ in {
     mailAccounts = [
       {
         name = "derped";
-        aliases = ["postmaster" "baensch"];
+        aliases = [
+          "postmaster"
+          "baensch"
+        ];
       }
     ];
     allowUnfree = true;
@@ -42,9 +47,11 @@ in {
       "nginx"
       "openssh"
     ];
-    vHosts = let
+    vHosts =
+      let
         base = domain;
-    in [
+      in
+      [
         {
           domain = base;
           service = "simple";
@@ -71,8 +78,17 @@ in {
     firewall = {
       enable = true;
       allowPing = false;
-      allowedUDPPorts = [22 80 443 7776];
+      allowedUDPPorts = [
-      allowedTCPPorts = [80 443 7776];
+        22
+        80
+        443
+        7776
+      ];
+      allowedTCPPorts = [
+        80
+        443
+        7776
+      ];
     };
   };
 }

machines/Ophanim/sops.nix

@@ -2,7 +2,8 @@
   config,
   lib,
   ...
-}: {
+}:
+{
   sops = {
     defaultSopsFile = ./secrets.yaml;
     age = {

machines/Sheol/august.nix

@@ -18,7 +18,11 @@
   };
   fileSystems."/home/august/Videos" = {
     device = "/mnt/WD/Videos/Movies/";
-    options = [ "nofail" "bind" "x-systemd.automount" ];
+    options = [
+      "nofail"
+      "bind"
+      "x-systemd.automount"
+    ];
     neededForBoot = false;
   };
 }

machines/Sheol/configuration.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   services = {
     avahi = {
       enable = true;
@@ -13,12 +14,14 @@
   };
   # udp5353 1024-65535
 
-  networking.firewall = let
+  networking.firewall =
+    let
       range = {
         from = 1024;
         to = 65535;
       };
-  in {
+    in
+    {
       allowedUDPPorts = [ 5353 ];
       allowedUDPPortRanges = [ range ];
       allowedTCPPortRanges = [ range ];

machines/Sheol/hardware-configuration.nix

@@ -1,10 +1,15 @@
-{nixos-hardware, ...}: {
+{ nixos-hardware, ... }:
+{
   imports = [
     nixos-hardware.nixosModules.raspberry-pi-5
   ];
 
   boot = {
-    kernelParams = [ "8250.nr_uarts=11" "console=ttyAMA10,9600" "console=tty0" ];
+    kernelParams = [
+      "8250.nr_uarts=11"
+      "console=ttyAMA10,9600"
+      "console=tty0"
+    ];
     supportedFilesystems = [ "btrfs" ];
     initrd.systemd.enableTpm2 = false;
     loader.systemd-boot.enable = true;
@@ -14,7 +19,12 @@
     "/" = {
       device = "none";
       fsType = "tmpfs";
-      options = ["defaults" "size=2G" "mode=755" "noexec"];
+      options = [
+        "defaults"
+        "size=2G"
+        "mode=755"
+        "noexec"
+      ];
     };
     "/boot" = {
       device = "/dev/disk/by-uuid/F8BB-8019";
@@ -23,25 +33,40 @@
     "/nix" = {
       device = "/dev/disk/by-uuid/7741fa2e-ce5d-4aef-bf3c-8e283e973409";
       fsType = "btrfs";
-      options = ["subvol=nix" "compress=zstd" "noatime"];
+      options = [
+        "subvol=nix"
+        "compress=zstd"
+        "noatime"
+      ];
       neededForBoot = true;
     };
     "/persist" = {
       device = "/dev/disk/by-uuid/7741fa2e-ce5d-4aef-bf3c-8e283e973409";
       fsType = "btrfs";
-      options = ["subvol=persist" "compress=zstd" "noexec"];
+      options = [
+        "subvol=persist"
+        "compress=zstd"
+        "noexec"
+      ];
       neededForBoot = true;
     };
     "/snapshots" = {
       device = "/dev/disk/by-uuid/7741fa2e-ce5d-4aef-bf3c-8e283e973409";
       fsType = "btrfs";
-      options = ["subvol=snapshots" "compress=zstd" "noexec"];
+      options = [
+        "subvol=snapshots"
+        "compress=zstd"
+        "noexec"
+      ];
       neededForBoot = false;
     };
     "/mnt/WD" = {
       device = "/dev/disk/by-uuid/EA2866C92866947B";
       fsType = "ntfs";
-      options = ["nofail" "x-systemd.automount"];
+      options = [
+        "nofail"
+        "x-systemd.automount"
+      ];
       neededForBoot = false;
     };
   };

machines/Sheol/impermanence.nix

@@ -1,4 +1,5 @@
-{impermanence, ...}: {
+{ impermanence, ... }:
+{
   imports = [
     impermanence.nixosModules.impermanence
   ];

machines/Sheol/options.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   imports = [
     ../../options/copySysConf.nix
   ];

machines/Sheol/sops.nix

@@ -2,7 +2,8 @@
   config,
   lib,
   ...
-}: {
+}:
+{
   sops = {
     defaultSopsFile = ./secrets.yaml;
     age = {

options/copySysConf.nix

@@ -4,12 +4,12 @@
   lib,
   ...
 }:
-with lib; let
+with lib;
+let
   cfg = config.system.copySysConf;
   cfgPath = ../.;
   copySysConf =
-    if !(isStorePath cfgPath)
+    if !(isStorePath cfgPath) then
-    then
       pkgs.stdenv.mkDerivation rec {
         name = "NixOS_Configuration-${version}";
         version = commitIdFromGitRepo (cfgPath + "/.git");
@@ -20,8 +20,10 @@ with lib; let
           cp -R ./. $out
         '';
       }
-    else (builtins.toPath ../.);
+    else
-in {
+      (builtins.toPath ../.);
+in
+{
   options.system.copySysConf = {
     enable = mkOption {
       type = types.bool;

options/machine.nix

@@ -5,7 +5,8 @@
   ...
 }:
 with builtins;
-with lib; let
+with lib;
+let
   cfg = config.machine;
   pkgsetList = fn.makeOptionTypeList (toString ../pkgsets);
   serviceList = fn.makeOptionTypeList (toString ../services);
@@ -13,7 +14,12 @@ with lib; let
     name = pname;
     value = rec {
       pkgwrap = mkOption {
-        type = with types; oneOf [package (listOf package)];
+        type =
+          with types;
+          oneOf [
+            package
+            (listOf package)
+          ];
         default = fn.pkgFilter cfg.pkgsets."${pname}".pkgs;
         description = ''
           Package Wrapper for packages using a wrapper function (like python, haskell, ...)
@@ -28,7 +34,8 @@ with lib; let
       };
     };
   };
-in {
+in
+{
   options.machine = {
     pkgs = mkOption {
       type = types.listOf (types.enum pkgsetList);
@@ -118,7 +125,26 @@ in {
     };
   };
   imports = [
-    (mkAliasOptionModule ["machine" "firewall"] ["networking" "firewall"])
+    (mkAliasOptionModule
-    (mkAliasOptionModule ["machine" "allowUnfree"] ["nixpkgs" "config" "allowUnfree"])
+      [
+        "machine"
+        "firewall"
+      ]
+      [
+        "networking"
+        "firewall"
+      ]
+    )
+    (mkAliasOptionModule
+      [
+        "machine"
+        "allowUnfree"
+      ]
+      [
+        "nixpkgs"
+        "config"
+        "allowUnfree"
+      ]
+    )
   ];
 }

options/mailman3/extraPackages/flufl_bounce.nix

@@ -16,7 +16,10 @@ buildPythonPackage rec {
     sha256 = "0k5kjqa3x6gvwwxyzb2vwi1g1i6asm1zw5fivylxz3d583y4kid2";
   };
 
-  propagatedBuildInputs = [atpublic zope_interface];
+  propagatedBuildInputs = [
+    atpublic
+    zope_interface
+  ];
 
   doCheck = false;
 }

options/mailman3/extraPackages/lazr_delegates.nix

@@ -16,7 +16,10 @@ buildPythonPackage rec {
     sha256 = "1rdnl85j9ayp8n85l0ciip621j9dcziz5qnmv2m7krgwgcn31vfx";
   };
 
-  propagatedBuildInputs = [nose zope_interface];
+  propagatedBuildInputs = [
+    nose
+    zope_interface
+  ];
 
   doCheck = false;
 }

options/mailman3/options.nix

@@ -4,7 +4,8 @@
   config,
   ...
 }:
-with lib; let
+with lib;
+let
   mailman3 = import ./release.nix { };
   cfg = config.services.mailman3;
   usePostgresql = cfg.database.type == "postgresql";
@@ -75,7 +76,8 @@ with lib; let
 
     ${cfg.extraConfig}
   '';
-in {
+in
+{
   options.services.mailman3 = {
     enable = mkOption {
       type = types.bool;
@@ -104,7 +106,11 @@ in {
 
     database = {
       type = mkOption {
-        type = types.enum ["sqlite3" "mysql" "postgres"];
+        type = types.enum [
+          "sqlite3"
+          "mysql"
+          "postgres"
+        ];
         default = "sqlite3";
         example = "mysql";
         description = ''
@@ -273,7 +279,10 @@ in {
     mta = {
       # TODO: add Sentmail and qmail
       type = mkOption {
-        type = types.enum ["postfix" "exim4"];
+        type = types.enum [
+          "postfix"
+          "exim4"
+        ];
         default = "postfix";
         example = "exim4";
         description = ''
@@ -371,30 +380,43 @@ in {
     };
 
     services.postfix.recipientDelimiter = mkIf usePostfix (mkDefault "+");
-    services.postfix.mapFiles."transport_maps" = mkIf usePostfix (mkDefault "${cfg.paths.data_dir}/postfix_lmtp");
+    services.postfix.mapFiles."transport_maps" = mkIf usePostfix (
-    services.postfix.mapFiles."local_recipient_maps" = mkIf usePostfix (mkDefault "${cfg.paths.data_dir}/postfix_lmtp");
+      mkDefault "${cfg.paths.data_dir}/postfix_lmtp"
-    services.postfix.mapFiles."relay_domains" = mkIf usePostfix (mkDefault "${cfg.paths.data_dir}/postfix_domains");
+    );
+    services.postfix.mapFiles."local_recipient_maps" = mkIf usePostfix (
+      mkDefault "${cfg.paths.data_dir}/postfix_lmtp"
+    );
+    services.postfix.mapFiles."relay_domains" = mkIf usePostfix (
+      mkDefault "${cfg.paths.data_dir}/postfix_domains"
+    );
 
-    warnings =
+    warnings = optional (cfg.database.password != "") ''
-      optional (cfg.database.password != "")
+      config.services.mailman3.database.password will be stored as plaintext
-      ''        config.services.mailman3.database.password will be stored as plaintext
               in the Nix store. Use database.passwordFile instead.'';
 
     # Create database passwordFile default when password is configured.
-    services.mailman3.database.passwordFile = mkDefault (toString (pkgs.writeTextFile {
+    services.mailman3.database.passwordFile = mkDefault (
+      toString (
+        pkgs.writeTextFile {
           name = "mailman3-database-password";
           text = cfg.database.password;
-    }));
+        }
+      )
+    );
 
     systemd.services.mailman3 = {
       description = "GNU Mailing List Manager";
-      after = ["network.target"] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";
+      after = [
+        "network.target"
+      ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";
       wantedBy = [ "multi-user.target" ];
 
-      preStart = let
+      preStart =
+        let
           dbpass = fileContents cfg.database.passwordFile;
           smtppass = fileContents cfg.mta.smtp_passFile;
-      in ''
+        in
+        ''
           mkdir -p ${cfg.paths.etc_dir}
           cp ${configFile} ${cfg.paths.etc_dir}/mailman.cfg
           ${optionalString (useMysql || usePostgresql) ''

options/mailman3/release.nix

@@ -1,11 +1,22 @@
 {
   pkgs ? import <nixpkgs> { },
   python3Packages ? pkgs.python3Packages,
-}: let
+}:
+let
   mailman3 = {
-    core = python3Packages.callPackage ./core.nix (with deps; {
+    core = python3Packages.callPackage ./core.nix (
-      inherit aiosmtpd atpublic flufl_bounce flufl_i18n flufl_lock lazr_config;
+      with deps;
-    });
+      {
+        inherit
+          aiosmtpd
+          atpublic
+          flufl_bounce
+          flufl_i18n
+          flufl_lock
+          lazr_config
+          ;
+      }
+    );
   };
   deps = rec {
     aiosmtpd = python3Packages.callPackage ./extraPackages/aiosmtpd.nix {

pkgs/nixpkgs.nix

@@ -6,9 +6,11 @@
   nixpkgs-stable,
   nixpkgs-git,
   ...
-}: let
+}:
+let
   inherit (pkgs) callPackage;
-in {
+in
+{
   nixpkgs = {
     config = {
       allowUnfree = true;

pkgs/pyluxafor/default.nix

@@ -18,5 +18,8 @@ buildPythonApplication rec {
     substituteInPlace setup.py --replace '"click>=6.0,<=6.7.99",' ""
     substituteInPlace setup.py --replace '"pyusb==1.0.0",' ""
   '';
-  propagatedBuildInputs = [click pyusb];
+  propagatedBuildInputs = [
+    click
+    pyusb
+  ];
 }

pkgs/systemPackages.nix

@@ -5,22 +5,20 @@
   pkgs,
   ...
 }:
-with lib; let
+with lib;
+let
   cfg = config.machine;
   pkgsets = fn.lst {
     p = toString ../pkgsets;
     b = true;
   };
-in {
+in
+{
   imports = pkgsets;
 
-  environment.systemPackages =
+  environment.systemPackages = flatten (
-    flatten
+    lists.forEach (attrVals (filter (v: !(strings.hasInfix "::" v)) cfg.pkgs) cfg.pkgsets) (
-    (lists.forEach
+      v: v.pkgwrap
-      (attrVals
+    )
-        (filter
+  );
-          (v: !(strings.hasInfix "::" v))
-          cfg.pkgs)
-        cfg.pkgsets)
-      (v: v.pkgwrap));
 }

pkgsets/base.nix

@@ -3,7 +3,8 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   config.machine.pkgsets.base.pkgs = with pkgs; [
     age
     sops

pkgsets/cpp.nix

@@ -2,7 +2,8 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   config.machine.pkgsets.cpp.pkgs = with pkgs; [
     clang
     cmake

pkgsets/dict.nix

@@ -2,10 +2,24 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   config.machine.pkgsets.dict.pkgs = with pkgs; [
     translate-shell
-    (hunspellWithDicts (with pkgs.hunspellDicts; [de-de en-us]))
+    (hunspellWithDicts (
-    (aspellWithDicts (d: with d; [de en en-computers en-science]))
+      with pkgs.hunspellDicts;
+      [
+        de-de
+        en-us
+      ]
+    ))
+    (aspellWithDicts (
+      d: with d; [
+        de
+        en
+        en-computers
+        en-science
+      ]
+    ))
   ];
 }

pkgsets/extra.nix

@@ -2,7 +2,8 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   config.machine.pkgsets.extra.pkgs = with pkgs; [
     alsaUtils
     binutils-unwrapped

pkgsets/haskell-tools.nix

@@ -2,6 +2,10 @@
   config,
   pkgs,
   ...
-}: {
+}:
-  config.machine.pkgsets.haskell-tools.pkgs = with pkgs; [cabal-install hlint]; # ghcid
+{
+  config.machine.pkgsets.haskell-tools.pkgs = with pkgs; [
+    cabal-install
+    hlint
+  ]; # ghcid
 }

pkgsets/haskell.nix

@@ -4,8 +4,11 @@
   fn,
   pkgs,
   ...
-}: {
+}:
-  config.machine.pkgsets.haskell.pkgwrap = pkgs.haskellPackages.ghcWithPackages (pkgs: (fn.pkgFilter config.machine.pkgsets.haskell.pkgs));
+{
+  config.machine.pkgsets.haskell.pkgwrap = pkgs.haskellPackages.ghcWithPackages (
+    pkgs: (fn.pkgFilter config.machine.pkgsets.haskell.pkgs)
+  );
   config.machine.pkgsets.haskell.pkgs = with pkgs.haskellPackages; [
     hindent
     mtl

pkgsets/latex.nix

@@ -4,7 +4,8 @@
   pkgs,
   ...
 }:
-with lib; {
+with lib;
+{
   config.machine.pkgsets.latex.pkgs = with pkgs; [
     texlive.combined.scheme-full
     texlab

pkgsets/mail_utils.nix

@@ -1,7 +1,8 @@
 {
   pkgs,
   ...
-}: {
+}:
+{
   config.machine.pkgsets.mail_utils.pkgs = with pkgs; [
     aerc
     abook

pkgsets/nodejs.nix

@@ -1,6 +1,11 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   config.machine.pkgsets.nodejs.pkgs =
-    (with pkgs; [nodejs yarn deno])
+    (with pkgs; [
+      nodejs
+      yarn
+      deno
+    ])
     ++ (with pkgs.nodePackages; [
       autoprefixer
       mermaid-cli

pkgsets/php.nix

@@ -4,7 +4,8 @@
   fn,
   pkgs,
   ...
-}: {
+}:
+{
   config.machine.pkgsets.php.pkgwrap = fn.pkgFilter config.machine.pkgsets.php.pkgs;
   config.machine.pkgsets.php.pkgs =
     (with pkgs.php82Packages; [

pkgsets/python3.nix

@@ -5,8 +5,11 @@
   pkgs,
   ...
 }:
-with lib; {
+with lib;
-  config.machine.pkgsets.python3.pkgwrap = pkgs.python3.withPackages (ps: (fn.pkgFilter config.machine.pkgsets.python3.pkgs));
+{
+  config.machine.pkgsets.python3.pkgwrap = pkgs.python3.withPackages (
+    ps: (fn.pkgFilter config.machine.pkgsets.python3.pkgs)
+  );
   config.machine.pkgsets.python3.pkgs = with pkgs.python3Packages; [
     bpython
     flake8

pkgsets/rustpkgs.nix

@@ -1,11 +1,18 @@
-{config, ...}: let
+{ config, ... }:
-  mozRust = with builtins;
+let
-    (map (p:
+  mozRust =
-      import ((fetchTarball {
+    with builtins;
+    (map (
+      p:
+      import (
+        (fetchTarball {
           url = "https://github.com/mozilla/nixpkgs-mozilla/archive/e912ed4.tar.gz";
           sha256 = "08fvzb8w80bkkabc1iyhzd15f4sm7ra10jn32kfch5klgl0gj3j3";
         })
-        + p))) [
+        + p
+      )
+    ))
+      [
         (toPath "/lib-overlay.nix")
         (toPath "/rust-overlay.nix")
       ];
@@ -27,18 +34,26 @@
           "rustfmt-preview"
         ];
       }
-      // {src = nightly.rust-src;};
+      // {
+        src = nightly.rust-src;
+      };
     inherit (nightly) cargo;
   };
-  rustPNightly = stablepkgs.recurseIntoAttrs (stablepkgs.makeRustPlatform {
+  rustPNightly = stablepkgs.recurseIntoAttrs (
+    stablepkgs.makeRustPlatform {
       inherit (rustNightly) rustc cargo;
-  });
+    }
-in {
+  );
+in
+{
   config.machine.pkgsets.rustpkgs.pkgs =
     (with stablepkgs; [
       diesel-cli
       carnix
       rustracer
     ])
-    ++ (with rustNightly; [rustc cargo]);
+    ++ (with rustNightly; [
+      rustc
+      cargo
+    ]);
 }

pkgsets/server.nix

@@ -2,7 +2,8 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   config.machine.pkgsets.server.pkgs = with pkgs; [
     audit
     certbot

pkgsets/tracking.nix

@@ -4,7 +4,8 @@
   pkgs,
   ...
 }:
-with lib; {
+with lib;
+{
   config.machine.pkgsets.tracking.pkgs = with pkgs; [
     aw-qt
     aw-server-rust

pkgsets/uniProgs.nix

@@ -2,6 +2,7 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   config.machine.pkgsets.uniProgs.pkgs = with pkgs; [ qucs ];
 }

pkgsets/xpkgs.nix

@@ -2,9 +2,11 @@
   config,
   pkgs,
   ...
-}: let
+}:
+let
   cfg = config.machine;
-in {
+in
+{
   config.machine.pkgsets.xpkgs.pkgs = with pkgs; [
     acpilight
     feh

services/acme.nix

@@ -7,7 +7,8 @@
   ...
 }:
 with builtins;
-with lib; let
+with lib;
+let
   cfg = config.machine;
 in
 mkIf (elem "acme" cfg.services) {

services/bind.nix

@@ -8,7 +8,8 @@
   ...
 }:
 with builtins;
-with lib; let
+with lib;
+let
   cfg = config.machine;
 in
 mkIf (elem "bind" cfg.services) {

services/cups.nix

@@ -10,6 +10,11 @@ with lib;
     enable = true;
     browsed.enable = false;
     startWhenNeeded = true;
-      drivers = with pkgs; [gutenprint hplip splix samsung-unified-linux-driver];
+    drivers = with pkgs; [
+      gutenprint
+      hplip
+      splix
+      samsung-unified-linux-driver
+    ];
   };
 }

services/desktop.nix

@@ -5,7 +5,8 @@
   pkgs,
   ...
 }:
-with lib; let
+with lib;
+let
   cfg = config.machine;
   desktopFiles = fn.lst {
     p = toString ./desktop;

services/desktop/i3.nix

@@ -20,5 +20,9 @@ with lib;
       ];
     };
   };
-    machine.pkgsets.python3.pkgs = with pkgs.python3Packages; [py3status pytz tzlocal];
+  machine.pkgsets.python3.pkgs = with pkgs.python3Packages; [
+    py3status
+    pytz
+    tzlocal
+  ];
 }

services/docker.nix

@@ -12,5 +12,9 @@ with lib;
     # Disable live restore as it tends to delay/block system shutdown
     liveRestore = false;
   };
-    environment.systemPackages = with pkgs; [docker-compose docker-machine cntr];
+  environment.systemPackages = with pkgs; [
+    docker-compose
+    docker-machine
+    cntr
+  ];
 }

services/fail2ban.nix

@@ -3,7 +3,8 @@
   lib,
   ...
 }:
-with lib; let
+with lib;
+let
   cfg = config.machine;
   active = name: (elem name cfg.services);
 in

services/forgejo.nix

@@ -6,10 +6,12 @@
 with lib;
 mkIf (elem "forgejo" config.machine.services) {
   services = {
-      forgejo = let
+    forgejo =
+      let
         cfg = config.machine;
         inherit ((findFirst (s: s.service == "forgejo") cfg cfg.vHosts)) domain;
-      in {
+      in
+      {
         enable = true;
         user = "git";
         database = {

services/fprintd.nix

@@ -5,7 +5,8 @@
 }:
 with lib;
 mkIf (elem "fprintd" config.machine.services) {
-    security.pam.services = let
+  security.pam.services =
+    let
       unlock = [
         "sudo"
         "i3lock"
@@ -13,10 +14,14 @@ with lib;
         "lightdm"
       ];
     in
-      listToAttrs (forEach unlock (n: {
+    listToAttrs (
+      forEach unlock (n: {
         name = n;
-        value = {fprintAuth = true;};
+        value = {
-      }));
+          fprintAuth = true;
+        };
+      })
+    );
 
   services.fprintd = {
     enable = true;

services/hydra.nix

@@ -9,7 +9,8 @@
 # https://qfpl.io/posts/nix/starting-simple-hydra/
 # also for reference a well written hydra config:
 # https://github.com/NixOS/nixos-org-configurations/blob/master/delft/hydra.nix
-with lib; let
+with lib;
+let
   cacheDir = "/var/cache/hydra";
 in
 mkIf (elem "hydra" config.machine.services) {
@@ -18,15 +19,22 @@ in
     {
       hostName = "localhost";
       system = "x86_64-linux";
-        supportedFeatures = ["kvm" "nixos-test" "big-parallel" "benchmark"];
+      supportedFeatures = [
+        "kvm"
+        "nixos-test"
+        "big-parallel"
+        "benchmark"
+      ];
       maxJobs = 8;
     }
   ];
 
-    services = let
+  services =
+    let
       cfg = config.machine;
       inherit ((findFirst (s: s.service == "hydra") cfg cfg.vHosts)) domain;
-    in {
+    in
+    {
       hydra = {
         enable = true;
         hydraURL = domain; # externally visible URL
@@ -42,7 +50,9 @@ in
         # hydra.conf: binary_cache_secret_key_file is deprecated and ignored. use store_uri=...?secret-key= instead
         extraConfig = ''
           max_output_size = 4294967296
-          store_uri = file://${cacheDir}?secret-key=${config.sops.secrets."services.hydra.secretKey".path}&write-nar-listing=1&ls-compression=br&log-compression=br
+          store_uri = file://${cacheDir}?secret-key=${
+            config.sops.secrets."services.hydra.secretKey".path
+          }&write-nar-listing=1&ls-compression=br&log-compression=br
           # add ?local-nar-cache= to set nar cache location
           server_store_uri = https://cache.${cfg.domain}
           binary_cache_public_uri https://cache.${cfg.domain}

services/mailserver.nix

@@ -12,11 +12,15 @@ with lib;
   ];
 }
 // mkIf (elem "mailserver" config.machine.services) {
-    mailserver = let
+  mailserver =
+    let
       cfg = config.machine;
       inherit (cfg) domain;
       fdomain = (findFirst (s: s.service == "mail") cfg cfg.vHosts).domain;
-      mkFqdnAlias = name: ["${name}@${domain}" "${name}@${fdomain}"];
+      mkFqdnAlias = name: [
+        "${name}@${domain}"
+        "${name}@${fdomain}"
+      ];
       mkExDomAlias = name: (map (exDom: "${name}@${exDom}") cfg.extraDomains);
       mkUser = user: rec {
         name = "${user.name}@${domain}";
@@ -28,10 +32,14 @@ with lib;
             ++ (flatten (map mkExDomAlias ([ user.name ] ++ user.aliases)));
         };
       };
-    in rec {
+    in
+    rec {
       enable = true;
       fqdn = fdomain;
-      domains = [fdomain domain] ++ cfg.extraDomains;
+      domains = [
+        fdomain
+        domain
+      ] ++ cfg.extraDomains;
       loginAccounts = listToAttrs (map mkUser cfg.mailAccounts);
 
       # Use Let's Encrypt certificates. Note that this needs to set up a stripped
@@ -55,9 +63,5 @@ with lib;
       # 1 Gb RAM for the server. Without virus scanning 256 MB RAM should be plenty)
       virusScanning = false;
     };
-    sops.secrets =
+  sops.secrets = fn.sopsHelper (user: "users/${user.name}/mail") config.machine.mailAccounts { };
-      fn.sopsHelper
-      (user: "users/${user.name}/mail")
-      config.machine.mailAccounts
-      {};
 }

services/nextcloud.nix

@@ -7,10 +7,12 @@
 }:
 with lib;
 mkIf (elem "nextcloud" config.machine.services) {
-    services = let
+  services =
+    let
       cfg = config.machine;
       inherit ((findFirst (s: s.service == "nextcloud") cfg cfg.vHosts)) domain;
-    in {
+    in
+    {
       nextcloud = {
         enable = true;
         home = "/var/lib/nextcloud";
@@ -55,9 +57,11 @@ with lib;
       };
     };
   sops.secrets =
-      fn.sopsHelper
+    fn.sopsHelper (name: "services/nextcloud/${name}")
-      (name: "services/nextcloud/${name}")
+      [
-      ["adminPass" "dbPass"]
+        "adminPass"
+        "dbPass"
+      ]
       {
         owner = "nextcloud";
         group = "nextcloud";

services/nginx.nix

@@ -16,27 +16,34 @@
 with lib;
 with builtins;
 mkIf (elem "nginx" config.machine.services) {
-    services.nginx = let
+  services.nginx =
-      vHostConfigs = listToAttrs (map
+    let
-        (name: {
+      vHostConfigs = listToAttrs (
+        map (name: {
           name = replaceStrings [ ".nix" ] [ "" ] name;
-          value = import (./. + (toPath "/nginx_vHosts/${name}")) {inherit options config lib pkgs;};
+          value = import (./. + (toPath "/nginx_vHosts/${name}")) {
-        })
+            inherit
-        (attrNames (readDir ./nginx_vHosts)));
+              options
+              config
+              lib
+              pkgs
+              ;
+          };
+        }) (attrNames (readDir ./nginx_vHosts))
+      );
 
       mkVHost = vHost: {
         name = vHost.domain;
-        value =
+        value = {
-          {
           enableACME = true;
           forceSSL = true;
           acmeRoot = "/var/lib/acme/acme-challenge";
-          }
+        } // vHostConfigs."${vHost.service}";
-          // vHostConfigs."${vHost.service}";
       };
 
       vHosts = listToAttrs (map mkVHost config.machine.vHosts);
-    in {
+    in
+    {
       enable = true;
       recommendedGzipSettings = true;
       recommendedOptimisation = true;

services/nginx_vHosts/cache.nix

@@ -6,8 +6,8 @@
 with lib;
 {
   vHost =
-      if config.services.nix-serve.enable
+    if config.services.nix-serve.enable then
-      then {
+      {
         extraConfig = ''
           location / {
             proxy_pass http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port};
@@ -18,6 +18,7 @@ with lib;
           }
         '';
       }
-      else {};
+    else
+      { };
 }
 .vHost

services/nginx_vHosts/forgejo.nix

@@ -6,8 +6,8 @@
 with lib;
 {
   vHost =
-      if config.services.forgejo.enable
+    if config.services.forgejo.enable then
-      then {
+      {
         root = "${config.services.forgejo.stateDir}/public";
         extraConfig = ''
           location / {
@@ -28,6 +28,7 @@ with lib;
           }
         '';
       }
-      else {};
+    else
+      { };
 }
 .vHost

services/nginx_vHosts/hydra.nix

@@ -6,8 +6,8 @@
 with lib;
 {
   vHost =
-      if config.services.hydra.enable
+    if config.services.hydra.enable then
-      then {
+      {
         extraConfig = ''
           location / {
             proxy_pass http://${config.services.hydra.listenHost}:${toString config.services.hydra.port};
@@ -18,6 +18,7 @@ with lib;
           }
         '';
       }
-      else {};
+    else
+      { };
 }
 .vHost

services/nginx_vHosts/mail.nix

@@ -6,12 +6,13 @@
 with lib;
 {
   vHost =
-      if config.mailserver.enable
+    if config.mailserver.enable then
-      then {
+      {
         serverName = config.mailserver.fqdn;
         enableACME = true;
         forceSSL = true;
       }
-      else {};
+    else
+      { };
 }
 .vHost

services/nginx_vHosts/nextcloud.nix

@@ -6,8 +6,7 @@
   ...
 }:
 with lib;
-  if config.services.nextcloud.enable
+if config.services.nextcloud.enable then
-  then
   {
     vHost = {
       enableACME = config.services.nextcloud.https;
@@ -15,4 +14,5 @@ with lib;
     };
   }
   .vHost
-  else {}
+else
+  { }

services/nginx_vHosts/tandoor.nix

@@ -6,10 +6,11 @@
 with lib;
 let
   tandoor = config.services.tandoor-recipes;
-in {
+in
+{
   vHost =
-      if tandoor.enable
+    if tandoor.enable then
-      then {
+      {
         extraConfig = ''
           location /media/ {
             alias ${tandoor.extraConfig.MEDIA_ROOT};
@@ -24,6 +25,7 @@ in {
           }
         '';
       }
-      else {};
+    else
+      { };
 }
 .vHost

services/openssh.nix

@@ -12,18 +12,23 @@ with lib;
   services.openssh = {
     enable = true;
     settings.KexAlgorithms = [ "curve25519-sha256@libssh.org" ];
-      sftpFlags = ["-f AUTHPRIV" "-l INFO"];
+    sftpFlags = [
+      "-f AUTHPRIV"
+      "-l INFO"
+    ];
     startWhenNeeded = false;
     settings = {
       KbdInteractiveAuthentication = false;
       PasswordAuthentication = false;
       PermitRootLogin = "no";
     };
-      extraConfig = let
+    extraConfig =
+      let
         users =
           concatMapStrings (user: "${user.name} ") config.machine.administrators
           + (optionalString config.services.forgejo.enable (config.services.forgejo.user + " "));
-      in ''
+      in
+      ''
         UsePAM no
         AllowUsers ${users}
         LogLevel VERBOSE
@@ -32,9 +37,7 @@ with lib;
   # Add public keys to /etc/ssh/authorized_keys.d
   # This replaces users.users.*.openssh.authorizedKeys.*
   sops.secrets =
-      fn.sopsHelper
+    fn.sopsHelper (user: "users/${user.name}/publicKey") config.machine.administrators
-      (user: "users/${user.name}/publicKey")
-      config.machine.administrators
       (user: {
         path = "/etc/ssh/authorized_keys.d/${user.name}";
         mode = "444";

services/podman.nix

@@ -4,7 +4,8 @@
   pkgs,
   ...
 }:
-with lib; let
+with lib;
+let
   withDocker = elem "docker" config.machine.services;
 in
 mkIf (elem "podman" config.machine.services) {
@@ -17,6 +18,11 @@ in
     };
   };
   environment.systemPackages =
-      (with pkgs; [podman-compose cntr img skopeo])
+    (with pkgs; [
+      podman-compose
+      cntr
+      img
+      skopeo
+    ])
     ++ (optional withDocker pkgs.docker-compose);
 }