diff --git a/examples/rotuer.nix b/examples/rotuer.nix index 6b3abbe9..2edabe9f 100644 --- a/examples/rotuer.nix +++ b/examples/rotuer.nix @@ -201,27 +201,6 @@ in rec { dependencies = [ services.dhcp6 ]; }; - services.default = target { - name = "default"; - contents = with config.services; [ - config.hardware.networkInterfaces.lo - int - bridge - hostap - hostap5 - ntp - defaultroute4 - defaultroute6 - packet_forwarding - dns - resolvconf - sshd - config.services.hostname - dhcp6 - acquire-lan-prefix - acquire-wan-address - ]; - }; defaultProfile.packages = with pkgs; [ min-collect-garbage ]; diff --git a/modules/s6/default.nix b/modules/s6/default.nix index c62b5102..46d88d0a 100644 --- a/modules/s6/default.nix +++ b/modules/s6/default.nix @@ -7,10 +7,21 @@ let s6-linux-init stdenvNoCC; inherit (pkgs.pseudofile) dir symlink; + inherit (pkgs.liminix.services) bundle; - s6-rc-db = pkgs.s6-rc-database.override { - services = builtins.attrValues config.services; - }; + s6-rc-db = + let + defaultDefaultTarget = bundle { + name = "default"; + contents = builtins.attrValues config.services; + }; + servicesAttrs = { + default = defaultDefaultTarget; + } // config.services; + in + pkgs.s6-rc-database.override { + services = builtins.attrValues servicesAttrs; + }; s6-init-scripts = stdenvNoCC.mkDerivation { name = "s6-scripts"; src = ./scripts;