From c1565bfbbbee5d7dc5fbe297bbb1b5841af4d8bd Mon Sep 17 00:00:00 2001
From: TheWanderingCrow <patrick@wanderingcrow.net>
Date: Sun, 29 Dec 2024 09:45:52 -0500
Subject: [PATCH] collapse x11 programs.nix into the desktop

---
 modules/desktops/x11/i3.nix   | 6 ++++++
 modules/software/programs.nix | 9 ---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/desktops/x11/i3.nix b/modules/desktops/x11/i3.nix
index cfcda63..6aa5bc1 100644
--- a/modules/desktops/x11/i3.nix
+++ b/modules/desktops/x11/i3.nix
@@ -10,6 +10,12 @@
       displayManager.startx.enable = true;
       windowManager.i3 = {
         enable = true;
+        extraPackages = with pkgs;
+        [
+            xorg.xrandr
+            xterm
+            rofi
+        ];
       };
     };
   };
diff --git a/modules/software/programs.nix b/modules/software/programs.nix
index 860dd09..d1f4b2d 100644
--- a/modules/software/programs.nix
+++ b/modules/software/programs.nix
@@ -63,15 +63,6 @@
       ]
       else []
     )
-    ++ (
-      if config.module.x11.enable
-      then [
-        xterm
-        rofi
-        xorg.xrandr
-      ]
-      else []
-    )
     ++ (
       if config.module.programming.enable
       then [