diff --git a/src/home/default.nix b/src/home/default.nix
index 5e21144..0c3164e 100644
--- a/src/home/default.nix
+++ b/src/home/default.nix
@@ -66,8 +66,11 @@
       enable = true;
       userDirs.enable = true;
       mimeApps.enable = true;
+      configFile."mimeapps.list".force = true;
     };
 
+    systemd.user.sessionVariables = config.home.sessionVariables;
+
     custom = {
       persist = {
         home.directories = [
diff --git a/src/home/gui/default.nix b/src/home/gui/default.nix
index 807039c..3933212 100644
--- a/src/home/gui/default.nix
+++ b/src/home/gui/default.nix
@@ -9,7 +9,7 @@
     ./slack.nix
     ./skype.nix
     ./vscode.nix
-    ./xdg.nix
+    ./xdg-portal.nix
     ./zathura.nix
     ./zoom.nix
   ];
diff --git a/src/home/gui/firefox.nix b/src/home/gui/firefox.nix
index f013d51..48d07aa 100644
--- a/src/home/gui/firefox.nix
+++ b/src/home/gui/firefox.nix
@@ -26,6 +26,23 @@ in
     });
   };
 
+  xdg.mimeApps.defaultApplications = {
+    "application/pdf" = "firefox.desktop";
+    "application/x-extension-htm" = "firefox.desktop";
+    "application/x-extension-html" = "firefox.desktop";
+    "application/x-extension-shtml" = "firefox.desktop";
+    "application/x-extension-xht" = "firefox.desktop";
+    "application/x-extension-xhtml" = "firefox.desktop";
+    "application/xhtml+xml" = "firefox.desktop";
+    "image/jpeg" = "firefox.desktop";
+    "image/png" = "firefox.desktop";
+    "text/html" = "firefox.desktop";
+    "text/uri-list" = "firefox.desktop";
+    "x-scheme-handler/chrome" = "firefox.desktop";
+    "x-scheme-handler/http" = "firefox.desktop";
+    "x-scheme-handler/https" = "firefox.desktop";
+  };
+
   custom.persist = {
     home.directories = [
       ".cache/mozilla"
diff --git a/src/home/gui/xdg-portal.nix b/src/home/gui/xdg-portal.nix
new file mode 100644
index 0000000..9ebe2d1
--- /dev/null
+++ b/src/home/gui/xdg-portal.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+
+{
+  xdg.portal = {
+    enable = true;
+    xdgOpenUsePortal = true;
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-kde
+      xdg-desktop-portal-gnome
+      xdg-desktop-portal-gtk
+    ];
+    config = {
+      common = { default = [ "gtk" ]; };
+      gnome  = { default = [ "gnome" "gtk" ]; };
+    };
+  };
+}
diff --git a/src/home/gui/xdg.nix b/src/home/gui/xdg.nix
deleted file mode 100644
index b667aed..0000000
--- a/src/home/gui/xdg.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ pkgs, ... }:
-
-{
-  xdg = {
-    mimeApps = {
-      enable = true;
-      defaultApplications = {
-        "application/pdf" = "firefox.desktop";
-        "application/x-extension-htm" = "firefox.desktop";
-        "application/x-extension-html" = "firefox.desktop";
-        "application/x-extension-shtml" = "firefox.desktop";
-        "application/x-extension-xht" = "firefox.desktop";
-        "application/x-extension-xhtml" = "firefox.desktop";
-        "application/xhtml+xml" = "firefox.desktop";
-        "image/jpeg" = "firefox.desktop";
-        "image/png" = "firefox.desktop";
-        "text/html" = "firefox.desktop";
-        "text/uri-list" = "firefox.desktop";
-        "x-scheme-handler/chrome" = "firefox.desktop";
-        "x-scheme-handler/http" = "firefox.desktop";
-        "x-scheme-handler/https" = "firefox.desktop";
-      };
-    };
-    configFile."mimeapps.list".force = true;
-  };
-
-  xdg.portal = {
-    enable = true;
-    xdgOpenUsePortal = true;
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-kde
-      xdg-desktop-portal-gnome
-      xdg-desktop-portal-gtk
-    ];
-    config = {
-      common = { default = [ "gtk" ]; };
-      gnome  = { default = [ "gnome" "gtk" ]; };
-    };
-  };
-}
diff --git a/src/hosts/pickwick/home.nix b/src/hosts/pickwick/home.nix
index 2b2c72e..e2b9171 100644
--- a/src/hosts/pickwick/home.nix
+++ b/src/hosts/pickwick/home.nix
@@ -53,7 +53,6 @@
   # };
 
   # Wayland, X, etc. support for session vars
-  systemd.user.sessionVariables = config.home.sessionVariables;
 
   home.stateVersion = "24.11";
 }