Remove features

hosts/PW05CH3L/configuration.nix

@@ -7,11 +7,9 @@
     ./modules/wiki.nix
   ];
 
-  features = {
-    cli = {
-      docker.enable = true;
-      password-store.enable = true;
-    };
+  cli = {
+    docker.enable = true;
+    password-store.enable = true;
   };
 
   wsl = {

hosts/lemp11/configuration.nix

@@ -11,15 +11,13 @@
     ../../users/eric.nix
   ];
 
-  features = {
-    core = {
-      bluetooth.enable = true;
-      zram.enable = true;
-    };
-
-    desktop.media.makemkv.enable = true;
+  core = {
+    bluetooth.enable = true;
+    zram.enable = true;
   };
 
+  desktop.media.makemkv.enable = true;
+
   # Bootloader.
   boot = {
     loader = {

hosts/nixedo/configuration.nix

@@ -16,11 +16,9 @@
     ../../users/opdavies.nix
   ];
 
-  features = {
-    core.openssh.enable = true;
-    cli.podman.enable = true;
-    desktop.dconf.enable = true;
-  };
+  core.openssh.enable = true;
+  cli.podman.enable = true;
+  desktop.dconf.enable = true;
 
   services.logind.lidSwitchExternalPower = "ignore";
 

hosts/nixedo/homelab.nix

@@ -3,7 +3,7 @@
     postgresqlBackup.enable = true;
   };
 
-  features.homelab = {
+  homelab = {
     enable = true;
 
     domain = "oliverdavies.uk";

hosts/nixedo/modules/audiobookshelf.nix

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

hosts/nixedo/modules/containers/tubearchivist.nix

@@ -10,10 +10,10 @@ with lib;
 let
   cfg = homelab.services.${service};
   service = "tubearchivist";
-  homelab = config.features.homelab;
+  homelab = config.homelab;
 in
 {
-  options.features.homelab.services.${service} = {
+  options.homelab.services.${service} = {
     enable = mkEnableOption "Enable ${service}";
 
     port = mkOption {

hosts/nixedo/modules/default.nix

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

hosts/nixedo/modules/forgejo.nix

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

hosts/nixedo/modules/immich.nix

@@ -9,11 +9,11 @@ with lib;
 
 let
   cfg = homelab.services.${service};
-  homelab = config.features.homelab;
+  homelab = config.homelab;
   service = "immich";
 in
 {
-  options.features.homelab.services.${service} = {
+  options.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.features.homelab;
+  homelab = config.homelab;
   service = "jellyfin";
 in
 {
-  options.features.homelab.services.${service} = {
+  options.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.features.homelab;
+  homelab = config.homelab;
   service = "paperless";
 in
 {
-  options.features.homelab.services.${service} = {
+  options.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.features.homelab;
+  homelab = config.homelab;
   opts = options.services.${service};
   service = "homepage-dashboard";
 in
 {
-  options.features.homelab.services.${service} = {
+  options.homelab.services.${service} = {
     enable = mkEnableOption "Enable ${service}";
 
     port = mkOption {

hosts/nixedo/services/homepage/services.nix

@@ -3,7 +3,7 @@
 with lib;
 
 let
-  homelab = config.features.homelab.services;
+  homelab = config.homelab.services;
 
   homepageCategories = [
     "Media"

hosts/nixedo/services/uptime-kuma.nix

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

hosts/nixedo/services/vaultwarden.nix

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

hosts/t480/configuration.nix

@@ -12,33 +12,31 @@
     ../../users/opdavies.nix
   ];
 
-  features = {
-    cli.password-store = {
-      enable = true;
+  cli.password-store = {
+    enable = true;
 
-      extensions = with pkgs.passExtensions; [
-        pass-audit
-        pass-otp
-        pass-update
-      ];
-    };
+    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;
   };
 
   boot = {

hosts/t490/configuration.nix

@@ -14,15 +14,13 @@
     ../../users/opdavies.nix
   ];
 
-  features = {
-    core = {
-      bluetooth.enable = true;
-      zram.enable = true;
-    };
-
-    desktop.dconf.enable = true;
+  core = {
+    bluetooth.enable = true;
+    zram.enable = true;
   };
 
+  desktop.dconf.enable = true;
+
   boot = {
     loader = {
       systemd-boot = {

hosts/t490/services/redshift.nix

@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.features.redshift;
+  cfg = config.redshift;
 in
 {
-  options.features.redshift.enable = mkEnableOption "Enable redshift";
+  options.redshift.enable = mkEnableOption "Enable redshift";
 
   config = mkIf cfg.enable {
     location = {