extract bridge to module-based services

modules/bridge/default.nix

@@ -0,0 +1,22 @@
+{ lib, pkgs, config, ...}:
+let
+  inherit (lib) mkOption types;
+  inherit (pkgs.liminix.services) oneshot;
+in
+{
+  options = {
+    system.service.bridge = {
+      primary = mkOption {
+        type = types.functionTo pkgs.liminix.lib.types.service;
+      };
+      members = mkOption {
+        type = types.functionTo pkgs.liminix.lib.types.service;
+      };
+    };
+  };
+  config = {
+    system.service.bridge.primary = pkgs.callPackage ./primary.nix {};
+    system.service.bridge.members = pkgs.callPackage ./members.nix {};
+    kernel.config.BRIDGE = "y";
+  };
+}

modules/bridge/members.nix

@@ -0,0 +1,35 @@
+{
+  liminix
+, ifwait
+, lib
+}:
+let
+  inherit (liminix.networking) interface;
+  inherit (liminix.services) bundle oneshot;
+  inherit (liminix.lib) typeChecked;
+  inherit (lib) mkOption types;
+  t = {
+    members = mkOption {
+      type = types.listOf liminix.lib.types.service;
+      description = "interfaces to add to the bridge";
+    };
+    primary = mkOption {
+      type = liminix.lib.types.service;
+      description = "bridge interface to add them to";
+    };
+  };
+in
+params:
+let
+  inherit (typeChecked "bridge-members" t params) members primary;
+  addif = member :
+    oneshot {
+      name = "add-${member.device}-to-br-${primary.device}";
+      up = "${ifwait}/bin/ifwait ${member.device} running && ip link set dev ${member.device} master ${primary.device}";
+      down = "ip link set dev ${member.device} nomaster";
+      dependencies = [ primary member ];
+    };
+in bundle {
+  name = "bridge-${primary.device}-members";
+  contents = map addif members;
+}

modules/bridge/primary.nix

@@ -0,0 +1,22 @@
+{
+  liminix
+, lib
+}:
+let
+  inherit (liminix.networking) interface;
+  inherit (liminix.lib) typeChecked;
+  inherit (lib) mkOption types;
+  t = {
+    ifname = mkOption {
+      type = types.str;
+      description = "interface name for the bridge device";
+    };
+  };
+in
+params:
+let
+  inherit (typeChecked "bridge" t params) ifname;
+in interface {
+  device = ifname;
+  type = "bridge";
+}