6 files changed, 19 insertions, 21 deletions
diff --git a/modules/nixos/desktop/audio.nix b/modules/nixos/desktop/audio.nix
index d04316b..c601563 100644
--- a/modules/nixos/desktop/audio.nix
+++ b/modules/nixos/desktop/audio.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.desktop.audio;
+  cfg = config.desktop.audio;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.desktop.audio.enable = mkEnableOption "enable audio support";
+  options.desktop.audio.enable = mkEnableOption "audio support";
 
   config = mkIf cfg.enable {
     services = {
diff --git a/modules/nixos/desktop/budgie/default.nix b/modules/nixos/desktop/budgie/default.nix
index 440bbc6..4605eb1 100644
--- a/modules/nixos/desktop/budgie/default.nix
+++ b/modules/nixos/desktop/budgie/default.nix
@@ -4,13 +4,13 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.desktop.budgie;
+  cfg = config.desktop.budgie;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.desktop.budgie.enable = mkEnableOption "enable budgie";
+  options.desktop.budgie.enable = mkEnableOption "enable budgie";
 
   config = mkIf cfg.enable {
-    getchoo.desktop.enable = true;
+    desktop.enable = true;
 
     services.xserver = {
       displayManager.lightdm.greeters.slick = {
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index a0277cc..f0ab74c 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  cfg = config.getchoo.desktop;
+  cfg = config.desktop;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
   imports = [
@@ -15,15 +15,13 @@ in {
     ./plasma
   ];
 
-  options.getchoo.desktop.enable = mkEnableOption "desktop module";
+  options.desktop.enable = mkEnableOption "desktop module";
 
   config = mkIf cfg.enable {
-    getchoo = {
-      base.enable = true;
-      desktop = {
-        audio.enable = mkDefault true;
-        fonts.enable = mkDefault true;
-      };
+    base.enable = true;
+    desktop = {
+      audio.enable = mkDefault true;
+      fonts.enable = mkDefault true;
     };
 
     environment = {
diff --git a/modules/nixos/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix
index a610152..feedf07 100644
--- a/modules/nixos/desktop/fonts.nix
+++ b/modules/nixos/desktop/fonts.nix
@@ -4,10 +4,10 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.desktop.fonts;
+  cfg = config.desktop.fonts;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.desktop.fonts.enable = mkEnableOption "enable default fonts";
+  options.desktop.fonts.enable = mkEnableOption "enable default fonts";
 
   config = mkIf cfg.enable {
     fonts = {
diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix
index de83bc1..889a563 100644
--- a/modules/nixos/desktop/gnome/default.nix
+++ b/modules/nixos/desktop/gnome/default.nix
@@ -4,13 +4,13 @@
   lib,
   ...
 }: let
-  cfg = config.getchoo.desktop.gnome;
+  cfg = config.desktop.gnome;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.desktop.gnome.enable = mkEnableOption "enable gnome";
+  options.desktop.gnome.enable = mkEnableOption "enable gnome";
 
   config = mkIf cfg.enable {
-    getchoo.desktop.enable = true;
+    desktop.enable = true;
 
     environment = {
       gnome.excludePackages = with pkgs; [
diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix
index 500317d..2034802 100644
--- a/modules/nixos/desktop/plasma/default.nix
+++ b/modules/nixos/desktop/plasma/default.nix
@@ -4,13 +4,13 @@
   pkgs,
   ...
 }: let
-  cfg = config.getchoo.desktop.plasma;
+  cfg = config.desktop.plasma;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.getchoo.desktop.plasma.enable = mkEnableOption "enable plasma";
+  options.desktop.plasma.enable = mkEnableOption "enable plasma";
 
   config = mkIf cfg.enable {
-    getchoo.desktop.enable = true;
+    desktop.enable = true;
 
     environment = {
       plasma5.excludePackages = with pkgs.libsForQt5; [