From f9f463041f7a5e5fcf7efd5b2cd0a63afe813154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Gro=C3=9Fmann?= <patrickdgro@gmail.com>
Date: Mon, 4 Dec 2023 22:30:07 +0100
Subject: [PATCH] fix: xdg desktop portal cannot find firefox

---
 modules/graphical/default.nix       | 3 +++
 modules/optional/wayland.nix        | 1 -
 users/common/graphical/Xorg/i3.nix  | 2 +-
 users/common/graphical/Xorg/xinitrc | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index 80f805e..eb70521 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -23,6 +23,9 @@ in {
   ];
 
   config = {
+    environment.systemPackages = with pkgs; [
+      xdg-utils
+    ];
     xdg.portal = {
       enable = true;
       extraPortals = with pkgs; [
diff --git a/modules/optional/wayland.nix b/modules/optional/wayland.nix
index 38b0b97..5881ccb 100644
--- a/modules/optional/wayland.nix
+++ b/modules/optional/wayland.nix
@@ -7,7 +7,6 @@
 lib.optionalAttrs (!minimal) {
   services.dbus.enable = true;
   environment.systemPackages = with pkgs; [
-    xdg-utils
     wdisplays
     wl-clipboard
   ];
diff --git a/users/common/graphical/Xorg/i3.nix b/users/common/graphical/Xorg/i3.nix
index c77e541..1f81548 100644
--- a/users/common/graphical/Xorg/i3.nix
+++ b/users/common/graphical/Xorg/i3.nix
@@ -18,7 +18,7 @@
         {command = "xrandr --output DVI-D-0 --mode 1920x1080 --pos 0x0 --rate 60.00 --output DP-4 --mode 2560x1440 --pos 1920x720 --primary --rate 144 --output HDMI-0 --pos 0x1080 --rate 60.00";}
         {command = "systemctl --user start set-wallpaper.timer streamdeck.service";}
         {
-          command = "${pkgs.systemd}/bin/systemctl --user import-environment DISPLAY; ${pkgs.systemd}/bin/systemctl --user start i3-session.target";
+          command = "${pkgs.systemd}/bin/systemctl --user start i3-session.target";
           always = false;
           notification = false;
         }
diff --git a/users/common/graphical/Xorg/xinitrc b/users/common/graphical/Xorg/xinitrc
index 1954e73..67b849b 100644
--- a/users/common/graphical/Xorg/xinitrc
+++ b/users/common/graphical/Xorg/xinitrc
@@ -9,10 +9,10 @@
 if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
 	eval $(dbus-launch --exit-with-session --sh-syntax)
 fi
-systemctl --user import-environment DISPLAY XAUTHORITY
+systemctl --user import-environment PATH DISPLAY XAUTHORITY XDG_CONFIG_DIRS XDG_DATA_DIRS XDG_RUNTIME_DIR XDG_SESSION_ID DBUS_SESSION_BUS_ADDRESS || true
 
 if command -v dbus-update-activation-environment >/dev/null 2>&1; then
-        dbus-update-activation-environment DISPLAY XAUTHORITY
+        dbus-update-activation-environment --systemd --all
 fi
 
 # I3 does no start graphical session.target because ????