diff --git a/modules/gnome.nix b/modules/gnome.nix
index 1ad2995..1a6b784 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -8,5 +8,25 @@ lib.mkIf (config.jalr.gui.enable && config.jalr.gui.gnome.enable) {
       enable = true;
       autoSuspend = false;
     };
+    exportConfiguration = true;
   };
+
+  /*
+    programs.dconf = {
+    enable = true;
+    profiles = {
+      user.databases = [{
+        settings = with lib.gvariant; {
+          "org/gnome/desktop/input-sources" = {
+            sources = [
+              (mkTuple [ "xkb" "de" ])
+              (mkTuple [ "xkb" "de+neo" ])
+              (mkTuple [ "xkb" "us" ])
+            ];
+          };
+        };
+      }];
+    };
+    };
+  */
 }
diff --git a/modules/sway.nix b/modules/sway.nix
index 0d12723..dbd37fe 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -1,6 +1,8 @@
 { config, lib, pkgs, ... }:
 
 lib.mkIf (config.jalr.gui.enable && config.jalr.gui.sway.enable) {
+  services.displayManager.sessionPackages = [ pkgs.sway ];
+
   programs = {
     wshowkeys.enable = true;
     dconf.enable = true;
@@ -12,7 +14,7 @@ lib.mkIf (config.jalr.gui.enable && config.jalr.gui.sway.enable) {
   };
 
   services.greetd = {
-    enable = true;
+    enable = !config.jalr.gui.gnome.enable;
     settings =
       let
         command = pkgs.writeShellScript "sway-init" ''
diff --git a/users/jalr/modules/dconf.nix b/users/jalr/modules/dconf.nix
new file mode 100644
index 0000000..eed759c
--- /dev/null
+++ b/users/jalr/modules/dconf.nix
@@ -0,0 +1,15 @@
+{ lib, nixosConfig, ... }:
+
+lib.mkIf nixosConfig.jalr.gui.enable {
+  dconf.settings = {
+    "org/gnome/desktop/input-sources" = {
+      xkb-options = [ "grp:win_space_toggle" ];
+      show-all-sources = true;
+      sources = [
+        (lib.hm.gvariant.mkTuple [ "xkb" "de" ])
+        (lib.hm.gvariant.mkTuple [ "xkb" "de+neo" ])
+        (lib.hm.gvariant.mkTuple [ "xkb" "us" ])
+      ];
+    };
+  };
+}
diff --git a/users/jalr/modules/default.nix b/users/jalr/modules/default.nix
index 0d9f98e..93aa653 100644
--- a/users/jalr/modules/default.nix
+++ b/users/jalr/modules/default.nix
@@ -6,6 +6,7 @@
     ./aws.nix
     ./cli
     ./communication
+    ./dconf.nix
     ./direnv.nix
     ./do-not-disturb
     ./dynamic-colors.nix
diff --git a/users/jalr/modules/sway/default.nix b/users/jalr/modules/sway/default.nix
index 2ca9a9d..2202b71 100644
--- a/users/jalr/modules/sway/default.nix
+++ b/users/jalr/modules/sway/default.nix
@@ -101,6 +101,12 @@ in
       terminal = "${terminalEmulator}";
       menu = "${pkgs.wofi}/bin/wofi --allow-images --show drun --color=$HOME/.config/wofi/color";
 
+      input."type:keyboard" = {
+        xkb_layout = "de,de,us";
+        xkb_variant = "neo,,";
+        xkb_options = "grp:win_space_toggle";
+      };
+
       output = {
         "*".bg = "${wallpaper} fill";
       } // matchHostname "copper" {