From 1851743a21f3d6a53c8ec9f39b8768f59a9168bf Mon Sep 17 00:00:00 2001
From: John Ogle <john@ogle.fyi>
Date: Sun, 16 Mar 2025 14:33:26 -0700
Subject: [PATCH] [desktop] Finish programs refactor

---
 roles/desktop/default.nix  | 16 ++--------------
 roles/desktop/programs.nix |  5 ++++-
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/roles/desktop/default.nix b/roles/desktop/default.nix
index 5c329de..60668a9 100644
--- a/roles/desktop/default.nix
+++ b/roles/desktop/default.nix
@@ -2,12 +2,10 @@
 
 with lib;
 
-let
-  cfg = config.roles.desktop;
-in
 {
   options.roles.desktop = {
     enable = mkEnableOption "Enable the desktop role.";
+
     x11 = mkOption { type = types.bool; default = false; description = "Enable X11 support."; };
     wayland = mkOption { type = types.bool; default = false; description = "Enable Wayland support."; };
     kde = mkOption { type = types.bool; default = false; description = "Enable KDE."; };
@@ -20,17 +18,7 @@ in
     ./wayland.nix
     ./gaming.nix
     ./kde.nix
+    ./programs.nix
     ./sddm.nix
   ];
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      brightnessctl
-      emacs-nox
-    ];
-
-    programs.dconf.enable = true;
-    services.gnome.gnome-keyring.enable = true;
-    programs.kdeconnect.enable = true;
-  };
 }
diff --git a/roles/desktop/programs.nix b/roles/desktop/programs.nix
index cc7070e..a71ebca 100644
--- a/roles/desktop/programs.nix
+++ b/roles/desktop/programs.nix
@@ -2,8 +2,11 @@
 
 with lib;
 
+let
+  cfg = config.roles.desktop;
+in
 {
-  config = {
+  config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       brightnessctl
       emacs-nox