From 03907d416d9cb11c799129d1e52d2496651d8837 Mon Sep 17 00:00:00 2001
From: Fabian <fabian@fh2.ch>
Date: Sat, 28 Nov 2020 22:45:24 +0000
Subject: [PATCH] Move modules to qois namespace

---
 host/bachtel.nix                       | 4 ++--
 host/calanda.nix                       | 2 +-
 host/etzel.nix                         | 2 +-
 modules/router-dhcp/default.nix        | 6 +++---
 modules/router-dns/default.nix         | 8 ++++----
 modules/router-wireless-ap/default.nix | 6 +++---
 modules/router/default.nix             | 4 ++--
 modules/wwan/default.nix               | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/host/bachtel.nix b/host/bachtel.nix
index 24b529f..78dfd1f 100644
--- a/host/bachtel.nix
+++ b/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" ];
diff --git a/host/calanda.nix b/host/calanda.nix
index 6e52c5f..5156cd3 100644
--- a/host/calanda.nix
+++ b/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" ];
diff --git a/host/etzel.nix b/host/etzel.nix
index 6194c7e..ef86cc3 100644
--- a/host/etzel.nix
+++ b/host/etzel.nix
@@ -28,7 +28,7 @@
     mandatoryFeatures = [ ];
   }];
 
-  services.router = {
+  services.qois.router = {
     enable = true;
     wanInterface = "enp2s0";
     #wirelessInterfaces = [ "wlp4s0" "wlp6s0" ];
diff --git a/modules/router-dhcp/default.nix b/modules/router-dhcp/default.nix
index ad43061..db134ad 100644
--- a/modules/router-dhcp/default.nix
+++ b/modules/router-dhcp/default.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  routerCfg = config.services.router;
-  cfg = config.services.router.dhcp;
+  routerCfg = config.services.qois.router;
+  cfg = config.services.qois.router.dhcp;
 in {
-  options.services.router.dhcp = {
+  options.services.qois.router.dhcp = {
     enable = mkEnableOption "router dhcp service";
 
     localDomain = mkOption {
diff --git a/modules/router-dns/default.nix b/modules/router-dns/default.nix
index e87ceab..9ab1f22 100644
--- a/modules/router-dns/default.nix
+++ b/modules/router-dns/default.nix
@@ -3,11 +3,11 @@
 with lib;
 
 let
-  routerCfg = config.services.router;
-  dhcpCfg = config.services.router.dhcp;
-  cfg = config.services.router.recursiveDns;
+  routerCfg = config.services.qois.router;
+  dhcpCfg = config.services.qois.router.dhcp;
+  cfg = config.services.qois.router.recursiveDns;
 in {
-  options.services.router.recursiveDns = {
+  options.services.qois.router.recursiveDns = {
     enable = mkEnableOption "router recursive dns service";
 
     networkIdIp = mkOption {
diff --git a/modules/router-wireless-ap/default.nix b/modules/router-wireless-ap/default.nix
index c9720d2..f4ededd 100644
--- a/modules/router-wireless-ap/default.nix
+++ b/modules/router-wireless-ap/default.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  routerCfg = config.services.router;
-  cfg = config.services.router.wireless;
+  routerCfg = config.services.qois.router;
+  cfg = config.services.qois.router.wireless;
 in {
-  options.services.router.wireless = {
+  options.services.qois.router.wireless = {
     enable = mkEnableOption "router wireless service";
 
     wleInterface24Ghz = mkOption {
diff --git a/modules/router/default.nix b/modules/router/default.nix
index 4c0404d..505deb5 100644
--- a/modules/router/default.nix
+++ b/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 {
diff --git a/modules/wwan/default.nix b/modules/wwan/default.nix
index 71899ab..d80334d 100644
--- a/modules/wwan/default.nix
+++ b/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 {