always import hosts/common/desktop + fix gnome/plasma

5 files changed, 45 insertions, 35 deletions

diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 5448bbb..1947de1 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -1,6 +1,7 @@
 {config, ...}: {
 	imports = [
 		./documentation.nix
+		./desktop
 		./fonts.nix
 		./locale.nix
 		./options.nix
@@ -10,5 +11,5 @@
 		./users.nix
 	];
 
-	config.services.kmscon.enable = true;
+	# config.services.kmscon.enable = true;
 }
diff --git a/hosts/common/desktop/default.nix b/hosts/common/desktop/default.nix
index a7bcde8..68cbaac 100644
--- a/hosts/common/desktop/default.nix
+++ b/hosts/common/desktop/default.nix
@@ -1,10 +1,18 @@
-{lib, ...}: {
-	environment.noXlibs = lib.mkForce false;
-	programs.xwayland.enable = true;
-	services.xserver.enable = true;
-	xdg.portal.enable = true;
-	import = [
+{
+	config,
+	lib,
+	...
+}: let
+	value = config.sys.gui.enable;
+	reverse = !config.sys.gui.enable;
+in {
+	imports = [
 		./gnome.nix
 		./plasma.nix
 	];
+
+	environment.noXlibs = lib.mkForce reverse;
+	programs.xwayland.enable = value;
+	services.xserver.enable = value;
+	xdg.portal.enable = value;
 }
diff --git a/hosts/common/desktop/gnome.nix b/hosts/common/desktop/gnome.nix
index b579eee..d1f003c 100644
--- a/hosts/common/desktop/gnome.nix
+++ b/hosts/common/desktop/gnome.nix
@@ -18,7 +18,10 @@
 					gnome-contacts
 					gnome-music
 				]);
-			systemPackages = with pkgs; [adw-gtk3 blackbox-terminal];
+			systemPackages = with pkgs; [
+				adw-gtk3
+				blackbox-terminal
+			];
 		}
 		else {};
 
@@ -31,6 +34,5 @@
 		else {};
 in {
 	environment = environmentConfig;
-
 	services.xserver = xserverConfig;
 }
diff --git a/hosts/common/desktop/plasma.nix b/hosts/common/desktop/plasma.nix
index f06fe23..952684f 100644
--- a/hosts/common/desktop/plasma.nix
+++ b/hosts/common/desktop/plasma.nix
@@ -2,21 +2,23 @@
 	config,
 	pkgs,
 	...
-}:
-if config.sys.desktop == "plasma"
-then {
-	services.xserver = {
-		displayManager.sddm.enable = true;
-		desktopManager.plasma5 = {
-			enable = true;
-			excludePackages = with pkgs.libsForQt5; [
-				elisa
-				khelpcenter
-				oxygen
-				plasma-browser-integration
-				print-manager
-			];
-		};
-	};
+}: let
+	xserverConfig =
+		if config.sys.desktop == "plasma"
+		then {
+			displayManager.sddm.enable = true;
+			desktopManager.plasma5 = {
+				enable = true;
+				excludePackages = with pkgs.libsForQt5; [
+					elisa
+					khelpcenter
+					oxygen
+					plasma-browser-integration
+					print-manager
+				];
+			};
+		}
+		else {};
+in {
+	services.xserver = xserverConfig;
 }
-else {}
diff --git a/users/seth/desktop/gnome.nix b/users/seth/desktop/gnome.nix
index 44f5eec..e2b5182 100644
--- a/users/seth/desktop/gnome.nix
+++ b/users/seth/desktop/gnome.nix
@@ -12,6 +12,12 @@
 		if desktop == "gnome"
 		then {
 			"org/gnome/shell" = {
+				disable-user-extensions = false;
+				enabled-extensions = [
+					"[email protected]"
+					"[email protected]"
+					"[email protected]"
+				];
 				favorite-apps = [
 					"firefox.desktop"
 					"org.gnome.Nautilus.desktop"
@@ -27,15 +33,6 @@
 				switch-windows = "['<Alt>Tab']";
 				switch-windows-backward = "['<Shift><Alt>Tab']";
 			};
-
-			"org/gnome/shell" = {
-				disable-user-extensions = false;
-				enabled-extensions = [
-					"[email protected]"
-					"[email protected]"
-					"[email protected]"
-				];
-			};
 		}
 		else {};
 	gtkConfig =