NixOS on WSL updates

home/gui/chat.nix

@@ -1,10 +1,18 @@
 { pkgs, lib, ... }:
 
-{
-	home.packages = with pkgs; ( if ( lib.hasSuffix "-darwin" pkgs.system) then
-		[] else
-	[
+let
+	darwinPkgs = [];
+	x86Pkgs = with pkgs; [
 		element-desktop
 		slack
-	]);
+	];
+	archPkgs = with pkgs; [
+		element-desktop
+	];
+in {
+	home.packages = ( if ( pkgs.stdenv.hostPlatform.isDarwin ) then darwinPkgs else 
+		( if ( lib.hasPrefix "aarch64" pkgs.system ) then archPkgs else 
+			( if ( lib.hasPrefix "x86_64" pkgs.system ) then x86Pkgs else [] )
+		)
+	);
 }

home/gui/default.nix

@@ -3,15 +3,12 @@
 {
 	imports = [
 		./chat.nix
-		./gnome.nix
 		./firefox.nix
-		./terminal.nix
 	];
 
 	home.packages = with pkgs; [
 		bazel
 		bazel-buildtools
-		bitwarden
 		cargo # Rustc
 		cdrtools
 		ffmpeg
@@ -22,15 +19,19 @@
 		handbrake
 		jdk11
 		libtheora
-		onlyoffice-bin
-		synology-drive-client
 		vlc
 		x265
-		zoom-us
-	] ++ ( if pkgs.system != "x86_64-darwin" then
+	] ++ ( if ( pkgs.system != "x86_64-darwin" && pkgs.system != "aarch64-linux" ) then
 		[
 			jellyfin-media-player
 			nextcloud-client
 		] else []
+	) ++ ( if ( pkgs.system != "aarch64-linux" ) then
+		[
+			bitwarden
+			onlyoffice-bin
+			synology-drive-client
+			zoom-us
+		] else []
 	);
 }

home/gui/gnome.nix

@@ -1,47 +0,0 @@
-{ pkgs, lib, ... }:
-
-let
-	gv = lib.hm.gvariant;
-
-in {
-	dconf.settings = lib.mkIf ( lib.hasSuffix "-linux" pkgs.system ) {
-		"org/gnome/desktop/interface" = {
-			clock-show-weekday = true;
-		};
-		"org/gnome/desktop/wm/keybindings" = {
-			switch-applications = [];
-			switch-applications-backward = [];
-			switch-windows = ["<Alt>Tab"];
-			switch-windows-backward = [ "<Shift><Alt>Tab" ];
-		};
-		"org/gnome/nautilus/preferences" = {
-			default-folder-viewer = "icon-view";
-			search-filter-time-type = "last_modified";
-			search-view = "list-view";
-		};
-		"org/gnome/shell/window-switcher" = {
-			app-icon-mode = "both";
-			current-workspace-only = true;
-		};
-		"org/gnome/shell" = {
-			favorite-apps = [
-				"org.gnome.Calendar.desktop"
-				"org.gnome.Nautilus.desktop"
-				"org.gnome.Console.desktop"
-				"firefox.desktop"
-				"vlc.desktop"
-			];
-		};
-		"org/gnome/shell/overrides" = {
-			attach-modal-dialogs = true;
-			dynamic-workspaces = true;
-			edge-tiling = true;
-			focus-change-on-pointer-rest = true;
-			workspaces-only-on-primary = true;
-		};
-		"org/virt-manager/virt-manager/connections" = {
-			autoconnect = [ "qemu://session" "qemu://system" ];
-			uris = [ "qemu://session" "qemu://system" ];
-		};
-	};
-}

home/gui/terminal.nix

@@ -1,13 +0,0 @@
-{ lib, pkgs, ... }:
-
-{
-	programs.gnome-terminal = lib.mkIf ( pkgs.system != "x86_64-darwin") {
-		enable = true;
-		showMenubar = true;
-		themeVariant = "dark";
-		profile.default = {
-			default = true;
-			visibleName = "greg";
-		};
-	};
-}