From c19f0ef0e12b74c624e9ae8547ef32b0c9e278f2 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Thu, 15 Aug 2024 23:33:15 +0800
Subject: [PATCH] dust/sway: disable xwayland

---
 home/applications/sway/default.nix | 6 +-----
 hosts/dust/default.nix             | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/home/applications/sway/default.nix b/home/applications/sway/default.nix
index a7f5194..05acfe8 100644
--- a/home/applications/sway/default.nix
+++ b/home/applications/sway/default.nix
@@ -35,12 +35,8 @@
     checkConfig = false; # wtf?
     wrapperFeatures.gtk = true;
     systemd.xdgAutostart = true;
+    xwayland = false;
     config = {
-      ### Startup
-      startup = [
-        {command = "systemctl --user import-environment PATH";}
-      ];
-
       ### Visuals
       output."*".bg = "${inputs.self.legacyPackages.${pkgs.stdenv.hostPlatform.system}.background} fill";
       bars = [
diff --git a/hosts/dust/default.nix b/hosts/dust/default.nix
index acfed69..dcdd207 100644
--- a/hosts/dust/default.nix
+++ b/hosts/dust/default.nix
@@ -129,10 +129,7 @@
   services.greetd = {
     enable = true;
     settings.default_session.command = "${lib.getExe pkgs.greetd.tuigreet} --cmd ${pkgs.writeShellScript "sway" ''
-      while read -r l; do
-        eval export $l
-      done < <(/run/current-system/systemd/lib/systemd/user-environment-generators/30-systemd-environment-d-generator)
-
+      dbus-update-activation-environment --all --systemd
       exec systemd-cat --identifier=sway sway
     ''}";
   };