diff --git a/gnome3.nix b/gnome3.nix
index b2f82b0..54da262 100644
--- a/gnome3.nix
+++ b/gnome3.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./pulseaudio.nix
+    ./pipewire.nix
   ];
 
   i18n.inputMethod = {
@@ -11,12 +11,15 @@
   };
 
   environment.systemPackages = with pkgs; [
-    gnome3.libgweather
-    gnome3.gnome-tweak-tool
+    gnome.gnome-tweaks
     pavucontrol
     paprefs
+    playerctl
+    xorg.xlsclients
   ];
 
+  hardware.pulseaudio.enable = false;
+
   fonts = {
     enableDefaultFonts = false;
     fontconfig = {
@@ -81,11 +84,11 @@
 
   services.xserver = {
     enable = true;
-    libinput.enable = true;
+    # libinput.enable = true;
     displayManager.gdm.enable = true;
-    displayManager.defaultSession = "gnome";
+    # displayManager.defaultSession = "gnome";
 
-    desktopManager.gnome3 = {
+    desktopManager.gnome = {
       enable = true;
     };
   };