Load of updates and module simplification

1 files changed, 30 insertions, 38 deletions

diff --git a/nixos/machine/dean.nix b/nixos/machine/dean.nix
index 906881f..0a97e33 100644
--- a/nixos/machine/dean.nix
+++ b/nixos/machine/dean.nix
@@ -1,46 +1,38 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; {
-  config = {
-    cynerd = {
-      openvpn = {
-        oldpersonal = true;
-      };
-      monitoring.speedtest = true;
+{pkgs, ...}: {
+  cynerd = {
+    openvpn = {
+      oldpersonal = true;
     };
+    monitoring.speedtest = true;
+  };
 
-    networking = {
-      bridges = {
-        brlan = {
-          interfaces = [
-            "eth0"
-            "lan1"
-            "lan2"
-            "lan3"
-            "lan4"
-          ];
-        };
+  networking = {
+    bridges = {
+      brlan = {
+        interfaces = [
+          "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
-      tio
-    ];
+  environment.systemPackages = with pkgs; [
+    #openocd
+    tio
+  ];
 
-    # TODO: ubootTools build is broken!
-    firmware.environment.enable = false;
-  };
+  # TODO: ubootTools build is broken!
+  firmware.environment.enable = false;
 }