modules: prefix with getchoo

6 files changed, 22 insertions, 19 deletions

diff --git a/modules/desktop/audio.nix b/modules/desktop/audio.nix
index cbfbf55..d04316b 100644
--- a/modules/desktop/audio.nix
+++ b/modules/desktop/audio.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.desktop.audio;
+  cfg = config.getchoo.desktop.audio;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.desktop.audio.enable = mkEnableOption "enable audio support";
+  options.getchoo.desktop.audio.enable = mkEnableOption "enable audio support";
 
   config = mkIf cfg.enable {
     services = {
diff --git a/modules/desktop/budgie/default.nix b/modules/desktop/budgie/default.nix
index 0053e4b..440bbc6 100644
--- a/modules/desktop/budgie/default.nix
+++ b/modules/desktop/budgie/default.nix
@@ -4,12 +4,14 @@
   lib,
   ...
 }: let
-  cfg = config.desktop.budgie;
+  cfg = config.getchoo.desktop.budgie;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.desktop.budgie.enable = mkEnableOption "enable budgie";
+  options.getchoo.desktop.budgie.enable = mkEnableOption "enable budgie";
 
   config = mkIf cfg.enable {
+    getchoo.desktop.enable = true;
+
     services.xserver = {
       displayManager.lightdm.greeters.slick = {
         theme = {
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index a758d78..50b8854 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  cfg = config.desktop;
+  cfg = config.getchoo.desktop;
   inherit (lib) mkDefault mkEnableOption mkIf;
 in {
   imports = [
@@ -15,14 +15,15 @@ in {
     ./plasma
   ];
 
-  options.desktop.enable = mkEnableOption "desktop module";
+  options.getchoo.desktop.enable = mkEnableOption "desktop module";
 
   config = mkIf cfg.enable {
-    nixos.enable = true;
-
-    desktop = {
-      audio.enable = mkDefault true;
-      fonts.enable = mkDefault true;
+    getchoo = {
+      nixos.enable = true;
+      desktop = {
+        audio.enable = mkDefault true;
+        fonts.enable = mkDefault true;
+      };
     };
 
     environment = {
diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix
index 9e968f7..95b2e4d 100644
--- a/modules/desktop/fonts.nix
+++ b/modules/desktop/fonts.nix
@@ -4,10 +4,10 @@
   lib,
   ...
 }: let
-  cfg = config.desktop.fonts;
+  cfg = config.getchoo.desktop.fonts;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.desktop.fonts.enable = mkEnableOption "enable default fonts";
+  options.getchoo.desktop.fonts.enable = mkEnableOption "enable default fonts";
 
   config = mkIf cfg.enable {
     fonts = {
diff --git a/modules/desktop/gnome/default.nix b/modules/desktop/gnome/default.nix
index 55b53f5..fd3d34d 100644
--- a/modules/desktop/gnome/default.nix
+++ b/modules/desktop/gnome/default.nix
@@ -4,13 +4,13 @@
   lib,
   ...
 }: let
-  cfg = config.desktop.gnome;
+  cfg = config.getchoo.desktop.gnome;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.desktop.gnome.enable = mkEnableOption "enable gnome";
+  options.getchoo.desktop.gnome.enable = mkEnableOption "enable gnome";
 
   config = mkIf cfg.enable {
-    desktop.enable = true;
+    getchoo.desktop.enable = true;
 
     environment = {
       gnome.excludePackages = with pkgs; [
diff --git a/modules/desktop/plasma/default.nix b/modules/desktop/plasma/default.nix
index 7434f52..84960f3 100644
--- a/modules/desktop/plasma/default.nix
+++ b/modules/desktop/plasma/default.nix
@@ -4,13 +4,13 @@
   pkgs,
   ...
 }: let
-  cfg = config.desktop.plasma;
+  cfg = config.getchoo.desktop.plasma;
   inherit (lib) mkEnableOption mkIf;
 in {
-  options.desktop.plasma.enable = mkEnableOption "enable plasma";
+  options.getchoo.desktop.plasma.enable = mkEnableOption "enable plasma";
 
   config = mkIf cfg.enable {
-    desktop.enable = true;
+    getchoo.desktop.enable = true;
 
     environment.systemPackages = with pkgs; [pinentry-qt];