diff --git a/home-manager/opdavies/PW05CH3L.nix b/home-manager/opdavies/PW05CH3L.nix
index 7d6f73da..13391dcd 100644
--- a/home-manager/opdavies/PW05CH3L.nix
+++ b/home-manager/opdavies/PW05CH3L.nix
@@ -3,39 +3,41 @@
 {
   imports = [ ../common ];
 
-  cli = {
-    bookmarkthis.enable = true;
-    direnv.enable = true;
-    fzf.enable = true;
+  features = {
+    cli = {
+      bookmarkthis.enable = true;
+      direnv.enable = true;
+      fzf.enable = true;
 
-    git = {
-      enable = true;
+      git = {
+        enable = true;
 
-      user.emailAddress = "oliver.davies@tfw.wales";
+        user.emailAddress = "oliver.davies@tfw.wales";
+      };
+
+      node.enable = true;
+      notes.enable = true;
+      ranger.enable = true;
+      starship.enable = true;
+      tmux.enable = true;
+
+      tmux-sessionizer = {
+        enable = true;
+
+        searchPaths = [
+          "${config.xdg.userDirs.extraConfig.XDG_REPOS_DIR}:2"
+          "${config.xdg.userDirs.documents}:1"
+        ];
+      };
+
+      todos.enable = true;
+      zsh.enable = true;
     };
 
-    node.enable = true;
-    notes.enable = true;
-    ranger.enable = true;
-    starship.enable = true;
-    tmux.enable = true;
-
-    tmux-sessionizer = {
-      enable = true;
-
-      searchPaths = [
-        "${config.xdg.userDirs.extraConfig.XDG_REPOS_DIR}:2"
-        "${config.xdg.userDirs.documents}:1"
-      ];
+    coding = {
+      neovim.enable = true;
+      phpactor.enable = true;
     };
-
-    todos.enable = true;
-    zsh.enable = true;
-  };
-
-  coding = {
-    neovim.enable = true;
-    phpactor.enable = true;
   };
 
   xdg.configFile."pam-gnupg".text = ''
diff --git a/home-manager/opdavies/lemp11.nix b/home-manager/opdavies/lemp11.nix
index 925d863d..1917a2db 100644
--- a/home-manager/opdavies/lemp11.nix
+++ b/home-manager/opdavies/lemp11.nix
@@ -1,11 +1,13 @@
 {
   imports = [ ../common ];
 
-  cli.zsh.enable = true;
+  features = {
+    cli.zsh.enable = true;
 
-  desktop.media = {
-    handbrake.enable = true;
-    makemkv.enable = true;
-    mpv.enable = true;
+    desktop.media = {
+      handbrake.enable = true;
+      makemkv.enable = true;
+      mpv.enable = true;
+    };
   };
 }
diff --git a/home-manager/opdavies/nixedo.nix b/home-manager/opdavies/nixedo.nix
index 4468439b..8c735ce7 100644
--- a/home-manager/opdavies/nixedo.nix
+++ b/home-manager/opdavies/nixedo.nix
@@ -5,7 +5,7 @@
     ./nixedo/email-filters.nix
   ];
 
-  cli = {
+  features.cli = {
     fzf.enable = true;
     starship.enable = true;
     zsh.enable = true;
diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index db6f707c..60e9a725 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -6,80 +6,80 @@
     ./t480/gammastep.nix
   ];
 
-  cli = {
-    bluetuith.enable = true;
-    bookmarkthis.enable = true;
-    direnv.enable = true;
-    fzf.enable = true;
+  features = {
+    cli = {
+      bluetuith.enable = true;
+      bookmarkthis.enable = true;
+      direnv.enable = true;
+      fzf.enable = true;
 
-    git = {
-      enable = true;
-
-      user.emailAddress = "oliver@oliverdavies.uk";
-    };
-
-    node.enable = true;
-
-    notes = {
-      enable = true;
-
-      directory = "${config.xdg.userDirs.documents}/wiki/notes";
-    };
-
-    ranger.enable = true;
-    sxhkd.enable = true;
-    starship.enable = true;
-    tmux.enable = true;
-
-    tmux-sessionizer = {
-      enable = true;
-      enableDmenuIntegration = true;
-
-      searchPaths =
-        let
-          inherit (config.xdg.userDirs) documents extraConfig;
-
-          repos = extraConfig.XDG_REPOS_DIR;
-        in
-        [
-          repos
-          "${repos}/*"
-          documents
-        ];
-    };
-
-    todos.enable = true;
-    zsh.enable = true;
-  };
-
-  coding = {
-    neovim.enable = true;
-    phpactor.enable = true;
-  };
-
-  desktop = {
-    browsers = {
-      chromium.enable = true;
-
-      firefox = {
+      git = {
         enable = true;
 
-        homepageUrl = "https://nixedo.oliverdavies.uk";
+        user.emailAddress = "oliver@oliverdavies.uk";
       };
 
-      qutebrowser.enable = true;
+      node.enable = true;
+
+      notes = {
+        enable = true;
+
+        directory = "${config.xdg.userDirs.documents}/wiki/notes";
+      };
+
+      ranger.enable = true;
+      sxhkd.enable = true;
+      starship.enable = true;
+      tmux.enable = true;
+
+      tmux-sessionizer = {
+        enable = true;
+        enableDmenuIntegration = true;
+
+        searchPaths =
+          let
+            inherit (config.xdg.userDirs) documents extraConfig;
+
+            repos = extraConfig.XDG_REPOS_DIR;
+          in
+          [
+            repos
+            "${repos}/*"
+            documents
+          ];
+      };
+
+      todos.enable = true;
+      zsh.enable = true;
     };
 
-    flameshot.enable = true;
-    gtk.enable = true;
-
-    media = {
-      handbrake.enable = true;
-      makemkv.enable = true;
-      mpv.enable = true;
+    coding = {
+      neovim.enable = true;
+      phpactor.enable = true;
     };
 
-    # redshift.enable = true;
+    desktop = {
+      browsers = {
+        chromium.enable = true;
+
+        firefox = {
+          enable = true;
+
+          homepageUrl = "https://nixedo.oliverdavies.uk";
+        };
+
+        qutebrowser.enable = true;
+      };
+
+      flameshot.enable = true;
+      gtk.enable = true;
+
+      media = {
+        handbrake.enable = true;
+        makemkv.enable = true;
+        mpv.enable = true;
+      };
+    };
   };
 
   programs = {
diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix
index a6c1b52b..7d0d8495 100644
--- a/hosts/PW05CH3L/configuration.nix
+++ b/hosts/PW05CH3L/configuration.nix
@@ -11,15 +11,17 @@
     ../../users/opdavies.nix
   ];
 
-  cli = {
-    docker.enable = true;
+  features = {
+    cli = {
+      docker.enable = true;
 
-    password-store = {
-      enable = true;
+      password-store = {
+        enable = true;
 
-      extensions = with pkgs.passExtensions; [
-        pass-otp
-      ];
+        extensions = with pkgs.passExtensions; [
+          pass-otp
+        ];
+      };
     };
   };
 
diff --git a/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix
index 88336c16..5c2d84b6 100644
--- a/hosts/lemp11/configuration.nix
+++ b/hosts/lemp11/configuration.nix
@@ -18,12 +18,14 @@
     ../../users/eric.nix
   ];
 
-  core = {
-    bluetooth.enable = true;
-    zram.enable = true;
-  };
+  features = {
+    core = {
+      bluetooth.enable = true;
+      zram.enable = true;
+    };
 
-  desktop.media.makemkv.enable = true;
+    desktop.media.makemkv.enable = true;
+  };
 
   nixpad.enable = true;
 
diff --git a/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix
index 8395b58b..b3bc1280 100644
--- a/hosts/nixedo/configuration.nix
+++ b/hosts/nixedo/configuration.nix
@@ -19,9 +19,11 @@
     ../../users/opdavies.nix
   ];
 
-  core.openssh.enable = true;
-  cli.podman.enable = true;
-  desktop.dconf.enable = true;
+  features = {
+    core.openssh.enable = true;
+    cli.podman.enable = true;
+    desktop.dconf.enable = true;
+  };
 
   # TODO: why didn't it work when adding this to jitsi.nix?
   nixpkgs.config.permittedInsecurePackages = [
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 1ba019f5..d8dedcd1 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -19,41 +19,43 @@
     ../../users/opdavies.nix
   ];
 
-  cli = {
-    kanata = {
-      enable = true;
+  features = {
+    cli = {
+      kanata = {
+        enable = true;
 
-      devices = [
-        "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
-      ];
+        devices = [
+          "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
+        ];
+      };
+
+      password-store = {
+        enable = true;
+
+        extensions = with pkgs.passExtensions; [
+          pass-audit
+          pass-otp
+          pass-update
+        ];
+      };
     };
 
-    password-store = {
-      enable = true;
-
-      extensions = with pkgs.passExtensions; [
-        pass-audit
-        pass-otp
-        pass-update
-      ];
+    core = {
+      bluetooth.enable = true;
+      openssh.enable = true;
+      pipewire.enable = true;
+      xbanish.enable = true;
+      zram.enable = true;
     };
-  };
 
-  core = {
-    bluetooth.enable = true;
-    openssh.enable = true;
-    pipewire.enable = true;
-    xbanish.enable = true;
-    zram.enable = true;
-  };
-
-  desktop = {
-    dconf.enable = true;
-    dwm.enable = true;
-    fonts.enable = true;
-    media.makemkv.enable = true;
-    st.enable = true;
-    thunar.enable = true;
+    desktop = {
+      dconf.enable = true;
+      dwm.enable = true;
+      fonts.enable = true;
+      media.makemkv.enable = true;
+      st.enable = true;
+      thunar.enable = true;
+    };
   };
 
   services = {
diff --git a/hosts/t490/configuration.nix b/hosts/t490/configuration.nix
index fee2d4f1..873e0a07 100644
--- a/hosts/t490/configuration.nix
+++ b/hosts/t490/configuration.nix
@@ -16,12 +16,14 @@
     ../../users/opdavies.nix
   ];
 
-  core = {
-    bluetooth.enable = true;
-    zram.enable = true;
-  };
+  features = {
+    core = {
+      bluetooth.enable = true;
+      zram.enable = true;
+    };
 
-  desktop.dconf.enable = true;
+    desktop.dconf.enable = true;
+  };
 
   nixpad.enable = true;
 
diff --git a/modules/home-manager/cli/bluetuith.nix b/modules/home-manager/cli/bluetuith.nix
index b699183f..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.cli.bluetuith;
+  cfg = config.features.cli.bluetuith;
 in
 {
-  options.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/bookmarkthis.nix b/modules/home-manager/cli/bookmarkthis.nix
index f312198e..286fd599 100644
--- a/modules/home-manager/cli/bookmarkthis.nix
+++ b/modules/home-manager/cli/bookmarkthis.nix
@@ -8,11 +8,11 @@
 let
   inherit (lib) mkEnableOption mkOption;
 
-  cfg = config.cli.${name};
+  cfg = config.features.cli.${name};
   name = "bookmarkthis";
 in
 {
-  options.cli.${name} = {
+  options.features.cli.${name} = {
     enable = mkEnableOption "Enable ${name}";
 
     snippetsFile = mkOption {
diff --git a/modules/home-manager/cli/direnv.nix b/modules/home-manager/cli/direnv.nix
index 875e27c3..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.cli.direnv;
+  cfg = config.features.cli.direnv;
 in
 {
-  options.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 2abbe2a1..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.cli.fzf;
+  cfg = config.features.cli.fzf;
 in
 {
-  options.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 99a3202e..765f366a 100644
--- a/modules/home-manager/cli/git.nix
+++ b/modules/home-manager/cli/git.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.cli.git;
+  cfg = config.features.cli.git;
 in
 {
-  options.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 b0db6874..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.cli.node;
+  cfg = config.features.cli.node;
 
   inherit (config.xdg) configHome dataHome stateHome;
 in
 {
-  options.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 2b2d7b8e..5b843c72 100644
--- a/modules/home-manager/cli/notes.nix
+++ b/modules/home-manager/cli/notes.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.cli.notes;
+  cfg = config.features.cli.notes;
 in
 {
-  options.cli.notes = {
+  options.features.cli.notes = {
     enable = mkEnableOption "Enable notes";
 
     directory = mkOption {
diff --git a/modules/home-manager/cli/ranger.nix b/modules/home-manager/cli/ranger.nix
index 7a05fd57..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.cli.ranger;
+  cfg = config.features.cli.ranger;
 in
 {
-  options.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 a3673af6..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.cli.starship;
+  cfg = config.features.cli.starship;
 in
 {
-  options.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/sxhkd.nix b/modules/home-manager/cli/sxhkd.nix
index b616374d..2495ef8b 100644
--- a/modules/home-manager/cli/sxhkd.nix
+++ b/modules/home-manager/cli/sxhkd.nix
@@ -1,13 +1,13 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.cli.${service};
+  cfg = config.features.cli.${service};
   service = "sxhkd";
 
   inherit (lib) getExe mkIf mkEnableOption;
 in
 {
-  options.cli.${service} = {
+  options.features.cli.${service} = {
     enable = mkEnableOption "Enable ${service}";
   };
 
diff --git a/modules/home-manager/cli/tmux-sessionizer.nix b/modules/home-manager/cli/tmux-sessionizer.nix
index 9d280ce4..242c0e08 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.cli.tmux-sessionizer;
+  cfg = config.features.cli.tmux-sessionizer;
 in
 {
-  options.cli.tmux-sessionizer = {
+  options.features.cli.tmux-sessionizer = {
     enable = mkEnableOption "Enable tmux-sessionizer";
     enableDmenuIntegration = mkEnableOption "Enable dmenu integration";
 
diff --git a/modules/home-manager/cli/tmux.nix b/modules/home-manager/cli/tmux.nix
index 5956ad4d..3bc46547 100644
--- a/modules/home-manager/cli/tmux.nix
+++ b/modules/home-manager/cli/tmux.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.cli.tmux;
+  cfg = config.features.cli.tmux;
 in
 {
-  options.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/todos.nix b/modules/home-manager/cli/todos.nix
index e55c7456..34b50c07 100644
--- a/modules/home-manager/cli/todos.nix
+++ b/modules/home-manager/cli/todos.nix
@@ -7,12 +7,12 @@
 
 let
   name = "todos";
-  cfg = config.cli.${name};
+  cfg = config.features.cli.${name};
 
   inherit (lib) mkOption types;
 in
 {
-  options.cli.${name} = {
+  options.features.cli.${name} = {
     enable = lib.mkEnableOption "Enable ${name}";
 
     directory = mkOption {
diff --git a/modules/home-manager/cli/zsh/default.nix b/modules/home-manager/cli/zsh/default.nix
index ff44e389..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.cli.zsh;
+  cfg = config.features.cli.zsh;
 in
 {
-  options.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 66dcb624..5788cada 100644
--- a/modules/home-manager/coding/neovim/default.nix
+++ b/modules/home-manager/coding/neovim/default.nix
@@ -8,14 +8,14 @@
 with lib;
 
 let
-  cfg = config.coding.neovim;
+  cfg = config.features.coding.neovim;
 in
 {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
   ];
 
-  options.coding.neovim.enable = mkEnableOption "Enable neovim";
+  options.features.coding.neovim.enable = mkEnableOption "Enable neovim";
 
   config = mkIf cfg.enable {
     programs.nixvim = {
diff --git a/modules/home-manager/coding/phpactor/default.nix b/modules/home-manager/coding/phpactor/default.nix
index 83c229be..f135b1dc 100644
--- a/modules/home-manager/coding/phpactor/default.nix
+++ b/modules/home-manager/coding/phpactor/default.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.coding.phpactor;
+  cfg = config.features.coding.phpactor;
 in
 {
-  options.coding.phpactor.enable = mkEnableOption "Enable phpactor";
+  options.features.coding.phpactor.enable = mkEnableOption "Enable phpactor";
 
   config = mkIf cfg.enable {
     xdg.configFile.phpactor = {
diff --git a/modules/home-manager/desktop/browsers/chromium.nix b/modules/home-manager/desktop/browsers/chromium.nix
index 92178ffc..d5200a05 100644
--- a/modules/home-manager/desktop/browsers/chromium.nix
+++ b/modules/home-manager/desktop/browsers/chromium.nix
@@ -1,13 +1,13 @@
 { config, lib, ... }:
 
 let
-  cfg = config.desktop.browsers.${name};
+  cfg = config.features.desktop.browsers.${name};
   name = "chromium";
 
   inherit (lib) mkEnableOption mkIf;
 in
 {
-  options.desktop.browsers.${name}.enable = mkEnableOption "Enable ${name}";
+  options.features.desktop.browsers.${name}.enable = mkEnableOption "Enable ${name}";
 
   config = mkIf cfg.enable {
     programs.${name}.enable = true;
diff --git a/modules/home-manager/desktop/browsers/firefox.nix b/modules/home-manager/desktop/browsers/firefox.nix
index 4b2b7418..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.desktop.browsers.firefox;
+  cfg = config.features.desktop.browsers.firefox;
 in
 {
-  options.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 6f602f9c..000c00d0 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.desktop.browsers.qutebrowser;
+  cfg = config.features.desktop.browsers.qutebrowser;
 in
 {
-  options.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 f8d51be9..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.desktop.flameshot;
+  cfg = config.features.desktop.flameshot;
 in
 {
-  options.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 84b2fefc..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.desktop.gtk;
+  cfg = config.features.desktop.gtk;
 in
 {
-  options.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 5da7514e..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.desktop.media.handbrake;
+  cfg = config.features.desktop.media.handbrake;
 in
 {
-  options.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 5cfa207c..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.desktop.media.makemkv;
+  cfg = config.features.desktop.media.makemkv;
 in
 {
-  options.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 5d0f9570..36252b52 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.desktop.media.mpv;
+  cfg = config.features.desktop.media.mpv;
 in
 {
-  options.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/home-manager/desktop/redshift.nix b/modules/home-manager/desktop/redshift.nix
index d9f3c529..8a864d10 100644
--- a/modules/home-manager/desktop/redshift.nix
+++ b/modules/home-manager/desktop/redshift.nix
@@ -1,12 +1,12 @@
 { config, lib, ... }:
 
 let
-  cfg = config.desktop.redshift;
+  cfg = config.features.desktop.redshift;
 
   inherit (lib) mkEnableOption mkIf;
 in
 {
-  options.desktop.redshift = {
+  options.features.desktop.redshift = {
     enable = mkEnableOption "Enable redshift";
   };
 
diff --git a/modules/nixos/cli/docker.nix b/modules/nixos/cli/docker.nix
index fc27bcbe..916a7cae 100644
--- a/modules/nixos/cli/docker.nix
+++ b/modules/nixos/cli/docker.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.cli.docker;
+  cfg = config.features.cli.docker;
 in
 {
-  options.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/kanata.nix b/modules/nixos/cli/kanata.nix
index d3e06008..394b4c6f 100644
--- a/modules/nixos/cli/kanata.nix
+++ b/modules/nixos/cli/kanata.nix
@@ -1,13 +1,13 @@
 { config, lib, ... }:
 
 let
-  cfg = config.cli.${service};
+  cfg = config.features.cli.${service};
   service = "kanata";
 
   inherit (lib) mkEnableOption mkIf mkOption types;
 in
 {
-  options.cli.${service} = {
+  options.features.cli.${service} = {
     enable = mkEnableOption "Enable ${service}";
 
     devices = mkOption {
diff --git a/modules/nixos/cli/password-store.nix b/modules/nixos/cli/password-store.nix
index 362cc7dd..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.cli.password-store;
+  cfg = config.features.cli.password-store;
 in
 {
-  options.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 5375ded5..edda7492 100644
--- a/modules/nixos/cli/podman.nix
+++ b/modules/nixos/cli/podman.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.cli.podman;
+  cfg = config.features.cli.podman;
 in
 {
-  options.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 4a2bfad7..dbf51398 100644
--- a/modules/nixos/core/bluetooth.nix
+++ b/modules/nixos/core/bluetooth.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.core.bluetooth;
+  cfg = config.features.core.bluetooth;
 in
 {
-  options.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 b248ab34..3d09487e 100644
--- a/modules/nixos/core/openssh.nix
+++ b/modules/nixos/core/openssh.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.core.openssh;
+  cfg = config.features.core.openssh;
 in
 {
-  options.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 26e8014b..557846bd 100644
--- a/modules/nixos/core/pipewire.nix
+++ b/modules/nixos/core/pipewire.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.core.pipewire;
+  cfg = config.features.core.pipewire;
 in
 {
-  options.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 41142461..723eeff9 100644
--- a/modules/nixos/core/xbanish.nix
+++ b/modules/nixos/core/xbanish.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.core.xbanish;
+  cfg = config.features.core.xbanish;
 in
 {
-  options.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 fe980915..a0d0046a 100644
--- a/modules/nixos/core/zram.nix
+++ b/modules/nixos/core/zram.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.core.zram;
+  cfg = config.features.core.zram;
 in
 {
-  options.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 ee0c51e7..eebbfa2c 100644
--- a/modules/nixos/desktop/dconf.nix
+++ b/modules/nixos/desktop/dconf.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.desktop.dconf;
+  cfg = config.features.desktop.dconf;
 in
 {
-  options.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 a58572a6..795fde3a 100644
--- a/modules/nixos/desktop/dwm/default.nix
+++ b/modules/nixos/desktop/dwm/default.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.desktop.dwm;
+  cfg = config.features.desktop.dwm;
 in
 {
-  options.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 8c49a2f6..371b2fe1 100644
--- a/modules/nixos/desktop/fonts.nix
+++ b/modules/nixos/desktop/fonts.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.desktop.fonts;
+  cfg = config.features.desktop.fonts;
 in
 {
-  options.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 2d30d7ea..2b25b7aa 100644
--- a/modules/nixos/desktop/media/makemkv.nix
+++ b/modules/nixos/desktop/media/makemkv.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.desktop.media.makemkv;
+  cfg = config.features.desktop.media.makemkv;
 in
 {
-  options.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 3e0b6d81..cc2345a4 100644
--- a/modules/nixos/desktop/st.nix
+++ b/modules/nixos/desktop/st.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.desktop.st;
+  cfg = config.features.desktop.st;
 in
 {
-  options.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 b6b08214..4e9676ab 100644
--- a/modules/nixos/desktop/thunar.nix
+++ b/modules/nixos/desktop/thunar.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.desktop.thunar;
+  cfg = config.features.desktop.thunar;
 in
 {
-  options.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 cc8e2411..f810d742 100644
--- a/users/opdavies.nix
+++ b/users/opdavies.nix
@@ -18,8 +18,8 @@ with lib;
         "networkmanager"
         "wheel"
       ]
-      ++ optional config.cli.docker.enable "docker"
-      ++ optional config.cli.podman.enable "podman";
+      ++ optional config.features.cli.docker.enable "docker"
+      ++ optional config.features.cli.podman.enable "podman";
 
     packages = with pkgs; [
       comma