Format using Alejandra

16 files changed, 192 insertions, 173 deletions

diff --git a/nixos/machine/adm-mpd.nix b/nixos/machine/adm-mpd.nix
index 45855e1..a35c944 100644
--- a/nixos/machine/adm-mpd.nix
+++ b/nixos/machine/adm-mpd.nix
@@ -1,11 +1,11 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   config = {
-
     fileSystems = {
       "/" = {
         device = "/dev/mmcblk0p2";
@@ -28,9 +28,9 @@ with lib;
     };
 
     #services.pipewire = {
-      #enable = true;
-      #alsa.enable = true;
-      #pulse.enable = true;
+    #enable = true;
+    #alsa.enable = true;
+    #pulse.enable = true;
     #};
     hardware.pulseaudio = {
       enable = true;
@@ -52,7 +52,5 @@ with lib;
         initial_volume = 60;
       };
     };
-
   };
-
 }
diff --git a/nixos/machine/adm-omnia.nix b/nixos/machine/adm-omnia.nix
index 71104e9..4a41d4a 100644
--- a/nixos/machine/adm-omnia.nix
+++ b/nixos/machine/adm-omnia.nix
@@ -1,9 +1,10 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   config = {
     cynerd = {
       #openvpn.oldpersonal = true;
@@ -14,7 +15,11 @@ with lib;
       bridges = {
         brlan = {
           interfaces = [
-            "lan0" "lan1" "lan2" "lan3" "lan4"
+            "lan0"
+            "lan1"
+            "lan2"
+            "lan3"
+            "lan4"
           ];
         };
         #brguest = {
@@ -25,15 +30,17 @@ with lib;
       };
       interfaces.brlan = {
         ipv4 = {
-          addresses = [{
-            address = config.cynerd.hosts.adm.omnia;
-            prefixLength = 24;
-          }];
+          addresses = [
+            {
+              address = config.cynerd.hosts.adm.omnia;
+              prefixLength = 24;
+            }
+          ];
         };
       };
       # TODO localhost
-      nameservers = [ "1.1.1.1" "8.8.8.8" ];
-      dhcpcd.allowInterfaces = [ "eth2" ];
+      nameservers = ["1.1.1.1" "8.8.8.8"];
+      dhcpcd.allowInterfaces = ["eth2"];
     };
 
     networking.wirelessAP = {
@@ -60,7 +67,5 @@ with lib;
         };
       };
     };
-
   };
-
 }
diff --git a/nixos/machine/adm-omnia2.nix b/nixos/machine/adm-omnia2.nix
index 0bdc3bc..ac4433d 100644
--- a/nixos/machine/adm-omnia2.nix
+++ b/nixos/machine/adm-omnia2.nix
@@ -1,15 +1,21 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   config = {
     networking = {
       bridges = {
         brlan = {
           interfaces = [
-            "eth2" "lan0" "lan1" "lan2" "lan3" "lan4"
+            "eth2"
+            "lan0"
+            "lan1"
+            "lan2"
+            "lan3"
+            "lan4"
           ];
         };
       };
@@ -32,16 +38,17 @@ with lib;
       };
       interfaces.lan = {
         ipv4 = {
-          addresses = [{
-            address = config.cynerd.hosts.adm.omnia2;
-            prefixLength = 24;
-          }];
+          addresses = [
+            {
+              address = config.cynerd.hosts.adm.omnia2;
+              prefixLength = 24;
+            }
+          ];
         };
       };
       defaultGateway = config.cynerd.hosts.adm.omnia;
-      nameservers = [ config.cynerd.hosts.adm.omnia "1.1.1.1" "8.8.8.8" ];
-      dhcpcd.allowInterfaces = [ "lan" ];
+      nameservers = [config.cynerd.hosts.adm.omnia "1.1.1.1" "8.8.8.8"];
+      dhcpcd.allowInterfaces = ["lan"];
     };
   };
-
 }
