From b2ec9599373c7e0f5428694c5712c8fc0be06264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 14 Mar 2024 09:35:13 +0100
Subject: Load of updates and module simplification

---
 nixos/machine/adm-omnia2.nix | 72 ++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 40 deletions(-)

(limited to 'nixos/machine/adm-omnia2.nix')

diff --git a/nixos/machine/adm-omnia2.nix b/nixos/machine/adm-omnia2.nix
index 2573372..be245e2 100644
--- a/nixos/machine/adm-omnia2.nix
+++ b/nixos/machine/adm-omnia2.nix
@@ -1,47 +1,39 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; {
-  config = {
-    cynerd = {
-      switch = {
-        enable = true;
-        lanAddress = "${config.cynerd.hosts.adm.omnia2}/24";
-        lanGateway = config.cynerd.hosts.adm.omnia;
-      };
-      wifiAP.adm = {
-        enable = true;
-        ar9287.interface = "wlp2s0";
-        qca988x.interface = "wlp1s0";
-      };
+{config, ...}: {
+  cynerd = {
+    switch = {
+      enable = true;
+      lanAddress = "${config.cynerd.hosts.adm.omnia2}/24";
+      lanGateway = config.cynerd.hosts.adm.omnia;
     };
-
-    services.btrfs.autoScrub = {
+    wifiAP.adm = {
       enable = true;
-      fileSystems = ["/"];
+      ar9287.interface = "wlp2s0";
+      qca988x.interface = "wlp1s0";
     };
+  };
 
-    networking = {
-      useNetworkd = true;
-      useDHCP = false;
-    };
-    systemd.network.networks = {
-      "lan-brlan" = {
-        matchConfig.Name = "lan* eth0";
-        networkConfig.Bridge = "brlan";
-        bridgeVLANs = [
-          {
-            bridgeVLANConfig = {
-              EgressUntagged = 1;
-              PVID = 1;
-            };
-          }
-          {bridgeVLANConfig.VLAN = 2;}
-        ];
-      };
+  services.btrfs.autoScrub = {
+    enable = true;
+    fileSystems = ["/"];
+  };
+
+  networking = {
+    useNetworkd = true;
+    useDHCP = false;
+  };
+  systemd.network.networks = {
+    "lan-brlan" = {
+      matchConfig.Name = "lan* eth0";
+      networkConfig.Bridge = "brlan";
+      bridgeVLANs = [
+        {
+          bridgeVLANConfig = {
+            EgressUntagged = 1;
+            PVID = 1;
+          };
+        }
+        {bridgeVLANConfig.VLAN = 2;}
+      ];
     };
   };
 }
-- 
cgit v1.2.3