Update config and option names for modules

hosts/nixedo/configuration.nix

@@ -8,6 +8,7 @@
   imports = [
     ../common
     ./hardware-configuration.nix
+    ./homelab.nix
     ./modules
     ./secrets.nix
     ./services
@@ -15,31 +16,10 @@
     ../../users/opdavies.nix
   ];
 
-  nixosModules = {
+  features = {
     core.openssh.enable = true;
     cli.podman.enable = true;
     desktop.dconf.enable = true;
-
-    homelab = {
-      enable = true;
-
-      baseDomain = "oliverdavies.uk";
-
-      services = {
-        audiobookshelf.enable = true;
-
-        forgejo = {
-          enable = true;
-
-          cloudflared.tunnelId = "e1514105-327f-4984-974e-e2fbaca76466";
-        };
-
-        immich.enable = true;
-        jellyfin.enable = true;
-        paperless.enable = true;
-        uptime-kuma.enable = true;
-      };
-    };
   };
 
   services.logind.lidSwitchExternalPower = "ignore";

hosts/nixedo/homelab.nix

@@ -0,0 +1,22 @@
+{
+  features.homelab = {
+    enable = true;
+
+    baseDomain = "oliverdavies.uk";
+
+    services = {
+      audiobookshelf.enable = true;
+
+      forgejo = {
+        enable = true;
+
+        cloudflared.tunnelId = "e1514105-327f-4984-974e-e2fbaca76466";
+      };
+
+      immich.enable = true;
+      jellyfin.enable = true;
+      paperless.enable = true;
+      uptime-kuma.enable = true;
+    };
+  };
+}

hosts/nixedo/modules/audiobookshelf.nix

@@ -4,11 +4,11 @@ with lib;
 
 let
   cfg = homelab.services.${service};
-  homelab = config.nixosModules.homelab;
+  homelab = config.features.homelab;
   service = "audiobookshelf";
 in
 {
-  options.nixosModules.homelab.services.${service} = {
+  options.features.homelab.services.${service} = {
     enable = mkEnableOption "Enable ${service}";
 
     url = mkOption {
@@ -26,7 +26,7 @@ in
         useACMEHost = homelab.baseDomain;
 
         locations."/" = {
-          proxyPass = "http://localhost:${toString cfg.port}";
+          proxyPass = "http://localhost:${toString config.services.${service}.port}";
           recommendedProxySettings = true;
         };
       };

hosts/nixedo/modules/default.nix

@@ -3,7 +3,7 @@
 with lib;
 
 {
-  options.nixosModules.homelab = {
+  options.features.homelab = {
     enable = mkEnableOption "Enable homelab services and configuration";
 
     baseDomain = mkOption {

hosts/nixedo/modules/forgejo.nix

@@ -4,11 +4,11 @@ with lib;
 
 let
   cfg = homelab.services.${service};
-  homelab = config.nixosModules.homelab;
+  homelab = config.features.homelab;
   service = "forgejo";
 in
 {
-  options.nixosModules.homelab.services.${service} = {
+  options.features.homelab.services.${service} = {
     enable = mkEnableOption "Enable ${service}";
 
     cloudflared.tunnelId = mkOption {

hosts/nixedo/modules/immich.nix

@@ -9,11 +9,11 @@ with lib;
 
 let
   cfg = homelab.services.${service};
-  homelab = config.nixosModules.homelab;
+  homelab = config.features.homelab;
   service = "immich";
 in
 {
-  options.nixosModules.homelab.services.${service} = {
+  options.features.homelab.services.${service} = {
     enable = mkEnableOption "Enable ${service}";
 
     url = mkOption {

hosts/nixedo/modules/jellyfin.nix

@@ -4,11 +4,11 @@ with lib;
 
 let
   cfg = homelab.services.${service};
-  homelab = config.nixosModules.homelab;
+  homelab = config.features.homelab;
   service = "jellyfin";
 in
 {
-  options.nixosModules.homelab.services.${service} = {
+  options.features.homelab.services.${service} = {
     enable = mkEnableOption "Enable ${service}";
 
     url = mkOption {

hosts/nixedo/modules/paperless.nix

@@ -4,11 +4,11 @@ with lib;
 
 let
   cfg = homelab.services.paperless;
-  homelab = config.nixosModules.homelab;
+  homelab = config.features.homelab;
   service = "paperless";
 in
 {
-  options.nixosModules.homelab.services.${service} = {
+  options.features.homelab.services.${service} = {
     enable = mkEnableOption "Enable ${service}";
 
     url = mkOption {

hosts/nixedo/services/homepage/default.nix

@@ -9,12 +9,12 @@ with lib;
 
 let
   cfg = homelab.services.${service};
-  homelab = config.homelab;
+  homelab = config.features.homelab;
   opts = options.services.${service};
   service = "homepage-dashboard";
 in
 {
-  options.homelab.services.${service} = {
+  options.features.homelab.services.${service} = {
     enable = mkEnableOption "Enable ${service}";
 
     port = mkOption {

hosts/nixedo/services/uptime-kuma.nix

@@ -4,11 +4,11 @@ with lib;
 
 let
   cfg = homelab.services.${service};
-  homelab = config.nixosModules.homelab;
+  homelab = config.features.homelab;
   service = "uptime-kuma";
 in
 {
-  options.nixosModules.homelab.services.${service} = {
+  options.features.homelab.services.${service} = {
     enable = mkEnableOption "Enable ${service}";
 
     url = mkOption {