fix salut timeout; move tray service to wayland; hack buggy systemd ordering

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 {

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