4 files changed, 21 insertions, 34 deletions
diff --git a/users/seth/desktop/budgie/default.nix b/users/seth/desktop/budgie/default.nix
index 66a5467..7eced2b 100644
--- a/users/seth/desktop/budgie/default.nix
+++ b/users/seth/desktop/budgie/default.nix
@@ -4,8 +4,8 @@
   pkgs,
   ...
 }: let
-  cfg = config.desktop.budgie;
-  inherit (lib) mkEnableOption mkIf;
+  cfg = config.getchoo.desktop.budgie;
+  inherit (lib) mkIf;
   fromYaml = file: let
     json = with pkgs;
       runCommand "converted.json" {} ''
@@ -14,8 +14,6 @@
   in
     with builtins; fromJSON (readFile json);
 in {
-  options.desktop.budgie.enable = mkEnableOption "enable budgie";
-
   config = mkIf cfg.enable {
     programs.alacritty = {
       enable = true;
diff --git a/users/seth/desktop/default.nix b/users/seth/desktop/default.nix
index 8960d88..bdcef3d 100644
--- a/users/seth/desktop/default.nix
+++ b/users/seth/desktop/default.nix
@@ -5,24 +5,27 @@
   osConfig,
   ...
 }: let
-  cfg = config.desktop;
-  inherit (lib) mkEnableOption mkIf;
-
+  cfg = config.getchoo.desktop;
   desktops = ["budgie" "gnome" "plasma"];
+  inherit (lib) mkEnableOption mkIf;
 in {
   imports = [
     ./budgie
     ./gnome
     ./plasma
-    ../programs/mangohud.nix
-    ../programs/firefox.nix
   ];
 
-  options.desktop.enable = mkEnableOption "desktop configuration" // {default = osConfig.desktop.enable or false;};
+  options.getchoo.desktop =
+    {
+      enable = mkEnableOption "desktop configuration" // {default = osConfig.desktop.enable or false;};
+    }
+    // lib.genAttrs desktops (desktop: {
+      enable =
+        mkEnableOption desktop
+        // {default = osConfig.desktop.${desktop}.enable or false;};
+    });
 
   config = mkIf cfg.enable {
-    desktop = lib.genAttrs desktops (desktop: {enable = osConfig.desktop.${desktop}.enable or false;});
-
     home.packages = with pkgs; [
       discord
       element-desktop
@@ -31,20 +34,10 @@ in {
       prismlauncher
     ];
 
-    programs = {
-      chromium = {
-        enable = true;
-        # hw accel support
-        commandLineArgs = [
-          "--ignore-gpu-blocklist"
-          "--enable-gpu-rasterization"
-          "--enable-gpu-compositing"
-          "--enable-native-gpu-memory-buffers"
-          "--enable-zero-copy"
-          "--enable-features=VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization,RawDraw,WebRTCPipeWireCapturer,Vulkan,WaylandWindowDecorations,WebUIDarkMode"
-          "--force-dark-mode"
-        ];
-      };
+    getchoo.programs = {
+      chromium.enable = true;
+      firefox.enable = true;
+      mangohud.enable = true;
     };
   };
 }
diff --git a/users/seth/desktop/gnome/default.nix b/users/seth/desktop/gnome/default.nix
index 71acdba..26b91df 100644
--- a/users/seth/desktop/gnome/default.nix
+++ b/users/seth/desktop/gnome/default.nix
@@ -4,11 +4,9 @@
   pkgs,
   ...
 }: let
-  cfg = config.desktop.gnome;
-  inherit (lib) mkEnableOption mkIf;
+  cfg = config.getchoo.desktop.gnome;
+  inherit (lib) mkIf;
 in {
-  options.desktop.gnome.enable = mkEnableOption "enable gnome";
-
   config = mkIf cfg.enable {
     home.packages = with pkgs;
       [adw-gtk3]
diff --git a/users/seth/desktop/plasma/default.nix b/users/seth/desktop/plasma/default.nix
index f19f2c1..4f59528 100644
--- a/users/seth/desktop/plasma/default.nix
+++ b/users/seth/desktop/plasma/default.nix
@@ -4,11 +4,9 @@
   pkgs,
   ...
 }: let
-  cfg = config.desktop.plasma;
-  inherit (lib) mkEnableOption mkIf;
+  cfg = config.getchoo.desktop.plasma;
+  inherit (lib) mkIf;
 in {
-  options.desktop.plasma.enable = mkEnableOption "enable plasma";
-
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       catppuccin-cursors