diff --git a/hosts/nb-01.cloonar.com/configuration.nix b/hosts/nb-01.cloonar.com/configuration.nix
index 6a591d6..0b38399 100644
--- a/hosts/nb-01.cloonar.com/configuration.nix
+++ b/hosts/nb-01.cloonar.com/configuration.nix
@@ -79,6 +79,24 @@
     127.0.0.1 test.cloonar.com
   '';
 
+  services.xserver = {
+    enable = true;
+    excludePackages = [ pkgs.xterm ];
+    displayManager.gdm.enable = true;
+    displayManager.gdm.wayland = true;
+    # displayManager.sddm.enable = true;
+    displayManager.sessionPackages = [ pkgs.sway ];
+    displayManager.defaultSession = "sway";
+    libinput.enable = true;
+    desktopManager.gnome = {
+      enable = true;
+      extraGSettingsOverrides = ''
+        [org.gnome.desktop.interface]
+        gtk-theme='Dracula'
+      '';
+    };
+  };
+
   # Set your time zone.
   time.timeZone = "Europe/Vienna";
   console.keyMap = "de";
diff --git a/hosts/nb-01.cloonar.com/modules/sway/sway.nix b/hosts/nb-01.cloonar.com/modules/sway/sway.nix
index 39fd0b8..e1298b0 100644
--- a/hosts/nb-01.cloonar.com/modules/sway/sway.nix
+++ b/hosts/nb-01.cloonar.com/modules/sway/sway.nix
@@ -24,24 +24,6 @@ in {
     hardware.sane.enable = true;
     hardware.pulseaudio.enable = false;
 
-    services.xserver = {
-      enable = true;
-      excludePackages = [ pkgs.xterm ];
-      displayManager.gdm.enable = true;
-      displayManager.gdm.wayland = true;
-      # displayManager.sddm.enable = true;
-      displayManager.sessionPackages = [ pkgs.sway ];
-      displayManager.defaultSession = "sway";
-      libinput.enable = true;
-      desktopManager.gnome = {
-        enable = true;
-        extraGSettingsOverrides = ''
-          [org.gnome.desktop.interface]
-          gtk-theme='Dracula'
-        '';
-      };
-    };
-
     services.teamviewer.enable = true;
     services.gnome.gnome-keyring.enable = true;
 
diff --git a/hosts/steamdeck.cloonar.com/configuration.nix b/hosts/steamdeck.cloonar.com/configuration.nix
index 38c7a46..ad84264 100644
--- a/hosts/steamdeck.cloonar.com/configuration.nix
+++ b/hosts/steamdeck.cloonar.com/configuration.nix
@@ -13,6 +13,7 @@
     )
 
     ./utils/bento.nix
+    ./modules/sway/sway.nix
 
     ./hardware-configuration.nix
   ];
@@ -24,14 +25,12 @@
     "steam-run"
   ];
 
-  services.xserver.windowManager.i3.enable = true;
   programs.sway.enable = true;
 
   jovian.steam = {
     enable = true;
     autoStart = true;
     user = "dominik";
-    desktopSession = "sway";
   };
 
   # Bootloader.
diff --git a/hosts/steamdeck.cloonar.com/modules/sway b/hosts/steamdeck.cloonar.com/modules/sway
new file mode 120000
index 0000000..288a845
--- /dev/null
+++ b/hosts/steamdeck.cloonar.com/modules/sway
@@ -0,0 +1 @@
+../../nb-01.cloonar.com/modules/sway
\ No newline at end of file