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/network/address.nix

@@ -1,9 +1,14 @@
 {
-  liminix
-, serviceFns
-, lib
+  liminix,
+  serviceFns,
+  lib,
+}:
+{
+  interface,
+  family,
+  address,
+  prefixLength,
 }:
-{interface, family, address, prefixLength} :
 let
   inherit (liminix.services) oneshot;
   # rather depending on the assumption that nobody will
@@ -20,8 +25,9 @@ let
      echo $dev > ifname
     )
   '';
-in oneshot {
+in
+oneshot {
   inherit name up;
-  down = "true";                # this has been broken for ~ ages
+  down = "true"; # this has been broken for ~ ages
   dependencies = [ interface ];
 }

modules/network/default.nix

@@ -4,13 +4,18 @@
 ## Basic network services for creating hardware ethernet devices
 ## and adding addresses
 
-
-{ lib, pkgs, config, ...}:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 let
   inherit (lib) mkOption types;
   inherit (pkgs) liminix;
   inherit (pkgs.liminix.services) bundle;
-in {
+in
+{
   options = {
     system.service.network = {
       link = mkOption {
@@ -42,17 +47,18 @@ in {
       lo =
         let
           net = config.system.service.network;
-          iface = net.link.build { ifname = "lo";};
-        in bundle {
+          iface = net.link.build { ifname = "lo"; };
+        in
+        bundle {
           name = "loopback";
           contents = [
-            ( net.address.build {
+            (net.address.build {
               interface = iface;
               family = "inet";
-              address ="127.0.0.1";
+              address = "127.0.0.1";
               prefixLength = 8;
             })
-            ( net.address.build {
+            (net.address.build {
               interface = iface;
               family = "inet6";
               address = "::1";
@@ -82,7 +88,8 @@ in {
             Path to the sysfs node of the device. If you provide this
             and the ifname option, the device will be renamed to the
             name given by ifname.
-          ''; };
+          '';
+        };
         # other "ip link add" options could go here as well
         mtu = mkOption {
           type = types.nullOr types.int;
@@ -94,7 +101,10 @@ in {
           type = liminix.lib.types.service;
         };
         family = mkOption {
-          type = types.enum [ "inet" "inet6" ];
+          type = types.enum [
+            "inet"
+            "inet6"
+          ];
         };
         address = mkOption {
           type = types.str;

modules/network/dhcpc.nix

@@ -1,14 +1,14 @@
 {
-  liminix
-, writeAshScript
-, serviceFns
-, lib
-} :
+  liminix,
+  writeAshScript,
+  serviceFns,
+  lib,
+}:
 { interface }:
 let
   inherit (liminix.services) longrun;
   name = "${interface.name}.dhcpc";
-  script = writeAshScript "dhcp-notify"  { } ''
+  script = writeAshScript "dhcp-notify" { } ''
     . ${serviceFns}
     exec 2>&1
     action=$1
@@ -38,7 +38,8 @@ let
         ;;
     esac
   '';
-in longrun {
+in
+longrun {
   inherit name;
   run = "exec /bin/udhcpc -f -i $(output ${interface} ifname) -x hostname:$(cat /proc/sys/kernel/hostname) -s ${script}";
   notification-fd = 10;

modules/network/forward.nix

@@ -1,6 +1,6 @@
 {
-  liminix
-, lib
+  liminix,
+  lib,
 }:
 { enableIPv4, enableIPv6 }:
 let
@@ -8,11 +8,9 @@ let
   ip4 = "/proc/sys/net/ipv4/conf/all/forwarding";
   ip6 = "/proc/sys/net/ipv6/conf/all/forwarding";
   opt = lib.optionalString;
-  sysctls = b :
-    ""
-    + opt enableIPv4 "echo ${b} > ${ip4}\n"
-    + opt enableIPv6 "echo ${b} > ${ip6}\n";
-in oneshot {
+  sysctls = b: "" + opt enableIPv4 "echo ${b} > ${ip4}\n" + opt enableIPv6 "echo ${b} > ${ip6}\n";
+in
+oneshot {
   name = "forwarding${opt enableIPv4 "4"}${opt enableIPv6 "6"}";
   up = sysctls "1";
   down = sysctls "0";

modules/network/link.nix

@@ -1,23 +1,27 @@
 {
-  liminix
-, lib
+  liminix,
+  lib,
 }:
 {
-  ifname
-, devpath ? null
-, mtu} :
+  ifname,
+  devpath ? null,
+  mtu,
+}:
 # if devpath is supplied, we rename the interface at that
 # path to have the specified name.
 let
   inherit (liminix.services) oneshot;
   name = "${ifname}.link";
-  rename = if devpath != null
-           then ''
-             oldname=$(cd /sys${devpath} && cd net/ && echo *)
-             ip link set ''${oldname} name ${ifname}
-           ''
-           else "";
-in oneshot {
+  rename =
+    if devpath != null then
+      ''
+        oldname=$(cd /sys${devpath} && cd net/ && echo *)
+        ip link set ''${oldname} name ${ifname}
+      ''
+    else
+      "";
+in
+oneshot {
   inherit name;
   up = ''
     ${rename}

modules/network/route.nix

@@ -1,20 +1,30 @@
 {
-  liminix
-, lib
+  liminix,
+  lib,
+}:
+{
+  target,
+  via,
+  interface ? null,
+  metric,
 }:
-{ target, via, interface ? null, metric }:
 let
   inherit (liminix.services) oneshot;
   with_dev = if interface != null then "dev $(output ${interface} ifname)" else "";
   target_hash = builtins.substring 0 12 (builtins.hashString "sha256" target);
   via_hash = builtins.substring 0 12 (builtins.hashString "sha256" via);
-in oneshot {
-  name = "route-${target_hash}-${builtins.substring 0 12 (builtins.hashString "sha256" "${via_hash}-${if interface!=null then interface.name else ""}")}";
+in
+oneshot {
+  name = "route-${target_hash}-${
+    builtins.substring 0 12 (
+      builtins.hashString "sha256" "${via_hash}-${if interface != null then interface.name else ""}"
+    )
+  }";
   up = ''
     ip route add ${target} via ${via} metric ${toString metric} ${with_dev}
   '';
   down = ''
     ip route del ${target} via ${via} ${with_dev}
   '';
-  dependencies = [] ++ lib.optional (interface != null) interface;
+  dependencies = [ ] ++ lib.optional (interface != null) interface;
 }