diff --git a/nixos/boxes/foureighty/configuration.nix b/nixos/boxes/foureighty/configuration.nix
index c1dc17c2..750eabfa 100644
--- a/nixos/boxes/foureighty/configuration.nix
+++ b/nixos/boxes/foureighty/configuration.nix
@@ -33,11 +33,11 @@
     /etc/nixos/hardware-configuration.nix
     ../../boot.nix
     ../../common.nix
-    ../../gfx-intel.nix
+    ../../gfx-nvidia-optimus.nix
     ../../zerotier.nix
     ../../distributed-builds.nix
     ../../libvirt.nix
-    ../../i3/system.nix
+    ../../gnome/system.nix
     ../../backups.nix
   ];
 
diff --git a/nixos/boxes/foureighty/home.nix b/nixos/boxes/foureighty/home.nix
index 945bb458..a914aab6 100644
--- a/nixos/boxes/foureighty/home.nix
+++ b/nixos/boxes/foureighty/home.nix
@@ -20,7 +20,7 @@ in
       ../../home-common.nix
       ../../programs/git.nix
       ../../gui.nix
-      ../../i3/home.nix
+      ../../gnome/home.nix
     ];
 
   }
diff --git a/nixos/gfx-nvidia-optimus.nix b/nixos/gfx-nvidia-optimus.nix
index 49a2b4ec..965b2b91 100644
--- a/nixos/gfx-nvidia-optimus.nix
+++ b/nixos/gfx-nvidia-optimus.nix
@@ -12,6 +12,9 @@ in
     environment.systemPackages = [ nvidia-offload ];
 
     services.xserver.videoDrivers = [ "nvidia" ];
+    hardware.opengl = { enable = true; };
+
+    hardware.nvidia.modesetting.enable = true;
     hardware.nvidia.prime.offload.enable = true;
     hardware.nvidia.prime = {
       intelBusId = "PCI:0:2:0";
diff --git a/nixos/gnome/system.nix b/nixos/gnome/system.nix
index efffa444..b812d68f 100644
--- a/nixos/gnome/system.nix
+++ b/nixos/gnome/system.nix
@@ -3,10 +3,11 @@
   services.xserver = {
     enable = true;
     displayManager.gdm.enable = true;
-    displayManager.gdm.wayland = false;
+    displayManager.gdm.wayland = true;
+    displayManager.gdm.nvidiaWayland = true;
     desktopManager.gnome3.enable = true;
   };
-  services.dbus.packages = with pkgs; [ gnome2.GConf ];
+  services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.dconf ];
   users.users.cyryl.packages = with pkgs; [];
 }
 
diff --git a/nixos/gui.nix b/nixos/gui.nix
index eb1cc4c5..4389fa99 100644
--- a/nixos/gui.nix
+++ b/nixos/gui.nix
@@ -26,11 +26,12 @@
     mindforger
     evince signal-desktop
     vlc
-    jetbrains.goland unstable.jetbrains.clion jetbrains.idea-ultimate unstable.android-studio
+    jetbrains.goland jetbrains.clion jetbrains.idea-ultimate android-studio
     yubico-piv-tool yubikey-personalization yubikey-personalization-gui yubikey-manager-qt
     slack discord gnome3.nautilus gnome3.eog
     hopper
-    unstable.qemu unstable.aqemu unstable.foldingathome
+    qemu aqemu foldingathome
     spotify shotwell
+    gnome-builder flatpak-builder flatpak python38Packages.lxml python38Packages.jedi meson
   ];
 }