From f1e9e140d64cfd2f947c89c3772c4c8746da30ee Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Sun, 23 Mar 2025 13:21:46 +1100
Subject: [PATCH] system/packages: fix infinite recursion

---
 modules/system/packages-gui.nix | 27 +++++++++++++++++++++++++++
 modules/system/packages.nix     | 27 ++-------------------------
 2 files changed, 29 insertions(+), 25 deletions(-)
 create mode 100644 modules/system/packages-gui.nix

diff --git a/modules/system/packages-gui.nix b/modules/system/packages-gui.nix
new file mode 100644
index 0000000..a03a92e
--- /dev/null
+++ b/modules/system/packages-gui.nix
@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ... }: {
+  config = lib.mkIf config.me.gui {
+    environment.systemPackages = with pkgs; [
+      gparted
+      nautilus
+    ];
+    programs.adb.enable = true;
+    hardware.graphics.extraPackages = with pkgs; [
+      vaapiIntel
+      vaapiVdpau
+      libvdpau-va-gl
+    ];
+    programs.light.enable = true;
+    hardware.opentabletdriver.enable = true;
+    hardware.keyboard.qmk.enable = true;
+    programs.steam = {
+      enable = true;
+      package = pkgs.steam.override {
+        extraPkgs = pkgs: with pkgs; [
+          gsettings-desktop-schemas
+        ];
+      };
+    };
+    services.dbus.packages = [ pkgs.dconf pkgs.gcr ];
+    services.gnome.sushi.enable = true;
+  };
+}
diff --git a/modules/system/packages.nix b/modules/system/packages.nix
index 0af911d..d13ac73 100644
--- a/modules/system/packages.nix
+++ b/modules/system/packages.nix
@@ -1,4 +1,5 @@
-{ config, lib, pkgs, ... }: {
+{ pkgs, ... }: {
+  imports = [ ./packages-gui.nix ];
   environment.systemPackages = with pkgs; [
     comma
     ecryptfs
@@ -16,30 +17,6 @@
     sshfs
     rsync
     wget
-  ] ++ lib.optionals config.me.gui [
-    gparted
-    nautilus
   ];
   environment.variables.EDITOR = "nvim";
 }
-// (if !config.me.gui then {} else {
-  programs.adb.enable = true;
-  hardware.graphics.extraPackages = with pkgs; [
-    vaapiIntel
-    vaapiVdpau
-    libvdpau-va-gl
-  ];
-  programs.light.enable = true;
-  hardware.opentabletdriver.enable = true;
-  hardware.keyboard.qmk.enable = true;
-  programs.steam = {
-    enable = true;
-    package = pkgs.steam.override {
-      extraPkgs = pkgs: with pkgs; [
-        gsettings-desktop-schemas
-      ];
-    };
-  };
-  services.dbus.packages = [ pkgs.dconf pkgs.gcr ];
-  services.gnome.sushi.enable = true;
-})