diff --git a/home-manager/shared/wayland/sway/default.nix b/home-manager/shared/wayland/sway/default.nix
index 2e7d2bd..2aba3c5 100644
--- a/home-manager/shared/wayland/sway/default.nix
+++ b/home-manager/shared/wayland/sway/default.nix
@@ -1,4 +1,4 @@
-{ home-manager, config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
   home.packages = with pkgs; [
     wl-clipboard
@@ -6,6 +6,11 @@
     gammastep
     sway-contrib.grimshot
   ];
+  home.sessionVariables = {
+    # needed for Sway and Firefox to play nice
+    XDG_CURRENT_DESKTOP = "sway";
+    MOZ_DBUS_REMOTE=1;
+  };
   systemd.user.services.autotiling = {
     Install = {
       WantedBy = [ "sway-session.target" ];
diff --git a/home-manager/shared/wayland/xdg/default.nix b/home-manager/shared/wayland/xdg/default.nix
index 44e97f7..b51164b 100755
--- a/home-manager/shared/wayland/xdg/default.nix
+++ b/home-manager/shared/wayland/xdg/default.nix
@@ -17,26 +17,11 @@
       "image/png" = "librewolf.desktop";
       "application/epub" = "librewolf.desktop";
       "application/pdf" = "librewolf.desktop";
-      "application/x-extension-htm" = "librewolf.desktop";
-      "application/x-extension-html" = "librewolf.desktop";
-      "application/x-extension-shtml" = "librewolf.desktop";
-      "application/xhtml+xml" = "librewolf.desktop";
-      "application/x-extension-xhtml" = "librewolf.desktop";
-      "application/x-extension-xht" = "librewolf.desktop";
-      "x-scheme-handler/about" = "librewolf.desktop";
-      "x-scheme-handler/unknown" = "librewolf.desktop";
     };
     associations.added = {
       "x-scheme-handler/http" = "librewolf.desktop";
       "x-scheme-handler/https" = "librewolf.desktop";
       "x-scheme-handler/chrome" = "librewolf.desktop";
-      "text/html" = "librewolf.desktop;";
-      "application/x-extension-htm" = "librewolf.desktop;";
-      "application/x-extension-html" = "librewolf.desktop;";
-      "application/x-extension-shtml" = "librewolf.desktop;";
-      "application/xhtml+xml" = "librewolf.desktop;";
-      "application/x-extension-xhtml" = "librewolf.desktop;";
-      "application/x-extension-xht" = "librewolf.desktop;";
     };
   };
 }
diff --git a/nixos/t14/configuration.nix b/nixos/t14/configuration.nix
index d095cf1..88f0bf7 100755
--- a/nixos/t14/configuration.nix
+++ b/nixos/t14/configuration.nix
@@ -1,4 +1,4 @@
-{ pkgs, nixos-hardware, host, ... }:
+{ pkgs, ... }:
 {
   imports =
     [ 
@@ -36,19 +36,21 @@
     };
     services.flatpak.enable = true;
     services.dbus.enable = true;
-    xdg = {
-      portal = {
+    xdg.portal = {
         enable = true;
         xdgOpenUsePortal = true;
         wlr.enable = true;
+        extraPortals = [
+            pkgs.xdg-desktop-portal-gtk
+            pkgs.xdg-desktop-portal-wlr
+        ];
         config = {
           common = {
             default = [
-              "wlr"
+              "*"
             ];
           };
         };
-      };
     };
     hardware.opengl.enable = true;
     hardware.opengl.extraPackages = [