diff --git a/nixos/machine/albert.nix b/nixos/machine/albert.nix
index bc35f96..68d55ba 100644
--- a/nixos/machine/albert.nix
+++ b/nixos/machine/albert.nix
@@ -1,9 +1,10 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   config = {
     cynerd = {
       desktop = {
@@ -42,7 +43,5 @@ with lib;
         options = ["compress=lzo" "subvol=@home"];
       };
     };
-
   };
-
 }
diff --git a/nixos/machine/binky.nix b/nixos/machine/binky.nix
index 7be8017..a90d625 100644
--- a/nixos/machine/binky.nix
+++ b/nixos/machine/binky.nix
@@ -1,9 +1,10 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   config = {
     cynerd = {
       desktop = {
@@ -61,7 +62,5 @@ with lib;
       dataDir = "/home/cynerd";
       configDir = "/home/cynerd/.config/syncthing";
     };
-
   };
-
 }
diff --git a/nixos/machine/dean.nix b/nixos/machine/dean.nix
index aef3c04..8fca4bf 100644
--- a/nixos/machine/dean.nix
+++ b/nixos/machine/dean.nix
@@ -1,9 +1,10 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   config = {
     cynerd = {
       openvpn = {
@@ -15,23 +16,27 @@ with lib;
       bridges = {
         brlan = {
           interfaces = [
-            "eth0" "lan1" "lan2" "lan3" "lan4"
+            "eth0"
+            "lan1"
+            "lan2"
+            "lan3"
+            "lan4"
           ];
         };
       };
-      dhcpcd.allowInterfaces = [ "brlan" ];
+      dhcpcd.allowInterfaces = ["brlan"];
     };
 
-    swapDevices = [{
-      device = "/var/swap";
-      priority = 1;
-    }];
+    swapDevices = [
+      {
+        device = "/var/swap";
+        priority = 1;
+      }
+    ];
 
     environment.systemPackages = with pkgs; [
       #openocd
       sterm
     ];
-
   };
-
 }
diff --git a/nixos/machine/errol.nix b/nixos/machine/errol.nix
index 70bc8cf..4a696b1 100644
--- a/nixos/machine/errol.nix
+++ b/nixos/machine/errol.nix
@@ -1,9 +1,10 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   config = {
     cynerd = {
       desktop.enable = true;
@@ -87,12 +88,11 @@ with lib;
       };
       extraComponents = [];
       package = pkgs.home-assistant.override {
-        extraPackages = pkgs: with pkgs; [
-          securetar
-        ];
+        extraPackages = pkgs:
+          with pkgs; [
+            securetar
+          ];
       };
     };
-
   };
-
 }
diff --git a/nixos/machine/gaspode.nix b/nixos/machine/gaspode.nix
index 82762f1..cbd08bb 100644
--- a/nixos/machine/gaspode.nix
+++ b/nixos/machine/gaspode.nix
@@ -1,11 +1,11 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   config = {
-
     fileSystems = {
       "/" = {
         device = "/dev/mmcblk0p2";
@@ -19,7 +19,5 @@ with lib;
         device = "/dev/mmcblk0p1";
       };
     };
-
   };
-
 }
