nixfmt-rfc-style

There is nothing in this commit except for the changes made by
nix-shell -p nixfmt-rfc-style --run "nixfmt ."

If this has mucked up your open branches then sorry about that. You
can probably nixfmt them to match before merging

modules/profiles/gateway.nix

@@ -1,8 +1,18 @@
-{ config, pkgs, lib, ... } :
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   svc = config.system.service;
   cfg = config.profile.gateway;
-  inherit (lib) mkOption mkEnableOption mkIf types;
+  inherit (lib)
+    mkOption
+    mkEnableOption
+    mkIf
+    types
+    ;
   inherit (pkgs) liminix serviceFns;
   inherit (liminix.services) bundle oneshot;
   hostaps =
@@ -14,24 +24,27 @@ let
         wpa_pairwise = "TKIP CCMP"; # auth for wpa (may not need this?)
         rsn_pairwise = "CCMP"; # auth for wpa2
       };
-    in lib.mapAttrs'
-      (name : value :
-        let
-          attrs = defaults // { ssid = name; } // value;
-        in lib.nameValuePair
-          "hostap-${name}"
-          (svc.hostapd.build {
-            interface = attrs.interface;
-            params = lib.filterAttrs (k: v: k != "interface") attrs;
-          }))
-      cfg.wireless.networks;
-in {
+    in
+    lib.mapAttrs' (
+      name: value:
+      let
+        attrs = defaults // { ssid = name; } // value;
+      in
+      lib.nameValuePair "hostap-${name}" (
+        svc.hostapd.build {
+          interface = attrs.interface;
+          params = lib.filterAttrs (k: v: k != "interface") attrs;
+        }
+      )
+    ) cfg.wireless.networks;
+in
+{
 
   options.profile.gateway = {
     lan = {
       interfaces = mkOption {
         type = types.listOf liminix.lib.types.interface;
-        default = [];
+        default = [ ];
       };
       address = mkOption {
         type = types.attrs;
@@ -49,7 +62,7 @@ in {
       enable = mkEnableOption "firewall";
       rules = mkOption { type = types.attrsOf types.attrs; };
       zones = mkOption {
-        type = types.attrsOf (types.listOf  liminix.lib.types.service);
+        type = types.attrsOf (types.listOf liminix.lib.types.service);
         default = {
           lan = [ config.services.int ];
           wan = [ config.services.wan ];
@@ -82,11 +95,14 @@ in {
   ];
 
   config = {
-    services.int = svc.network.address.build ({
-      interface = svc.bridge.primary.build { ifname = "int"; };
-    } // cfg.lan.address);
+    services.int = svc.network.address.build (
+      {
+        interface = svc.bridge.primary.build { ifname = "int"; };
+      }
+      // cfg.lan.address
+    );
 
-    services.bridge =  svc.bridge.members.build {
+    services.bridge = svc.bridge.members.build {
       primary = config.services.int;
       members = cfg.lan.interfaces;
     };
@@ -113,12 +129,15 @@ in {
             })
           ];
         };
-      in mkIf cfg.wan.dhcp6.enable bundl;
+      in
+      mkIf cfg.wan.dhcp6.enable bundl;
 
     services.dns =
-      let interface = config.services.int;
-          dcfg = cfg.lan.dhcp;
-      in svc.dnsmasq.build {
+      let
+        interface = config.services.int;
+        dcfg = cfg.lan.dhcp;
+      in
+      svc.dnsmasq.build {
         resolvconf = config.services.resolvconf;
         inherit interface;
         ranges = [
@@ -147,11 +166,12 @@ in {
       interface = config.services.wan;
     };
 
-    services.firewall = mkIf cfg.firewall.enable
-      (svc.firewall.build {
+    services.firewall = mkIf cfg.firewall.enable (
+      svc.firewall.build {
         extraRules = cfg.firewall.rules;
         inherit (cfg.firewall) zones;
-      });
+      }
+    );
 
     services.resolvconf = oneshot rec {
       dependencies = [ config.services.wan ];
@@ -166,11 +186,13 @@ in {
     };
 
     filesystem =
-      let inherit (pkgs.pseudofile) dir symlink;
-      in dir {
+      let
+        inherit (pkgs.pseudofile) dir symlink;
+      in
+      dir {
         etc = dir {
           "resolv.conf" = symlink "${config.services.resolvconf}/.outputs/resolv.conf";
         };
       };
   };
- }
+}

modules/profiles/wap.nix

@@ -3,9 +3,10 @@
   pkgs,
   lib,
   ...
-}: let
+}:
+let
   inherit (pkgs) liminix;
-  inherit (lib) mkOption types ;
+  inherit (lib) mkOption types;
 
   inherit (pkgs.liminix.services) oneshot target;
   inherit (pkgs.pseudofile) dir symlink;
@@ -22,19 +23,22 @@
         wpa_pairwise = "TKIP CCMP"; # auth for wpa (may not need this?)
         rsn_pairwise = "CCMP"; # auth for wpa2
       };
-    in lib.mapAttrs'
-      (name : value :
-        let
-          attrs = defaults // { ssid = name; } // value;
-        in lib.nameValuePair
-          "hostap-${name}"
-          (svc.hostapd.build {
-            interface = attrs.interface;
-            params = lib.filterAttrs (k: v: k != "interface") attrs;
-          }))
-      cfg.wireless.networks;
+    in
+    lib.mapAttrs' (
+      name: value:
+      let
+        attrs = defaults // { ssid = name; } // value;
+      in
+      lib.nameValuePair "hostap-${name}" (
+        svc.hostapd.build {
+          interface = attrs.interface;
+          params = lib.filterAttrs (k: v: k != "interface") attrs;
+        }
+      )
+    ) cfg.wireless.networks;
 
-in {
+in
+{
   imports = [
     ../wlan.nix
     ../network
@@ -46,7 +50,7 @@ in {
   options.profile.wap = {
     interfaces = mkOption {
       type = types.listOf liminix.lib.types.interface;
-      default = [];
+      default = [ ];
     };
     wireless = mkOption {
       type = types.attrsOf types.anything;
@@ -71,7 +75,7 @@ in {
     services.defaultroute4 = svc.network.route.build {
       via = "$(output ${config.services.dhcpc} router)";
       target = "default";
-      dependencies = [config.services.dhcpc];
+      dependencies = [ config.services.dhcpc ];
     };
 
     services.resolvconf = oneshot rec {