diff --git a/nixos/boxes/foureighty/default.nix b/nixos/boxes/foureighty/default.nix
index f1164d17..95d56ee9 100644
--- a/nixos/boxes/foureighty/default.nix
+++ b/nixos/boxes/foureighty/default.nix
@@ -5,15 +5,15 @@
     inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480
     ./hardware-configuration.nix
     ./thermal.nix
-    ../../gfx-intel-dri2.nix
     ../../backups.nix
     ../../boot.nix
     ../../distributed-builds.nix
+    ../../gfx-intel-dri2.nix
     ../../git
+    ../../gnome
     ../../gui
     ../../libvirt.nix
     ../../mercurial
-    ../../sway
   ];
 
   fileSystems."/" = { options = [ "compress=zstd" ]; };
diff --git a/nixos/gnome/system.nix b/nixos/gnome/system.nix
index 68dba720..63ae2719 100644
--- a/nixos/gnome/system.nix
+++ b/nixos/gnome/system.nix
@@ -1,17 +1,11 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{ config, pkgs, ... }: {
   services.xserver = {
     enable = true;
     displayManager.gdm.enable = true;
     displayManager.gdm.wayland = true;
-    displayManager.gdm.nvidiaWayland = true;
-    desktopManager.gnome3.enable = true;
+    desktopManager.gnome.enable = true;
   };
   services.flatpak.enable = true;
-  services.dbus.packages = with pkgs; [gnome2.GConf gnome3.dconf gcr];
   users.users.cyryl.packages = with pkgs.gnomeExtensions; [
     caffeine
     clipboard-indicator