From 55d172ef303ffbba476165a3498ee100988e89ed Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 16 Sep 2022 23:11:58 -0500 Subject: [PATCH] synit: add network stuff --- .../boot/syndicate/services/configdirs.pr | 1 + .../system/boot/syndicate/services/network.pr | 51 +++++++++++++++++++ .../system/boot/syndicate/services/ntpd.pr | 3 ++ .../boot/syndicate/services/userSettings.pr | 20 ++++++++ nixos/modules/system/boot/synit.nix | 25 +++++++-- 5 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 nixos/modules/system/boot/syndicate/services/configdirs.pr create mode 100644 nixos/modules/system/boot/syndicate/services/network.pr create mode 100644 nixos/modules/system/boot/syndicate/services/ntpd.pr create mode 100644 nixos/modules/system/boot/syndicate/services/userSettings.pr diff --git a/nixos/modules/system/boot/syndicate/services/configdirs.pr b/nixos/modules/system/boot/syndicate/services/configdirs.pr new file mode 100644 index 0000000..df68622 --- /dev/null +++ b/nixos/modules/system/boot/syndicate/services/configdirs.pr @@ -0,0 +1 @@ +> diff --git a/nixos/modules/system/boot/syndicate/services/network.pr b/nixos/modules/system/boot/syndicate/services/network.pr new file mode 100644 index 0000000..c2c928b --- /dev/null +++ b/nixos/modules/system/boot/syndicate/services/network.pr @@ -0,0 +1,51 @@ +> + +> + ready>> + +> + +? > [ + ! + ?- ! +] + +? > [ + >> +] + +? >> [ + ["@udhcpc@" "-i" $ifname "-fR"]> +] + + + +? [ + ? ?cap> [ + $cap { + machine: $machine + } + ] + + $machine ? [ + $log ! + $config [ + ! + ?- ! + ] + ] + + $machine ? [ + $config > + ] + $machine ? [ + $config > + ] + + $machine ? [ + $config + ] +] diff --git a/nixos/modules/system/boot/syndicate/services/ntpd.pr b/nixos/modules/system/boot/syndicate/services/ntpd.pr new file mode 100644 index 0000000..c5175d3 --- /dev/null +++ b/nixos/modules/system/boot/syndicate/services/ntpd.pr @@ -0,0 +1,3 @@ +> + > + diff --git a/nixos/modules/system/boot/syndicate/services/userSettings.pr b/nixos/modules/system/boot/syndicate/services/userSettings.pr new file mode 100644 index 0000000..d942794 --- /dev/null +++ b/nixos/modules/system/boot/syndicate/services/userSettings.pr @@ -0,0 +1,20 @@ +let ?settingsDir = "/etc/syndicate/user-settings" + +let ?settings = <* $config [ + > +]> + +> + +> + + +? ?cap> [ + $cap { + config: $config + settingsDir: $settingsDir + } +] diff --git a/nixos/modules/system/boot/synit.nix b/nixos/modules/system/boot/synit.nix index d12fa75..89a0ea9 100644 --- a/nixos/modules/system/boot/synit.nix +++ b/nixos/modules/system/boot/synit.nix @@ -126,10 +126,27 @@ with lib; ] ''; - "syndicate/services/configdirs.pr".text = '' - > - > - ''; + "syndicate/services/configdirs.pr".source = + ./syndicate/services/configdirs.pr; + + "syndicate/services/network.pr".source = pkgs.substituteAll { + src = ./syndicate/services/network.pr; + interfaceMonitor = + "${pkgs.python3Packages.synit-daemons}/bin/interface-monitor"; + ip = "${pkgs.iproute2}/bin/ip"; + udhcpc = "${pkgs.busybox}/bin/udhcpc"; + }; + + "syndicate/services/ntpd.pr".source = pkgs.substituteAll { + src = ./syndicate/services/ntpd.pr; + ntpd = "${pkgs.busybox}/bin/ntpd"; + }; + + "syndicate/services/userSettings.pr".source = pkgs.substituteAll { + src = ./syndicate/services/userSettings.pr; + user-settings-daemon = + "${pkgs.python3Packages.synit-daemons}/bin/user-settings-daemon"; + }; } // (builtins.listToAttrs (map (file: { name = "syndicate/boot/${file}";