Move all nixos-modules to options.qois

nixos-configurations/calanda/networking.nix

@@ -32,7 +32,7 @@ in
   qois.backplane-net.enable = true;
 
   # TODO: Metaize ips
-  services.qois.router = {
+  qois.router = {
     enable = true;
     wanInterface = "enp4s0";
     wirelessInterfaces = [ "wlp5s0" ];

nixos-configurations/cyprianspitz/networking.nix

@@ -73,7 +73,7 @@ in
   };
 
   # Boot
-  services.qois.luks-ssh = {
+  qois.luks-ssh = {
     enable = true;
     interface = "eth0";
 

nixos-configurations/lindberg/networking.nix

@@ -73,7 +73,7 @@ in
   # Boot
   boot.initrd.network.udhcpc.enable = true;
 
-  services.qois.luks-ssh = {
+  qois.luks-ssh = {
     enable = true;
     interface = "eth0";
     sshPort = 2222;

nixos-configurations/stompert/default.nix

@@ -35,7 +35,7 @@
   # Define on which hard drive you want to install Grub.
   boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
 
-  services.qois.luks-ssh = {
+  qois.luks-ssh = {
     enable = true;
     interface = "eth1";
     sshPort = 2222;

nixos-modules/luks-ssh/default.nix

@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.services.qois.luks-ssh;
+  cfg = config.qois.luks-ssh;
 in
 {
-  options.services.qois.luks-ssh = {
+  options.qois.luks-ssh = {
     enable = mkEnableOption "luks-ssh service";
 
     interface = mkOption {

nixos-modules/router-dhcp/default.nix

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

nixos-modules/router-dns/default.nix

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

nixos-modules/router-wireless-ap/default.nix

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

nixos-modules/router/default.nix

@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.services.qois.router;
+  cfg = config.qois.router;
 in
 {
-  options.services.qois.router = {
+  options.qois.router = {
     enable = mkEnableOption "router service";
 
     wanInterface = mkOption {
@@ -51,7 +51,7 @@ in
       type = types.str;
       example = "192.168.0.1";
       description = ''
-        Internal IP of router. 
+        Internal IP of router.
       '';
     };
 

nixos-modules/wwan/default.nix

@@ -10,7 +10,7 @@
 with lib;
 
 let
-  cfg = config.services.qois.wwan;
+  cfg = config.qois.wwan;
 
   mbim-ip-configured = pkgs.writeScriptBin "mbim-ip-configured" (
     ''
@@ -34,7 +34,7 @@ let
   '';
 in
 {
-  options.services.qois.wwan = {
+  options.qois.wwan = {
     enable = mkEnableOption "wwan client service";
 
     apn = mkOption {