diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix
index 02cf511..63ab149 100644
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@@ -40,14 +40,6 @@ in {
   home.sessionVariables.GOPATH = "$HOME/src/go";
   home.sessionVariables.PATH = pkgs.lib.concatStringsSep ":" ["$HOME/.local/bin" "$PATH"];
 
-  # workaround: usually created by 'home.xsession.enabled=true' and i don't use with gnome
-  systemd.user.targets.tray = {
-    Unit = {
-      Description = "Home Manager System Tray";
-      Requires = ["graphical-session-pre.target"];
-    };
-  };
-
   home.packages =
     []
     ++ (with pkgs; [
diff --git a/nix/home-manager/profiles/sway-desktop.nix b/nix/home-manager/profiles/sway-desktop.nix
index 96b4d51..c5d0c83 100644
--- a/nix/home-manager/profiles/sway-desktop.nix
+++ b/nix/home-manager/profiles/sway-desktop.nix
@@ -24,6 +24,8 @@ in {
     # flameshot.enable = true;
   };
 
+  services.gpg-agent.pinentryFlavor = "gnome3";
+
   home.packages = [
     pkgs.swayidle
     pkgs.swaylock
@@ -111,7 +113,7 @@ in {
         "${modifier}+Control+Shift+Up" =    "move workspace to output up";
         "${modifier}+Control+Shift+Down" =  "move workspace to output down";
 
-        "${modifier}+Shift+e" =  "exec swaymsg exit";
+        "${modifier}+Shift+e" =  "exec ${pkgs.sway}/bin/swaymsg exit";
         "${modifier}+q" = "kill";
         "${modifier}+x" = "exec ${swapOutputWorkspaces}";
 
@@ -131,10 +133,13 @@ in {
 
       terminal = "alacritty";
       startup = [
-        # Launch Firefox on start
-        # {command = "firefox";}
-        # {command = "gnome-keyring --replace"}
-        {command = "systemctl --user restart waybar";}
+        {command = builtins.toString(pkgs.writeShellScript "ensure-graphical-session" ''
+            (
+              ${pkgs.coreutils}/bin/sleep 0.2
+              ${pkgs.systemd}/bin/systemctl --user restart graphical-session.target
+            ) &
+          ''); 
+        }
       ];
 
       colors.focused = lib.mkOptionDefault {
diff --git a/nix/home-manager/profiles/wayland-desktop.nix b/nix/home-manager/profiles/wayland-desktop.nix
index ddda4a2..4d00c62 100644
--- a/nix/home-manager/profiles/wayland-desktop.nix
+++ b/nix/home-manager/profiles/wayland-desktop.nix
@@ -25,6 +25,13 @@ in {
     network-manager-applet.enable = true;
   };
 
+  systemd.user.targets.tray = {
+    Unit = {
+      Description = "Home Manager System Tray";
+      Requires = ["graphical-session-pre.target"];
+    };
+  };
+
   home.packages = with pkgs; [
     # required by network-manager-applet
     pkgs.networkmanagerapplet
diff --git a/nix/home-manager/programs/gpg-agent.nix b/nix/home-manager/programs/gpg-agent.nix
index 7ab523e..79ce675 100644
--- a/nix/home-manager/programs/gpg-agent.nix
+++ b/nix/home-manager/programs/gpg-agent.nix
@@ -1,7 +1,11 @@
-{lib, pkgs, ...}: {
+{lib, pkgs, config, ...}: {
   home.packages = [
     pkgs.gcr
-  ];
+  ] ++ 
+    (if config.services.gpg-agent.pinentryFlavor == "gtk2" then [pkgs.pinentry-gtk2]
+    else if config.services.gpg-agent.pinentryFlavor == "gnome3" then [pkgs.pinentry-gnome]
+    else [])
+  ;
 
   programs.gpg.enable = true;
   services.gpg-agent = {
diff --git a/nix/home-manager/programs/salut.nix b/nix/home-manager/programs/salut.nix
index a4e3e0d..1d39b5e 100644
--- a/nix/home-manager/programs/salut.nix
+++ b/nix/home-manager/programs/salut.nix
@@ -20,15 +20,15 @@ in
     enable = true;
     text = ''
       [notifications]
-      timeout = 5
+      timeout = 5000
 
       [window]
       auto-hide = true
-      anchor = bottom
+      anchor = bottom-right
+      transition = slidebottom
 
       [mode]
       single = true
-      do-not-disturb = false
 
       [style]
       preference = dark