diff --git a/hosts/mobile-usb/default.nix b/hosts/mobile-usb/default.nix
index 783faf1..0862fb5 100644
--- a/hosts/mobile-usb/default.nix
+++ b/hosts/mobile-usb/default.nix
@@ -5,6 +5,7 @@
             networking.hostName = "nichts";
 
             userName = "remy";
+            gnome.enabled = true;
         };
     };
 
@@ -13,11 +14,12 @@
         ./configuration.nix
         ./hardware-configuration.nix
 
+        # ../../modules/nixos/backup.nix
         ../../modules/nixos/bluetooth.nix
         ../../modules/nixos/flakes.nix
         ../../modules/nixos/flatpak.nix
         ../../modules/nixos/fonts.nix
-        ../../modules/nixos/hyprland.nix
+        ../../modules/nixos/gnome.nix
         ../../modules/nixos/language.nix
         ../../modules/nixos/ld.nix
         ../../modules/nixos/monitoring.nix
@@ -27,12 +29,11 @@
         ../../modules/nixos/podman.nix
         ../../modules/nixos/power.nix
         ../../modules/nixos/stylix.nix
-        ../../modules/nixos/usb_config.nix
         ../../modules/nixos/user.nix
 
-
         ../../utils/binary-cache.nix
         ../../utils/garbage-collection.nix
         ../../utils/unfree.nix
     ];
 }
+
diff --git a/modules/nixos/gnome.nix b/modules/nixos/gnome.nix
new file mode 100644
index 0000000..de5936a
--- /dev/null
+++ b/modules/nixos/gnome.nix
@@ -0,0 +1,31 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  options.nix-config.gnome.enable = lib.mkOption {
+    type = lib.types.bool;
+    default = false;
+    description = "Enable GNOME desktop environment.";
+  };
+  config = lib.mkIf config.nix-config.gnome.enable {
+    services = {
+      displayManager.gdm.enable = true;
+      desktopManager.gnome.enable = true;
+
+      gnome = {
+        core-apps.enable = false;
+        core-developer-tools.enable = false;
+        games.enable = false;
+      };
+
+      # Exclude some packages to keep the installation lean
+      environment.gnome.excludePackages = with pkgs; [
+        gnome-tour
+        gnome-user-docs
+      ];
+    };
+  };
+}
diff --git a/modules/nixos/podman.nix b/modules/nixos/podman.nix
index 59609e6..1f81e60 100644
--- a/modules/nixos/podman.nix
+++ b/modules/nixos/podman.nix
@@ -1,24 +1,24 @@
 {
-    config,
-    lib,
-    pkgs,
-    ...
+  config,
+  lib,
+  pkgs,
+  ...
 }:
 {
-    virtualisation.containers.enable = true;
-    virtualisation = {
-      podman = {
-        enable = true;
+  virtualisation.containers.enable = true;
+  virtualisation = {
+    podman = {
+      enable = true;
 
-        dockerCompat = false;
+      dockerCompat = false;
 
-        # Required for containers under podman-compose to be able to talk to each other.
-        defaultNetwork.settings.dns_enabled = true;
-      };
+      # Required for containers under podman-compose to be able to talk to each other.
+      defaultNetwork.settings.dns_enabled = true;
     };
+  };
 
-    # Useful other development tools
-    environment.systemPackages = with pkgs; [
-      podman-compose # start group of containers for dev
-    ];
+  # Useful other development tools
+  environment.systemPackages = with pkgs; [
+    podman-compose # start group of containers for dev
+  ];
 }
diff --git a/users/remy_yoga/default.nix b/users/remy_yoga/default.nix
index a7f3b50..d41a88b 100644
--- a/users/remy_yoga/default.nix
+++ b/users/remy_yoga/default.nix
@@ -1,4 +1,4 @@
-{ config, nixpkgs, nixpkgs-unstable, lib, ... }:
+{ config, nixpkgs, lib, ... }:
 with lib.hm.gvariant;
 {
   config = {