nixos: add gnome

nixos/desktop-gnome.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+	imports = [./desktop.nix];
+
+	services.xserver = {
+		displayManager.gdm.enable = true;
+		desktopManager.gnome.enable = true;
+	};
+
+	environment.systemPackages = with pkgs; [
+		gnomeExtensions.gsconnect
+	];
+}

nixos/desktop-sway.nix

@@ -2,14 +2,6 @@
 {
 	imports = [./desktop.nix];
 
-	services.pipewire = {
-		enable = true;
-		alsa.enable = true;
-		# alsa.support32bit = true;
-		pulse.enable = true;
-	};
-	environment.systemPackages = [ pkgs.pulseaudio-modules-bt ];
-
 	programs.sway = {
 		enable = true;
 		wrapperFeatures = { gtk = true; };
@@ -33,6 +25,7 @@
 			slurp
 		];
 	};
+
 	xdg.portal.wlr = {
 		enable = true;
 		settings.screencast = {
@@ -51,12 +44,6 @@
 		enable = true;
 		# openFirewall = true; - by enable
 	};
-	programs.browserpass.enable = true;
-	programs.gnupg.agent = {
-		enable = true;
-		enableSSHSupport = true;
-		pinentryFlavor = "gnome3";
-	};
 
 	# services.acpid.enable = true;
 

nixos/desktop.nix

@@ -51,11 +51,26 @@
 
 	hardware.bluetooth.enable = true;
 	sound.enable = true;
+	hardware.pulseaudio.enable = false; #use pipewire
+	services.pipewire = {
+		enable = true;
+		alsa.enable = true;
+		# alsa.support32bit = true;
+		pulse.enable = true;
+	};
 
 	environment.systemPackages = with pkgs; [
 		iw
+		pulseaudio-modules-bt
 	];
 
+	programs.browserpass.enable = true;
+
 	# smartcard
 	services.pcscd.enable = true;
+	programs.gnupg.agent = {
+		enable = true;
+		enableSSHSupport = true;
+		pinentryFlavor = "gnome3";
+	};
 }