diff --git a/home/opdavies/PW05CH3L.nix b/home/opdavies/PW05CH3L.nix
index c4d568b0..44720f29 100644
--- a/home/opdavies/PW05CH3L.nix
+++ b/home/opdavies/PW05CH3L.nix
@@ -3,7 +3,7 @@
 {
   imports = [ ../common ];
 
-  homeManagerModules = {
+  features = {
     cli = {
       direnv.enable = true;
       fzf.enable = true;
@@ -28,7 +28,7 @@
 
             repos = extraConfig.XDG_REPOS_DIR;
           in
-          options.homeManagerModules.cli.tmux-sessionizer.directories.default
+          options.features.cli.tmux-sessionizer.directories.default
           ++ [
             repos
             "${repos}/*"
diff --git a/home/opdavies/lemp11.nix b/home/opdavies/lemp11.nix
index 5eff15a1..1917a2db 100644
--- a/home/opdavies/lemp11.nix
+++ b/home/opdavies/lemp11.nix
@@ -1,7 +1,7 @@
 {
   imports = [ ../common ];
 
-  homeManagerModules = {
+  features = {
     cli.zsh.enable = true;
 
     desktop.media = {
diff --git a/home/opdavies/nixedo.nix b/home/opdavies/nixedo.nix
index f53a457f..51ddf98a 100644
--- a/home/opdavies/nixedo.nix
+++ b/home/opdavies/nixedo.nix
@@ -1,7 +1,7 @@
 {
   imports = [ ../common ];
 
-  homeManagerModules = {
+  features = {
     cli = {
       fzf.enable = true;
       starship.enable = true;
diff --git a/home/opdavies/t480.nix b/home/opdavies/t480.nix
index 005a4797..c3fb435c 100644
--- a/home/opdavies/t480.nix
+++ b/home/opdavies/t480.nix
@@ -3,7 +3,7 @@
 {
   imports = [ ../common ];
 
-  homeManagerModules = {
+  features = {
     cli = {
       bluetuith.enable = true;
       direnv.enable = true;
@@ -30,7 +30,7 @@
 
             repos = extraConfig.XDG_REPOS_DIR;
           in
-          options.homeManagerModules.cli.tmux-sessionizer.directories.default
+          options.features.cli.tmux-sessionizer.directories.default
           ++ [
             repos
             "${repos}/*"
diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix
index b70e391f..ac37da82 100644
--- a/hosts/PW05CH3L/configuration.nix
+++ b/hosts/PW05CH3L/configuration.nix
@@ -7,7 +7,7 @@
     ./modules/wiki.nix
   ];
 
-  nixosModules = {
+  features = {
     cli = {
       docker.enable = true;
       password-store.enable = true;
diff --git a/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix
index 09226cce..b12683f7 100644
--- a/hosts/lemp11/configuration.nix
+++ b/hosts/lemp11/configuration.nix
@@ -11,7 +11,7 @@
     ../../users/eric.nix
   ];
 
-  nixosModules = {
+  features = {
     core = {
       bluetooth.enable = true;
       zram.enable = true;
diff --git a/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix
index 2e734bdf..349e0c7c 100644
--- a/hosts/nixedo/configuration.nix
+++ b/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";
diff --git a/hosts/nixedo/homelab.nix b/hosts/nixedo/homelab.nix
new file mode 100644
index 00000000..5dcd6ab8
--- /dev/null
+++ b/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;
+    };
+  };
+}
diff --git a/hosts/nixedo/modules/audiobookshelf.nix b/hosts/nixedo/modules/audiobookshelf.nix
index a5a6827d..2a88a638 100644
--- a/hosts/nixedo/modules/audiobookshelf.nix
+++ b/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;
         };
       };
diff --git a/hosts/nixedo/modules/default.nix b/hosts/nixedo/modules/default.nix
index 8f0dae44..2211cebd 100644
--- a/hosts/nixedo/modules/default.nix
+++ b/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 {
diff --git a/hosts/nixedo/modules/forgejo.nix b/hosts/nixedo/modules/forgejo.nix
index f1c117dd..b2c39e22 100644
--- a/hosts/nixedo/modules/forgejo.nix
+++ b/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 {
diff --git a/hosts/nixedo/modules/immich.nix b/hosts/nixedo/modules/immich.nix
index 1243efd7..f6e66b25 100644
--- a/hosts/nixedo/modules/immich.nix
+++ b/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 {
diff --git a/hosts/nixedo/modules/jellyfin.nix b/hosts/nixedo/modules/jellyfin.nix
index 74d482c3..2f21da3e 100644
--- a/hosts/nixedo/modules/jellyfin.nix
+++ b/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 {
diff --git a/hosts/nixedo/modules/paperless.nix b/hosts/nixedo/modules/paperless.nix
index ee82ea1a..fd048246 100644
--- a/hosts/nixedo/modules/paperless.nix
+++ b/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 {
diff --git a/hosts/nixedo/services/homepage/default.nix b/hosts/nixedo/services/homepage/default.nix
index e70475c6..2b6a3a78 100644
--- a/hosts/nixedo/services/homepage/default.nix
+++ b/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 {
diff --git a/hosts/nixedo/services/uptime-kuma.nix b/hosts/nixedo/services/uptime-kuma.nix
index 49403794..01f7fe1a 100644
--- a/hosts/nixedo/services/uptime-kuma.nix
+++ b/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 {
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index abe55209..19f452bd 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -12,7 +12,7 @@
     ../../users/opdavies.nix
   ];
 
-  nixosModules = {
+  features = {
     cli.password-store = {
       enable = true;
 
diff --git a/hosts/t490/configuration.nix b/hosts/t490/configuration.nix
index 5397654d..e9ba6f63 100644
--- a/hosts/t490/configuration.nix
+++ b/hosts/t490/configuration.nix
@@ -13,7 +13,7 @@
     ../../users/opdavies.nix
   ];
 
-  nixosModules = {
+  features = {
     core = {
       bluetooth.enable = true;
       zram.enable = true;
diff --git a/hosts/t490/services/redshift.nix b/hosts/t490/services/redshift.nix
index 3fcfdf4f..2bd9d4a1 100644
--- a/hosts/t490/services/redshift.nix
+++ b/hosts/t490/services/redshift.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.redshift;
+  cfg = config.features.redshift;
 in
 {
-  options.nixosModules.redshift.enable = mkEnableOption "Enable redshift";
+  options.features.redshift.enable = mkEnableOption "Enable redshift";
 
   config = mkIf cfg.enable {
     location = {
diff --git a/modules/home-manager/cli/bluetuith.nix b/modules/home-manager/cli/bluetuith.nix
index f07399d0..fff34766 100644
--- a/modules/home-manager/cli/bluetuith.nix
+++ b/modules/home-manager/cli/bluetuith.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.cli.bluetuith;
+  cfg = config.features.cli.bluetuith;
 in
 {
-  options.homeManagerModules.cli.bluetuith.enable = mkEnableOption "Enable bluetuith";
+  options.features.cli.bluetuith.enable = mkEnableOption "Enable bluetuith";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home-manager/cli/direnv.nix b/modules/home-manager/cli/direnv.nix
index cc8d0988..7c8d924b 100644
--- a/modules/home-manager/cli/direnv.nix
+++ b/modules/home-manager/cli/direnv.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.cli.direnv;
+  cfg = config.features.cli.direnv;
 in
 {
-  options.homeManagerModules.cli.direnv.enable = mkEnableOption "Enable direnv";
+  options.features.cli.direnv.enable = mkEnableOption "Enable direnv";
 
   config = mkIf cfg.enable {
     programs.direnv = {
diff --git a/modules/home-manager/cli/fzf.nix b/modules/home-manager/cli/fzf.nix
index 9e61d277..aae36ec1 100644
--- a/modules/home-manager/cli/fzf.nix
+++ b/modules/home-manager/cli/fzf.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.cli.fzf;
+  cfg = config.features.cli.fzf;
 in
 {
-  options.homeManagerModules.cli.fzf.enable = mkEnableOption "Enable fzf";
+  options.features.cli.fzf.enable = mkEnableOption "Enable fzf";
 
   config = mkIf cfg.enable {
     programs.fzf = {
diff --git a/modules/home-manager/cli/git.nix b/modules/home-manager/cli/git.nix
index 76292a73..5c678b0d 100644
--- a/modules/home-manager/cli/git.nix
+++ b/modules/home-manager/cli/git.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.cli.git;
+  cfg = config.features.cli.git;
 in
 {
-  options.homeManagerModules.cli.git = {
+  options.features.cli.git = {
     enable = mkEnableOption "Enable git";
 
     user = mkOption {
diff --git a/modules/home-manager/cli/node.nix b/modules/home-manager/cli/node.nix
index 443719da..fba772c1 100644
--- a/modules/home-manager/cli/node.nix
+++ b/modules/home-manager/cli/node.nix
@@ -3,12 +3,12 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.cli.node;
+  cfg = config.features.cli.node;
 
   inherit (config.xdg) configHome dataHome stateHome;
 in
 {
-  options.homeManagerModules.cli.node.enable = mkEnableOption "Enable node";
+  options.features.cli.node.enable = mkEnableOption "Enable node";
 
   config = mkIf cfg.enable {
     xdg.configFile."${config.home.sessionVariables.NPM_CONFIG_USERCONFIG}".text = ''
diff --git a/modules/home-manager/cli/notes.nix b/modules/home-manager/cli/notes.nix
index 1125daab..686e2e09 100644
--- a/modules/home-manager/cli/notes.nix
+++ b/modules/home-manager/cli/notes.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.cli.notes;
+  cfg = config.features.cli.notes;
 in
 {
-  options.homeManagerModules.cli.notes.enable = mkEnableOption "Enable notes";
+  options.features.cli.notes.enable = mkEnableOption "Enable notes";
 
   config = mkIf cfg.enable {
     xdg = {
diff --git a/modules/home-manager/cli/ranger.nix b/modules/home-manager/cli/ranger.nix
index 0b3d1a59..8fdc10cb 100644
--- a/modules/home-manager/cli/ranger.nix
+++ b/modules/home-manager/cli/ranger.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.cli.ranger;
+  cfg = config.features.cli.ranger;
 in
 {
-  options.homeManagerModules.cli.ranger.enable = mkEnableOption "Enable ranger";
+  options.features.cli.ranger.enable = mkEnableOption "Enable ranger";
 
   config = mkIf cfg.enable {
     programs.ranger.enable = true;
diff --git a/modules/home-manager/cli/starship.nix b/modules/home-manager/cli/starship.nix
index da07eaf7..57cc4f6d 100644
--- a/modules/home-manager/cli/starship.nix
+++ b/modules/home-manager/cli/starship.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.cli.starship;
+  cfg = config.features.cli.starship;
 in
 {
-  options.homeManagerModules.cli.starship.enable = mkEnableOption "Enable starship";
+  options.features.cli.starship.enable = mkEnableOption "Enable starship";
 
   config = mkIf cfg.enable {
     programs.starship =
diff --git a/modules/home-manager/cli/tmux-sessionizer.nix b/modules/home-manager/cli/tmux-sessionizer.nix
index 25748f45..5d945da3 100644
--- a/modules/home-manager/cli/tmux-sessionizer.nix
+++ b/modules/home-manager/cli/tmux-sessionizer.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.cli.tmux-sessionizer;
+  cfg = config.features.cli.tmux-sessionizer;
 in
 {
-  options.homeManagerModules.cli.tmux-sessionizer = {
+  options.features.cli.tmux-sessionizer = {
     enable = mkEnableOption "Enable tmux-sessionizer";
 
     directories = mkOption {
diff --git a/modules/home-manager/cli/tmux.nix b/modules/home-manager/cli/tmux.nix
index d535e977..4ecf7d10 100644
--- a/modules/home-manager/cli/tmux.nix
+++ b/modules/home-manager/cli/tmux.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.cli.tmux;
+  cfg = config.features.cli.tmux;
 in
 {
-  options.homeManagerModules.cli.tmux.enable = mkEnableOption "Enable tmux";
+  options.features.cli.tmux.enable = mkEnableOption "Enable tmux";
 
   config = mkIf cfg.enable {
     programs.tmux = {
diff --git a/modules/home-manager/cli/zsh/default.nix b/modules/home-manager/cli/zsh/default.nix
index 92ffe198..ab60177c 100644
--- a/modules/home-manager/cli/zsh/default.nix
+++ b/modules/home-manager/cli/zsh/default.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.cli.zsh;
+  cfg = config.features.cli.zsh;
 in
 {
-  options.homeManagerModules.cli.zsh.enable = mkEnableOption "Enable zsh";
+  options.features.cli.zsh.enable = mkEnableOption "Enable zsh";
 
   config = mkIf cfg.enable {
     programs.zsh = {
diff --git a/modules/home-manager/coding/neovim/default.nix b/modules/home-manager/coding/neovim/default.nix
index ab3b1a1e..bd0b5b4c 100644
--- a/modules/home-manager/coding/neovim/default.nix
+++ b/modules/home-manager/coding/neovim/default.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.coding.neovim;
+  cfg = config.features.coding.neovim;
 in
 {
-  options.homeManagerModules.coding.neovim.enable = mkEnableOption "Enable neovim";
+  options.features.coding.neovim.enable = mkEnableOption "Enable neovim";
 
   config = mkIf cfg.enable {
     programs.neovim =
diff --git a/modules/home-manager/coding/phpactor/default.nix b/modules/home-manager/coding/phpactor/default.nix
index 0b6063cc..32eea21d 100644
--- a/modules/home-manager/coding/phpactor/default.nix
+++ b/modules/home-manager/coding/phpactor/default.nix
@@ -6,10 +6,10 @@
 }:
 
 let
-  cfg = config.homeManagerModules.coding.phpactor;
+  cfg = config.features.coding.phpactor;
 in
 {
-  options.homeManagerModules.coding.phpactor.enable = lib.mkEnableOption "Enable phpactor";
+  options.features.coding.phpactor.enable = lib.mkEnableOption "Enable phpactor";
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home-manager/desktop/browsers/firefox.nix b/modules/home-manager/desktop/browsers/firefox.nix
index dc3b2d1c..dbee93d6 100644
--- a/modules/home-manager/desktop/browsers/firefox.nix
+++ b/modules/home-manager/desktop/browsers/firefox.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.desktop.browsers.firefox;
+  cfg = config.features.desktop.browsers.firefox;
 in
 {
-  options.homeManagerModules.desktop.browsers.firefox = {
+  options.features.desktop.browsers.firefox = {
     enable = mkEnableOption "Enable firefox";
 
     homepageUrl = mkOption {
diff --git a/modules/home-manager/desktop/browsers/qutebrowser.nix b/modules/home-manager/desktop/browsers/qutebrowser.nix
index 9ca0631d..ff115fe7 100644
--- a/modules/home-manager/desktop/browsers/qutebrowser.nix
+++ b/modules/home-manager/desktop/browsers/qutebrowser.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.desktop.browsers.qutebrowser;
+  cfg = config.features.desktop.browsers.qutebrowser;
 in
 {
-  options.homeManagerModules.desktop.browsers.qutebrowser.enable =
+  options.features.desktop.browsers.qutebrowser.enable =
     mkEnableOption "Enable qutebrowser";
 
   config = mkIf cfg.enable {
diff --git a/modules/home-manager/desktop/flameshot.nix b/modules/home-manager/desktop/flameshot.nix
index 6e41de30..bf0ba018 100644
--- a/modules/home-manager/desktop/flameshot.nix
+++ b/modules/home-manager/desktop/flameshot.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.desktop.flameshot;
+  cfg = config.features.desktop.flameshot;
 in
 {
-  options.homeManagerModules.desktop.flameshot.enable = mkEnableOption "Enable flameshot";
+  options.features.desktop.flameshot.enable = mkEnableOption "Enable flameshot";
 
   config = mkIf cfg.enable {
     services.flameshot = {
diff --git a/modules/home-manager/desktop/gtk.nix b/modules/home-manager/desktop/gtk.nix
index f888d894..3f737bc7 100644
--- a/modules/home-manager/desktop/gtk.nix
+++ b/modules/home-manager/desktop/gtk.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.desktop.gtk;
+  cfg = config.features.desktop.gtk;
 in
 {
-  options.homeManagerModules.desktop.gtk.enable = mkEnableOption "Enable gtk";
+  options.features.desktop.gtk.enable = mkEnableOption "Enable gtk";
 
   config = mkIf cfg.enable {
     gtk = with pkgs; {
diff --git a/modules/home-manager/desktop/media/handbrake.nix b/modules/home-manager/desktop/media/handbrake.nix
index 2f5929a7..e9e0c65b 100644
--- a/modules/home-manager/desktop/media/handbrake.nix
+++ b/modules/home-manager/desktop/media/handbrake.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.desktop.media.handbrake;
+  cfg = config.features.desktop.media.handbrake;
 in
 {
-  options.homeManagerModules.desktop.media.handbrake.enable = mkEnableOption "Enable handbrake";
+  options.features.desktop.media.handbrake.enable = mkEnableOption "Enable handbrake";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home-manager/desktop/media/makemkv.nix b/modules/home-manager/desktop/media/makemkv.nix
index 1bb55102..01ee6c04 100644
--- a/modules/home-manager/desktop/media/makemkv.nix
+++ b/modules/home-manager/desktop/media/makemkv.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.desktop.media.makemkv;
+  cfg = config.features.desktop.media.makemkv;
 in
 {
-  options.homeManagerModules.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv";
+  options.features.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home-manager/desktop/media/mpv.nix b/modules/home-manager/desktop/media/mpv.nix
index 25efa494..1da587e7 100644
--- a/modules/home-manager/desktop/media/mpv.nix
+++ b/modules/home-manager/desktop/media/mpv.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.desktop.media.mpv;
+  cfg = config.features.desktop.media.mpv;
 in
 {
-  options.homeManagerModules.desktop.media.mpv.enable = mkEnableOption "Enable mpv";
+  options.features.desktop.media.mpv.enable = mkEnableOption "Enable mpv";
 
   config = mkIf cfg.enable {
     programs.mpv = {
diff --git a/modules/nixos/cli/docker.nix b/modules/nixos/cli/docker.nix
index e73fd3c7..916a7cae 100644
--- a/modules/nixos/cli/docker.nix
+++ b/modules/nixos/cli/docker.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.cli.docker;
+  cfg = config.features.cli.docker;
 in
 {
-  options.nixosModules.cli.docker.enable = mkEnableOption "Enable docker";
+  options.features.cli.docker.enable = mkEnableOption "Enable docker";
 
   config = mkIf cfg.enable {
     virtualisation = {
diff --git a/modules/nixos/cli/password-store.nix b/modules/nixos/cli/password-store.nix
index 97f3a494..61331aee 100644
--- a/modules/nixos/cli/password-store.nix
+++ b/modules/nixos/cli/password-store.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.cli.password-store;
+  cfg = config.features.cli.password-store;
 in
 {
-  options.nixosModules.cli.password-store = {
+  options.features.cli.password-store = {
     enable = mkEnableOption "Enable pass";
 
     extensions = mkOption {
diff --git a/modules/nixos/cli/podman.nix b/modules/nixos/cli/podman.nix
index 5c325e2d..edda7492 100644
--- a/modules/nixos/cli/podman.nix
+++ b/modules/nixos/cli/podman.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.cli.podman;
+  cfg = config.features.cli.podman;
 in
 {
-  options.nixosModules.cli.podman.enable = mkEnableOption "Enable podman";
+  options.features.cli.podman.enable = mkEnableOption "Enable podman";
 
   config = mkIf cfg.enable {
     virtualisation = {
diff --git a/modules/nixos/core/bluetooth.nix b/modules/nixos/core/bluetooth.nix
index f53229cf..dbf51398 100644
--- a/modules/nixos/core/bluetooth.nix
+++ b/modules/nixos/core/bluetooth.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.core.bluetooth;
+  cfg = config.features.core.bluetooth;
 in
 {
-  options.nixosModules.core.bluetooth.enable = mkEnableOption "Enable bluetooth";
+  options.features.core.bluetooth.enable = mkEnableOption "Enable bluetooth";
 
   config = mkIf cfg.enable {
     hardware.bluetooth.enable = true;
diff --git a/modules/nixos/core/openssh.nix b/modules/nixos/core/openssh.nix
index 2f5ca9a0..3d09487e 100644
--- a/modules/nixos/core/openssh.nix
+++ b/modules/nixos/core/openssh.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.core.openssh;
+  cfg = config.features.core.openssh;
 in
 {
-  options.nixosModules.core.openssh.enable = mkEnableOption "Enable openssh";
+  options.features.core.openssh.enable = mkEnableOption "Enable openssh";
 
   config = mkIf cfg.enable {
     services.openssh = {
diff --git a/modules/nixos/core/pipewire.nix b/modules/nixos/core/pipewire.nix
index e4d18cae..557846bd 100644
--- a/modules/nixos/core/pipewire.nix
+++ b/modules/nixos/core/pipewire.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.core.pipewire;
+  cfg = config.features.core.pipewire;
 in
 {
-  options.nixosModules.core.pipewire.enable = mkEnableOption "Enable pipewire";
+  options.features.core.pipewire.enable = mkEnableOption "Enable pipewire";
 
   config = mkIf cfg.enable {
     services.pipewire = {
diff --git a/modules/nixos/core/xbanish.nix b/modules/nixos/core/xbanish.nix
index 282211ac..723eeff9 100644
--- a/modules/nixos/core/xbanish.nix
+++ b/modules/nixos/core/xbanish.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.core.xbanish;
+  cfg = config.features.core.xbanish;
 in
 {
-  options.nixosModules.core.xbanish.enable = mkEnableOption "Enable xbanish";
+  options.features.core.xbanish.enable = mkEnableOption "Enable xbanish";
 
   config = mkIf cfg.enable {
     services.xbanish.enable = true;
diff --git a/modules/nixos/core/zram.nix b/modules/nixos/core/zram.nix
index 2ae366eb..a0d0046a 100644
--- a/modules/nixos/core/zram.nix
+++ b/modules/nixos/core/zram.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.core.zram;
+  cfg = config.features.core.zram;
 in
 {
-  options.nixosModules.core.zram.enable = mkEnableOption "Enable zram";
+  options.features.core.zram.enable = mkEnableOption "Enable zram";
 
   config = mkIf cfg.enable {
     zramSwap = {
diff --git a/modules/nixos/desktop/dconf.nix b/modules/nixos/desktop/dconf.nix
index 49f76115..eebbfa2c 100644
--- a/modules/nixos/desktop/dconf.nix
+++ b/modules/nixos/desktop/dconf.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.desktop.dconf;
+  cfg = config.features.desktop.dconf;
 in
 {
-  options.nixosModules.desktop.dconf.enable = mkEnableOption "Enable dconf";
+  options.features.desktop.dconf.enable = mkEnableOption "Enable dconf";
 
   config = mkIf cfg.enable {
     programs.dconf.enable = true;
diff --git a/modules/nixos/desktop/dwm/default.nix b/modules/nixos/desktop/dwm/default.nix
index bf082ca7..2f9f4a40 100644
--- a/modules/nixos/desktop/dwm/default.nix
+++ b/modules/nixos/desktop/dwm/default.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.desktop.dwm;
+  cfg = config.features.desktop.dwm;
 in
 {
-  options.nixosModules.desktop.dwm.enable = mkEnableOption "Enable dwm";
+  options.features.desktop.dwm.enable = mkEnableOption "Enable dwm";
 
   config = mkIf cfg.enable {
     services = {
diff --git a/modules/nixos/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix
index ea2ca3f2..371b2fe1 100644
--- a/modules/nixos/desktop/fonts.nix
+++ b/modules/nixos/desktop/fonts.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.desktop.fonts;
+  cfg = config.features.desktop.fonts;
 in
 {
-  options.nixosModules.desktop.fonts.enable = mkEnableOption "Enable fonts";
+  options.features.desktop.fonts.enable = mkEnableOption "Enable fonts";
 
   config = mkIf cfg.enable {
     fonts = {
diff --git a/modules/nixos/desktop/media/makemkv.nix b/modules/nixos/desktop/media/makemkv.nix
index 4a889934..a8560a50 100644
--- a/modules/nixos/desktop/media/makemkv.nix
+++ b/modules/nixos/desktop/media/makemkv.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.desktop.media.makemkv;
+  cfg = config.features.desktop.media.makemkv;
 in
 {
-  options.nixosModules.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv";
+  options.features.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv";
 
   config = mkIf cfg.enable {
     boot.kernelModules = [ "sg" ];
diff --git a/modules/nixos/desktop/st.nix b/modules/nixos/desktop/st.nix
index 78dc3059..00e9b6e4 100644
--- a/modules/nixos/desktop/st.nix
+++ b/modules/nixos/desktop/st.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.desktop.st;
+  cfg = config.features.desktop.st;
 in
 {
-  options.nixosModules.desktop.st.enable = mkEnableOption "Enable st";
+  options.features.desktop.st.enable = mkEnableOption "Enable st";
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
diff --git a/modules/nixos/desktop/thunar.nix b/modules/nixos/desktop/thunar.nix
index dcc99fcc..4e9676ab 100644
--- a/modules/nixos/desktop/thunar.nix
+++ b/modules/nixos/desktop/thunar.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.nixosModules.desktop.thunar;
+  cfg = config.features.desktop.thunar;
 in
 {
-  options.nixosModules.desktop.thunar.enable = mkEnableOption "Enable thunar";
+  options.features.desktop.thunar.enable = mkEnableOption "Enable thunar";
 
   config = mkIf cfg.enable {
     programs.thunar = {
diff --git a/users/opdavies.nix b/users/opdavies.nix
index 7043c56c..275a315f 100644
--- a/users/opdavies.nix
+++ b/users/opdavies.nix
@@ -18,8 +18,8 @@ with lib;
         "networkmanager"
         "wheel"
       ]
-      ++ optional config.nixosModules.cli.docker.enable "docker"
-      ++ optional config.nixosModules.cli.podman.enable "podman";
+      ++ optional config.features.cli.docker.enable "docker"
+      ++ optional config.features.cli.podman.enable "podman";
 
     packages = with pkgs; [
       qrencode