From 4ce1bc851be77aa381b71fd0a2be2518a3eaeda4 Mon Sep 17 00:00:00 2001
From: thiloho <123883702+thiloho@users.noreply.github.com>
Date: Thu, 1 Jun 2023 23:51:51 +0200
Subject: [PATCH] Adjust config for pc wayland

---
 nixos-configurations/laptop/default.nix | 16 +++++++++-------
 nixos-configurations/pc/default.nix     |  8 ++++++--
 nixos-configurations/shared.nix         | 10 +---------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/nixos-configurations/laptop/default.nix b/nixos-configurations/laptop/default.nix
index 0c0e5e3..94c5074 100644
--- a/nixos-configurations/laptop/default.nix
+++ b/nixos-configurations/laptop/default.nix
@@ -9,18 +9,20 @@
 
     networking.hostName = "laptop";
 
+    services.xserver = {
+      enable = true;
+      windowManager.i3 = {
+        enable = true;
+      };
+      libinput.enable = true;
+      videoDrivers = [ "modesetting" "nvidia" ];
+    };
+
     hardware = {
       bluetooth.enable = true;
       firmware = [ pkgs.broadcom-bt-firmware ];
     };
 
-    services = {
-      xserver = {
-        libinput.enable = true;
-        videoDrivers = [ "modesetting" "nvidia" ];
-      };
-    };
-
     boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
 
     home-manager.users.thiloho = { pkgs, ... }: {
diff --git a/nixos-configurations/pc/default.nix b/nixos-configurations/pc/default.nix
index 5125f83..78e8f35 100644
--- a/nixos-configurations/pc/default.nix
+++ b/nixos-configurations/pc/default.nix
@@ -7,10 +7,14 @@
       ../shared.nix
     ];
 
-    services.xserver.windowManager.i3.extraSessionCommands = "xrandr --output DP-1 --left-of DP-2 --mode 1920x1080 --rate 144 --output DP-2 --mode 1920x1080 --rate 144";
-
     networking.hostName = "pc";
 
+    services.xserver = {
+      enable = true;
+      desktopManager.gnome.enable = true;
+      displayManager.gdm.enable = true;
+    };
+
     home-manager.users.thiloho = { pkgs, ... }: {
       programs.git = {
         signing = {
diff --git a/nixos-configurations/shared.nix b/nixos-configurations/shared.nix
index ee52032..9d60459 100644
--- a/nixos-configurations/shared.nix
+++ b/nixos-configurations/shared.nix
@@ -19,12 +19,6 @@
   };
 
   services = {
-    xserver = {
-      enable = true;
-      windowManager.i3 = {
-        enable = true;
-      };
-    };
     pipewire = {
       enable = true;
       alsa.enable = true;
@@ -53,7 +47,7 @@
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
-    pinentryFlavor = "gtk2";
+    # pinentryFlavor = "gtk2";
   };
 
   # Home manager configuration
@@ -103,7 +97,6 @@
         zoom-us
         libreoffice
         google-chrome
-        rustdesk
         airshipper
       ];
     };
@@ -111,4 +104,3 @@
 
   system.stateVersion = "22.11";
 }
-