Adjust config for pc wayland

nixos-configurations/laptop/default.nix

@@ -9,16 +9,18 @@
 
     networking.hostName = "laptop";
 
-    hardware = {
-      bluetooth.enable = true;
-      firmware = [ pkgs.broadcom-bt-firmware ];
+    services.xserver = {
+      enable = true;
+      windowManager.i3 = {
+        enable = true;
       };
-
-    services = {
-      xserver = {
       libinput.enable = true;
       videoDrivers = [ "modesetting" "nvidia" ];
     };
+
+    hardware = {
+      bluetooth.enable = true;
+      firmware = [ pkgs.broadcom-bt-firmware ];
     };
 
     boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];

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 = {

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";
 }
-