diff --git a/flake.nix b/flake.nix
index 267e260..9566a13 100644
--- a/flake.nix
+++ b/flake.nix
@@ -144,12 +144,13 @@
             self.nixosModules.niri
             self.nixosModules.kdeconnect
             self.nixosModules.en-de
+            self.nixosModules.adwaita
+            self.nixosModules.gnome
             ./modules/home-manager.nix
 
             home-manager.nixosModules.home-manager
             servicepoint-simulator.nixosModules.default
             servicepoint-cli.nixosModules.default
-
           ]);
         }
       );
diff --git a/modules/gnome.nix b/modules/gnome.nix
index ddca6b0..507247d 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -1,36 +1,6 @@
 { pkgs, ... }:
 {
   config = {
-    services = {
-      xserver = {
-        # Enable the GNOME Desktop Environment.
-        desktopManager.gnome = {
-          enable = true;
-          extraGSettingsOverridePackages = [ pkgs.mutter ];
-          extraGSettingsOverrides = ''
-            [org.gnome.mutter]
-            experimental-features=['scale-monitor-framebuffer']
-          '';
-        };
-        displayManager.gdm.enable = true;
-        excludePackages = with pkgs; [ xterm ];
-      };
-
-      displayManager.defaultSession = "gnome";
-
-      gnome = {
-        tinysparql.enable = false;
-        localsearch.enable = false;
-        sushi.enable = true;
-        gnome-remote-desktop.enable = true;
-      };
-    };
-
-    programs = {
-      dconf.enable = true;
-      gpaste.enable = true;
-    };
-
     # remove some gnome default apps
     environment.gnome.excludePackages = with pkgs; [
       cheese # photo booth
@@ -53,6 +23,7 @@
     ];
 
     # RDP connections
+    services.gnome.gnome-remote-desktop.enable = true;
     networking.firewall.allowedTCPPorts = [ 3389 ];
 
     home-manager.sharedModules = [
@@ -79,16 +50,6 @@
           ]);
 
         dconf.settings = import ./gnome-shared-dconf.nix;
-
-        gtk = {
-          enable = true;
-          iconTheme.name = "Adwaita";
-          cursorTheme.name = "Adwaita";
-          theme = {
-            name = "adw-gtk3-dark";
-            package = pkgs.adw-gtk3;
-          };
-        };
       }
 
       {
diff --git a/nixosModules/adwaita.nix b/nixosModules/adwaita.nix
new file mode 100644
index 0000000..96d24c7
--- /dev/null
+++ b/nixosModules/adwaita.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  gtk = {
+    enable = true;
+    iconTheme.name = "Adwaita";
+    cursorTheme.name = "Adwaita";
+    theme = {
+      name = "adw-gtk3-dark";
+      package = pkgs.adw-gtk3;
+    };
+  };
+}
diff --git a/nixosModules/gnome.nix b/nixosModules/gnome.nix
new file mode 100644
index 0000000..3afe9ce
--- /dev/null
+++ b/nixosModules/gnome.nix
@@ -0,0 +1,31 @@
+{ pkgs, ... }:
+{
+  services = {
+    xserver = {
+      # Enable the GNOME Desktop Environment.
+      desktopManager.gnome = {
+        enable = true;
+        extraGSettingsOverridePackages = [ pkgs.mutter ];
+        extraGSettingsOverrides = ''
+          [org.gnome.mutter]
+          experimental-features=['scale-monitor-framebuffer']
+        '';
+      };
+      displayManager.gdm.enable = true;
+      excludePackages = [ pkgs.xterm ];
+    };
+
+    displayManager.defaultSession = "gnome";
+
+    gnome = {
+      tinysparql.enable = false;
+      localsearch.enable = false;
+      sushi.enable = true;
+    };
+  };
+
+  programs = {
+    dconf.enable = true;
+    gpaste.enable = true;
+  };
+}