move pppoe service derivation into ppp module dir

modules/ppp/default.nix

@@ -8,7 +8,7 @@ in {
     };
   };
   config = {
-    system.service.pppoe = pkgs.liminix.networking.pppoe;
+    system.service.pppoe = pkgs.callPackage ./pppoe.nix {};
     kernel = {
       config = {
         PPP = "y";

modules/ppp/pppoe.nix

@@ -9,9 +9,8 @@
 let
   inherit (liminix.services) longrun;
   inherit (liminix.lib) typeChecked;
-  inherit (lib)
-    mergeDefinitions
-    mkEnableOption mkOption isType types isDerivation hasAttr;
+  inherit (lib) mkOption types;
+
   t = {
     interface = mkOption {
       type = liminix.lib.types.service;
@@ -19,12 +18,13 @@ let
     };
     ppp-options = mkOption {
       type = types.listOf types.str;
+      description = "options supplied on ppp command line";
     };
   };
 in
 params:
 let
-  inherit (typeChecked "pppoe.nix" t params) ppp-options interface;
+  inherit (typeChecked "pppoe.nix" t params) interface ppp-options;
   name = "${interface.device}.pppoe";
   ip-up = writeAshScript "ip-up" {} ''
     . ${serviceFns} 

pkgs/liminix-tools/networking/default.nix

@@ -42,7 +42,6 @@ in {
     name = "${interface.device}.odhcp";
     run = "odhcpcd ${interface.device}";
   };
-  pppoe = callPackage ./pppoe.nix {};
   dnsmasq = callPackage ./dnsmasq.nix {};
   hostapd = callPackage ./hostapd.nix {};
   route = { name, target, via, dependencies, dev ? null }: