From 3c3e33b0753c74fbfefdcef57bdb6973220b2f0e Mon Sep 17 00:00:00 2001
From: Kaare Hoff Skovgaard <kaare@kaareskovgaard.net>
Date: Tue, 15 Jul 2025 08:22:59 +0200
Subject: [PATCH] Restructure conditionals on desktop in homes

Former-commit-id: b0c972f5b3b98f9d4ce85e361acfc7eabbe4d040
---
 nix/homes/x86_64-linux/khs/default.nix       |  4 +---
 nix/homes/x86_64-linux/khs/desktop.nix       | 11 ++++++++---
 nix/homes/x86_64-linux/khs/linux-desktop.nix |  9 +++++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/nix/homes/x86_64-linux/khs/default.nix b/nix/homes/x86_64-linux/khs/default.nix
index f6c613a..1fd2522 100644
--- a/nix/homes/x86_64-linux/khs/default.nix
+++ b/nix/homes/x86_64-linux/khs/default.nix
@@ -1,10 +1,8 @@
 {
-  lib,
-  config,
   ...
 }:
 {
   khscodes.khs.enable = true;
   khscodes.khs.shell.oh-my-posh.enable = true;
-  imports = lib.lists.optional config.khscodes.desktop.enable ./desktop.nix;
+  imports = [ ./desktop.nix ];
 }
diff --git a/nix/homes/x86_64-linux/khs/desktop.nix b/nix/homes/x86_64-linux/khs/desktop.nix
index ce11105..50c36bd 100644
--- a/nix/homes/x86_64-linux/khs/desktop.nix
+++ b/nix/homes/x86_64-linux/khs/desktop.nix
@@ -1,7 +1,12 @@
-{ pkgs, lib, ... }:
 {
-  imports = lib.lists.optional (lib.strings.hasSuffix "-linux" pkgs.system) ./linux-desktop.nix;
-  home.packages = [
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
+  imports = [ ./linux-desktop.nix ];
+  home.packages = lib.mkIf config.khscodes.desktop.enable [
     pkgs.bitwarden-cli
     pkgs.nerd-fonts.inconsolata
     pkgs.google-chrome
diff --git a/nix/homes/x86_64-linux/khs/linux-desktop.nix b/nix/homes/x86_64-linux/khs/linux-desktop.nix
index dc457e5..9769a56 100644
--- a/nix/homes/x86_64-linux/khs/linux-desktop.nix
+++ b/nix/homes/x86_64-linux/khs/linux-desktop.nix
@@ -1,4 +1,9 @@
-{ pkgs, ... }:
 {
-  home.packages = [ pkgs.spotify ];
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+{
+  home.packages = lib.mkIf config.khscodes.desktop.enable [ pkgs.spotify ];
 }