diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index fe7fff2..0340bfb 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -55,8 +55,10 @@ in
       xserver = {
         enable = true;
 
-        layout = "us";
-        xkbVariant = "altgr-intl";
+        xkb = {
+          layout = "us";
+          variant = "altgr-intl";
+        };
 
         libinput = {
           enable = true;
diff --git a/modules/flatpak.nix b/modules/flatpak.nix
index cd44ac7..e3683fe 100644
--- a/modules/flatpak.nix
+++ b/modules/flatpak.nix
@@ -14,6 +14,8 @@ in
       services.flatpak.enable = true;
       xdg.portal = {
         enable = true;
+        # TODO
+        config.common.default = "*";
         extraPortals = [
           pkgs.xdg-desktop-portal-gtk
         ];