From 1a14d17ae2b6d869f6f27aacf958b7d58cb1c0d6 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Wed, 24 Nov 2021 00:17:20 +0300
Subject: [PATCH] Update dbus environment

---
 profiles/applications/slack.nix     | 10 ++++++++++
 profiles/workspace/sway/default.nix | 11 +++--------
 roles/desktop.nix                   |  1 +
 3 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 profiles/applications/slack.nix

diff --git a/profiles/applications/slack.nix b/profiles/applications/slack.nix
new file mode 100644
index 0000000..0eaa93e
--- /dev/null
+++ b/profiles/applications/slack.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }: {
+  home-manager.users.balsoft.wayland.windowManager.sway.config.startup = [{
+    command = toString (pkgs.writeShellScript "slack" ''
+      firefox https://tweag.slack.com &
+      sleep 10
+      swaymsg '[title=Slack.*] move to workspace '
+      swaymsg '[title=Slack.*] fullscreen disable'
+    '');
+  }];
+}
diff --git a/profiles/workspace/sway/default.nix b/profiles/workspace/sway/default.nix
index 76f3a2d..281153f 100755
--- a/profiles/workspace/sway/default.nix
+++ b/profiles/workspace/sway/default.nix
@@ -93,18 +93,13 @@ in {
       };
       startup = (map (command: { inherit command; }) config.startupApplications)
         ++ [
-          {
-            command = toString (pkgs.writeShellScript "slack" ''
-              firefox https://tweag.slack.com &
-              sleep 10
-              swaymsg '[title=Slack.*] move to workspace '
-              swaymsg '[title=Slack.*] fullscreen disable'
-            '');
-          }
           {
             command =
               "swayidle -w before-sleep '${lock_fork}' lock '${lock_fork}' unlock 'pkill -9 swaylock'";
           }
+          {
+            command = "dbus-update-activation-environment --systemd WAYLAND_DISPLAY GDK_BACKEND";
+          }
         ];
 
       keybindings = let
diff --git a/roles/desktop.nix b/roles/desktop.nix
index 97addcd..4e3beab 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -34,6 +34,7 @@
     gtk
     i3blocks
     qt
+    slack
     kdeconnect
     light
     mako