From d2acd47e715a97240c2136fefda4a10654e2c152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?m=C3=BCde?= <git@darkest.space>
Date: Sun, 3 May 2026 16:29:34 +0200
Subject: [PATCH] move some imports to desktop only

---
 nixosConfigurations.nix                 | 36 ++++++++++++-------------
 nixosModules/muede-desktop-settings.nix |  3 ---
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/nixosConfigurations.nix b/nixosConfigurations.nix
index 1c39c23..55af611 100644
--- a/nixosConfigurations.nix
+++ b/nixosConfigurations.nix
@@ -45,10 +45,6 @@ forDevice (
       # keep-sorted start
       home-manager.nixosModules.home-manager
       lanzaboote.nixosModules.lanzaboote
-      nova-shell.nixosModules.default
-      servicepoint-cli.nixosModules.default
-      servicepoint-simulator.nixosModules.default
-      servicepoint-tanks.nixosModules.default
       stylix.nixosModules.stylix
       zerforschen-plus.nixosModules.default
       # keep-sorted end
@@ -80,15 +76,32 @@ forDevice (
           lixIsNix.enable = true;
           openssh.enable = true;
           overlays.unstable.enable = true;
-          overlays.vscodeExtensions.enable = true;
           # prometheusNode.enable = true;
           systemdBoot.enable = true;
           tailscale.enable = true;
           # keep-sorted end
+
+          # keep-sorted start
+          enDe.enable = isDesktop;
+          firmwareUpdates.enable = isDesktop;
+          gnome.enable = isDesktop;
+          kdeconnect.enable = isDesktop;
+          modernDesktop.enable = isDesktop;
+          nixLd.enable = isDesktop;
+          overlays.vscodeExtensions.enable = isDesktop;
+          quietBoot.enable = isDesktop;
+          stylix.enable = isDesktop;
+          # keep-sorted end
         };
       }
     ]
     ++ lib.optionals isDesktop [
+      inputs.niri.nixosModules.niri
+      nova-shell.nixosModules.default
+      servicepoint-cli.nixosModules.default
+      servicepoint-simulator.nixosModules.default
+      servicepoint-tanks.nixosModules.default
+
       # Desktop config
       {
         home-manager = {
@@ -106,19 +119,6 @@ forDevice (
           daemonCPUSchedPolicy = "idle";
           daemonIOSchedClass = "idle";
         };
-
-        my = {
-          # keep-sorted start
-          enDe.enable = true;
-          firmwareUpdates.enable = true;
-          gnome.enable = true;
-          kdeconnect.enable = true;
-          modernDesktop.enable = true;
-          nixLd.enable = true;
-          quietBoot.enable = true;
-          stylix.enable = true;
-          # keep-sorted end
-        };
       }
     ];
   }
diff --git a/nixosModules/muede-desktop-settings.nix b/nixosModules/muede-desktop-settings.nix
index 8f25f62..980af13 100644
--- a/nixosModules/muede-desktop-settings.nix
+++ b/nixosModules/muede-desktop-settings.nix
@@ -2,12 +2,9 @@
   lib,
   config,
   pkgs,
-  niri,
   ...
 }:
 {
-  imports = [ niri.nixosModules.niri ];
-
   options.my.muedeDesktopSettings.enable = lib.mkEnableOption "muede desktop settings (Firefox, Logitech, RDP)";
 
   config = lib.mkIf config.my.muedeDesktopSettings.enable {