Move modules to qois namespace

host/bachtel.nix

@@ -15,13 +15,13 @@
   swapDevices =
     [{ device = "/dev/disk/by-uuid/73f91e99-d856-4504-b6b2-d60f855d6d95"; }];
 
-  services.wwan = {
+  services.qois.wwan = {
     enable = true;
     apn = "gprs.swisscom.ch";
     networkInterface = "wwp0s19u1u3i12";
   };
 
-  services.router = {
+  services.qois.router = {
     enable = true;
     wanInterface = "wwp0s19u1u3i12";
     wirelessInterfaces = [ "wlp5s0" ];

host/calanda.nix

@@ -16,7 +16,7 @@
   swapDevices =
     [{ device = "/dev/disk/by-uuid/b5104a7c-4a4a-4048-a9f8-44ddb0082632"; }];
 
-  services.router = {
+  services.qois.router = {
     enable = true;
     wanInterface = "enp4s0";
     wirelessInterfaces = [ "wlp5s0" ];

host/etzel.nix

@@ -28,7 +28,7 @@
     mandatoryFeatures = [ ];
   }];
 
-  services.router = {
+  services.qois.router = {
     enable = true;
     wanInterface = "enp2s0";
     #wirelessInterfaces = [ "wlp4s0" "wlp6s0" ];

modules/router-dhcp/default.nix

@@ -3,10 +3,10 @@
 with lib;
 
 let
-  routerCfg = config.services.router;
+  routerCfg = config.services.qois.router;
-  cfg = config.services.router.dhcp;
+  cfg = config.services.qois.router.dhcp;
 in {
-  options.services.router.dhcp = {
+  options.services.qois.router.dhcp = {
     enable = mkEnableOption "router dhcp service";
 
     localDomain = mkOption {

modules/router-dns/default.nix

@@ -3,11 +3,11 @@
 with lib;
 
 let
-  routerCfg = config.services.router;
+  routerCfg = config.services.qois.router;
-  dhcpCfg = config.services.router.dhcp;
+  dhcpCfg = config.services.qois.router.dhcp;
-  cfg = config.services.router.recursiveDns;
+  cfg = config.services.qois.router.recursiveDns;
 in {
-  options.services.router.recursiveDns = {
+  options.services.qois.router.recursiveDns = {
     enable = mkEnableOption "router recursive dns service";
 
     networkIdIp = mkOption {

modules/router-wireless-ap/default.nix

@@ -3,10 +3,10 @@
 with lib;
 
 let
-  routerCfg = config.services.router;
+  routerCfg = config.services.qois.router;
-  cfg = config.services.router.wireless;
+  cfg = config.services.qois.router.wireless;
 in {
-  options.services.router.wireless = {
+  options.services.qois.router.wireless = {
     enable = mkEnableOption "router wireless service";
 
     wleInterface24Ghz = mkOption {

modules/router/default.nix

@@ -2,9 +2,9 @@
 
 with lib;
 
-let cfg = config.services.router;
+let cfg = config.services.qois.router;
 in {
-  options.services.router = {
+  options.services.qois.router = {
     enable = mkEnableOption "router service";
 
     wanInterface = mkOption {

modules/wwan/default.nix

@@ -5,7 +5,7 @@
 with lib;
 
 let
-  cfg = config.services.wwan;
+  cfg = config.services.qois.wwan;
 
   mbim-ip-configured = pkgs.writeScriptBin "mbim-ip-configured" (''
     #!${pkgs.stdenv.shell}
@@ -25,7 +25,7 @@ let
     fi
   '';
 in {
-  options.services.wwan = {
+  options.services.qois.wwan = {
     enable = mkEnableOption "wwan client service";
 
     apn = mkOption {