From ca0af209a534893c292aa13bf541ed0eee4dc2f3 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Tue, 2 May 2023 01:05:57 -0500
Subject: [PATCH] Simplify excluding packages for system

---
 home/gui/default.nix | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/home/gui/default.nix b/home/gui/default.nix
index 05eb50d..3980fbf 100644
--- a/home/gui/default.nix
+++ b/home/gui/default.nix
@@ -1,5 +1,11 @@
 { pkgs, ... }:
 
+let
+	excludes = systems: opts: (
+		if ( builtins.all (x: pkgs.system != x) systems ) then opts else []
+	);
+
+in
 {
 	imports = [
 		./chat.nix
@@ -8,26 +14,26 @@
 
 	home.packages = with pkgs; [
 		cdrtools
-		endeavour
 		ffmpeg
 		gnucash
 		handbrake
 		libtheora
 		vlc
 		x265
-	] ++ ( if ( pkgs.system != "x86_64-darwin" && pkgs.system != "aarch64-linux" ) then
-		[
-			jellyfin-media-player
-			libreoffice
-			logseq
-			nextcloud-client
-		] else []
-	) ++ ( if ( pkgs.system != "aarch64-linux" ) then
-		[
-			bitwarden
-			onlyoffice-bin
-			synology-drive-client
-			zoom-us
-		] else []
-	);
+	] ++
+	( excludes ["x86_64-darwin" "aarch64-darwin" "aarch64-linux"]
+	[
+		endeavour
+		jellyfin-media-player
+		libreoffice
+		logseq
+		nextcloud-client
+	]) ++
+	( excludes ["aarch64-linux"]
+	[
+		bitwarden
+		onlyoffice-bin
+		synology-drive-client
+		zoom-us
+	]);
 }