From d7b1ece79d21c9fe0d0f3dbfb97d1e8b865156bb Mon Sep 17 00:00:00 2001
From: Benedikt Rips <benedikt.rips@gmail.com>
Date: Tue, 28 Oct 2025 22:19:24 +0100
Subject: [PATCH] xdg-portal: assert that required paths are linked on NixOS

---
 modules/misc/xdg-portal.nix | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/modules/misc/xdg-portal.nix b/modules/misc/xdg-portal.nix
index 5b24f251c..72d66376d 100644
--- a/modules/misc/xdg-portal.nix
+++ b/modules/misc/xdg-portal.nix
@@ -1,5 +1,6 @@
 {
   config,
+  osConfig,
   pkgs,
   lib,
   ...
@@ -31,14 +32,14 @@ in
       description = ''
         Whether to enable [XDG desktop integration](https://github.com/flatpak/xdg-desktop-portal).
 
-        Note, if you use the NixOS module and have `useUserPackages = true`,
-        make sure to add
+        Note, if you installed Home Manager via its NixOS module and
+        'home-manager.useUserPackages' is enabled, make sure to add
 
         ``` nix
         environment.pathsToLink = [ "/share/xdg-desktop-portal" "/share/applications" ];
         ```
 
-        to your system configuration so that the portal definitions and DE
+        to your NixOS configuration so that the portal definitions and DE
         provided configurations get linked.
       '';
     };
@@ -146,6 +147,25 @@ in
           assertion = cfg.extraPortals != [ ];
           message = "Setting xdg.portal.enable to true requires a portal implementation in xdg.portal.extraPortals such as xdg-desktop-portal-gtk or xdg-desktop-portal-kde.";
         }
+
+        {
+          assertion =
+            let
+              onNixos = pkgs.stdenv.hostPlatform.isLinux && config.submoduleSupport.enable;
+              isLinked = path: lib.elem path osConfig.environment.pathsToLink;
+            in
+            onNixos && osConfig.home-manager.useUserPackages
+            -> isLinked "/share/applications" && isLinked "/share/xdg-desktop-portal";
+          message = ''
+            xdg.portal: since you installed Home Manager via its NixOS module and
+            'home-manager.useUserPackages' is enabled, you need to add
+
+            environment.pathsToLink = [ `/share/applications` `/share/xdg-desktop-portal` ];
+
+            to your NixOS configuration so that the portal definitions and DE
+            provided configurations get linked.
+          '';
+        }
       ];
 
       home = {