diff --git a/nixos/machine/lipwig.nix b/nixos/machine/lipwig.nix
index ef90385..0ebf894 100644
--- a/nixos/machine/lipwig.nix
+++ b/nixos/machine/lipwig.nix
@@ -1,9 +1,10 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   config = {
     cynerd = {
       syncthing = {
@@ -38,7 +39,7 @@ with lib;
       enable = true;
       settings = {
         server = {
-          hosts = [ "0.0.0.0:5232" "[::]:5232" ];
+          hosts = ["0.0.0.0:5232" "[::]:5232"];
           ssl = true;
           certificate = "/run/secrets/radicale/radicale.crt";
           key = "/run/secrets/radicale/radicale.key";
@@ -62,5 +63,4 @@ with lib;
       };
     };
   };
-
 }
diff --git a/nixos/machine/mrpump.nix b/nixos/machine/mrpump.nix
index 0b322dc..68de482 100644
--- a/nixos/machine/mrpump.nix
+++ b/nixos/machine/mrpump.nix
@@ -1,21 +1,21 @@
-self: { config, lib, pkgs, ... }:
-
+self: {
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with builtins;
-with lib;
-
-{
-
+with lib; {
   config = let
-
     localNix = import (self.inputs.nix.outPath + "/docker.nix") {
       pkgs = pkgs;
       name = "local/nix";
       tag = "latest";
       bundleNixpkgs = false;
-      extraPkgs = with pkgs; [ cachix ];
+      extraPkgs = with pkgs; [cachix];
       nixConf = {
         cores = "0";
-        experimental-features = [ "nix-command" "flakes" ];
+        experimental-features = ["nix-command" "flakes"];
       };
     };
     localNixDaemon = pkgs.dockerTools.buildLayeredImage {
@@ -24,14 +24,13 @@ with lib;
       tag = "latest";
       config = {
         Volumes = {
-          "/nix/store" = { };
-          "/nix/var/nix/db" = { };
-          "/nix/var/nix/daemon-socket" = { };
+          "/nix/store" = {};
+          "/nix/var/nix/db" = {};
+          "/nix/var/nix/daemon-socket" = {};
         };
       };
       maxLayers = 125;
     };
-
   in {
     # MrPump won't see Errol anyway
     cynerd.hosts.enable = false;
@@ -45,7 +44,7 @@ with lib;
         dates = "daily";
       };
     };
-    users.users.cynerd.extraGroups = [ "docker" ];
+    users.users.cynerd.extraGroups = ["docker"];
 
     # Common container for the Gitlab Nix runner
     virtualisation.oci-containers = {
@@ -59,7 +58,7 @@ with lib;
 
     # Gitlab runner
     systemd.services.gitlab-runner.serviceConfig = let
-      config = (pkgs.formats.toml{}).generate "gitlab-runner.toml" {
+      config = (pkgs.formats.toml {}).generate "gitlab-runner.toml" {
         concurrent = 1;
         runners = [
           {
@@ -118,7 +117,5 @@ with lib;
       ExecReload = mkForce "!${configureScript}";
     };
     services.gitlab-runner.enable = true;
-
   };
-
 }
diff --git a/nixos/machine/ridcully.nix b/nixos/machine/ridcully.nix
index ad31e82..01e8f07 100644
--- a/nixos/machine/ridcully.nix
+++ b/nixos/machine/ridcully.nix
@@ -1,9 +1,10 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   config = {
     cynerd = {
       desktop.enable = true;
@@ -63,7 +64,5 @@ with lib;
       dataDir = "/home/cynerd";
       configDir = "/home/cynerd/.config/syncthing";
     };
-
   };
-
 }
diff --git a/nixos/machine/spt-mox.nix b/nixos/machine/spt-mox.nix
index 57573ef..3ada201 100644
--- a/nixos/machine/spt-mox.nix
+++ b/nixos/machine/spt-mox.nix
@@ -1,10 +1,11 @@
-{ config, lib, pkgs, ... }:
-
-with builtins;
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with builtins;
+with lib; {
   config = {
     cynerd.home-assistant = true;
 
@@ -41,7 +42,11 @@ with lib;
       bridges = {
         brlan = {
           interfaces = [
-            "eth0" "lan1" "lan2" "lan3" "lan4"
+            "eth0"
+            "lan1"
+            "lan2"
+            "lan3"
+            "lan4"
           ];
         };
         brguest = {
@@ -52,17 +57,17 @@ with lib;
       };
       interfaces.brlan = {
         ipv4 = {
-          addresses = [{
-            address = config.cynerd.hosts.spt.mox;
-            prefixLength = 24;
-          }];
+          addresses = [
+            {
+              address = config.cynerd.hosts.spt.mox;
+              prefixLength = 24;
+            }
+          ];
         };
       };
       defaultGateway = config.cynerd.hosts.spt.omnia;
-      nameservers = [ config.cynerd.hosts.spt.omnia "1.1.1.1" "8.8.8.8" ];
-      dhcpcd.allowInterfaces = [ "brlan" ];
+      nameservers = [config.cynerd.hosts.spt.omnia "1.1.1.1" "8.8.8.8"];
+      dhcpcd.allowInterfaces = ["brlan"];
     };
-
   };
-
 }
diff --git a/nixos/machine/spt-mox2.nix b/nixos/machine/spt-mox2.nix
index 71b95ac..8ecf1ad 100644
--- a/nixos/machine/spt-mox2.nix
+++ b/nixos/machine/spt-mox2.nix
@@ -1,19 +1,21 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   config = {
-
     boot.kernelParams = [
       "pcie_aspm=off" # Fix for crashes due to SError Interrupt on ath10k load
     ];
 
-    swapDevices = [{
-      device = "/dev/disk/by-partlabel/NixTurrisSwap";
-      priority = 1;
-    }];
+    swapDevices = [
+      {
+        device = "/dev/disk/by-partlabel/NixTurrisSwap";
+        priority = 1;
+      }
+    ];
 
     networking.wirelessAP = {
       enable = true;
@@ -61,16 +63,17 @@ with lib;
       };
       interfaces.brlan = {
         ipv4 = {
-          addresses = [{
-            address = config.cynerd.hosts.spt.mox2;
-            prefixLength = 24;
-          }];
+          addresses = [
+            {
+              address = config.cynerd.hosts.spt.mox2;
+              prefixLength = 24;
+            }
+          ];
         };
       };
       defaultGateway = config.cynerd.hosts.spt.omnia;
-      nameservers = [ config.cynerd.hosts.spt.omnia "1.1.1.1" "8.8.8.8" ];
-      dhcpcd.allowInterfaces = [ "brlan" ];
+      nameservers = [config.cynerd.hosts.spt.omnia "1.1.1.1" "8.8.8.8"];
+      dhcpcd.allowInterfaces = ["brlan"];
     };
   };
-
 }
diff --git a/nixos/machine/spt-mpd.nix b/nixos/machine/spt-mpd.nix
index f32c1db..ab960b5 100644
--- a/nixos/machine/spt-mpd.nix
+++ b/nixos/machine/spt-mpd.nix
@@ -1,9 +1,10 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   config = {
     fileSystems = {
       "/" = {
@@ -13,5 +14,4 @@ with lib;
       };
     };
   };
-
 }
diff --git a/nixos/machine/spt-omnia.nix b/nixos/machine/spt-omnia.nix
index d2c4a96..8251b0b 100644
--- a/nixos/machine/spt-omnia.nix
+++ b/nixos/machine/spt-omnia.nix
@@ -1,9 +1,10 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   config = {
     cynerd = {
       openvpn.oldpersonal = true;
@@ -14,7 +15,11 @@ with lib;
       bridges = {
         brlan = {
           interfaces = [
-            "lan0" "lan1" "lan2" "lan3" "lan4"
+            "lan0"
+            "lan1"
+            "lan2"
+            "lan3"
+            "lan4"
           ];
         };
         #brguest = {
@@ -25,14 +30,16 @@ with lib;
       };
       interfaces.brlan = {
         ipv4 = {
-          addresses = [{
-            address = config.cynerd.hosts.spt.omnia;
-            prefixLength = 24;
-          }];
+          addresses = [
+            {
+              address = config.cynerd.hosts.spt.omnia;
+              prefixLength = 24;
+            }
+          ];
         };
       };
-      nameservers = [ "127.0.0.1" "1.1.1.1" "8.8.8.8" ];
-      dhcpcd.allowInterfaces = [ "eth2" ];
+      nameservers = ["127.0.0.1" "1.1.1.1" "8.8.8.8"];
+      dhcpcd.allowInterfaces = ["eth2"];
     };
 
     services.syncthing = {
@@ -44,7 +51,5 @@ with lib;
 
       dataDir = "/data";
     };
-
   };
-
 }
diff --git a/nixos/machine/susan.nix b/nixos/machine/susan.nix
index b452ed9..d05120f 100644
--- a/nixos/machine/susan.nix
+++ b/nixos/machine/susan.nix
@@ -1,9 +1,10 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   config = {
     cynerd.desktop.enable = true;
 
@@ -20,7 +21,5 @@ with lib;
         device = "/dev/disk/by-uuid/EB3E-3635";
       };
     };
-
   };
-
 }