From 2db41e0489a39761595b00ed1f9f48989952b237 Mon Sep 17 00:00:00 2001
From: genofire <geno+dev@fireorbit.de>
Date: Fri, 26 Nov 2021 20:03:09 +0100
Subject: [PATCH] nixos: add gnome

---
 nixos/desktop-gnome.nix | 13 +++++++++++++
 nixos/desktop-sway.nix  | 15 +--------------
 nixos/desktop.nix       | 15 +++++++++++++++
 3 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 nixos/desktop-gnome.nix

diff --git a/nixos/desktop-gnome.nix b/nixos/desktop-gnome.nix
new file mode 100644
index 0000000..3f1a630
--- /dev/null
+++ b/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
+	];
+}
diff --git a/nixos/desktop-sway.nix b/nixos/desktop-sway.nix
index 2ae96e5..be98f96 100644
--- a/nixos/desktop-sway.nix
+++ b/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;
 
diff --git a/nixos/desktop.nix b/nixos/desktop.nix
index d4d3744..1af5a19 100644
--- a/nixos/desktop.nix
+++ b/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";
+	};
 }