From ad897329615280ee6f9eba13d58cecfe0a3ad6bf Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sat, 10 Dec 2022 16:07:18 +0100
Subject: [PATCH] sway: Make everything work again

This sadly has to downgrade some programs, if I find more time, I will
look more into this and try to make it work with the latest versions.
---
 modules/nix.nix                      |  6 ++++++
 users/simon/modules/sway/default.nix | 18 +-----------------
 users/simon/modules/sway/swaync.nix  |  3 ++-
 users/simon/modules/sway/waybar.nix  | 11 ++++++-----
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/modules/nix.nix b/modules/nix.nix
index 83db39f..af3190a 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -61,6 +61,12 @@ in
           overlays
           system;
       };
+      _2205 = import nixpkgs-2205 {
+        inherit (config.nixpkgs)
+          config
+          overlays
+          system;
+      };
     })
   ];
 
diff --git a/users/simon/modules/sway/default.nix b/users/simon/modules/sway/default.nix
index 5a4d0bd..5afbc35 100644
--- a/users/simon/modules/sway/default.nix
+++ b/users/simon/modules/sway/default.nix
@@ -248,23 +248,7 @@ in
     extraConfig = ''
       # Cursor
       seat seat0 xcursor_theme Adwaita
-    '' + (
-      let
-        environmentVariables = lib.concatStringsSep " " [
-          "DBUS_SESSION_BUS_ADDRESS"
-          "DISPLAY"
-          "SWAYSOCK"
-          "WAYLAND_DISPLAY"
-        ];
-      in
-      ''
-        # From https://github.com/swaywm/sway/wiki#gtk-applications-take-20-seconds-to-start
-        exec systemctl --user import-environment ${environmentVariables} && \
-          hash dbus-update-activation-environment 2>/dev/null && \
-          dbus-update-activation-environment --systemd ${environmentVariables} && \
-          systemctl --user start sway-session.target
-      ''
-    ) + (lib.optionalString clamshellHack ''
+    '' + (lib.optionalString clamshellHack ''
       bindswitch --reload --locked lid:on output eDP-1 disable
       bindswitch --reload --locked lid:off output eDP-1 enable
 
diff --git a/users/simon/modules/sway/swaync.nix b/users/simon/modules/sway/swaync.nix
index e54806f..c7ed0db 100644
--- a/users/simon/modules/sway/swaync.nix
+++ b/users/simon/modules/sway/swaync.nix
@@ -8,7 +8,8 @@ in
     Install.WantedBy = [ "sway-session.target" ];
 
     Service = {
-      ExecStart = "${pkgs.swaynotificationcenter}/bin/swaync";
+      # FIXME: use new version (currently system style discovery fails)
+      ExecStart = "${pkgs._2205.swaynotificationcenter}/bin/swaync";
       Restart = "on-failure";
     };
   };
diff --git a/users/simon/modules/sway/waybar.nix b/users/simon/modules/sway/waybar.nix
index 2612a14..92bc873 100644
--- a/users/simon/modules/sway/waybar.nix
+++ b/users/simon/modules/sway/waybar.nix
@@ -232,7 +232,7 @@ in
 
 
         def khal(args):
-            completed = subprocess.run(["khal"] + args, capture_output=True)
+            completed = subprocess.run(["${pkgs.khal}/bin/khal"] + args, capture_output=True)
             assert completed.returncode == 0
             return completed.stdout.decode("utf-8")
 
@@ -285,9 +285,9 @@ in
         dnd-none = "${thinsp}";
       };
       return-type = "json";
-      exec = "${pkgs.swaynotificationcenter}/bin/swaync-client -swb";
-      on-click = "${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw";
-      on-click-right = "${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw";
+      exec = "${pkgs._2205.swaynotificationcenter}/bin/swaync-client -swb";
+      on-click = "${pkgs._2205.swaynotificationcenter}/bin/swaync-client -t -sw";
+      on-click-right = "${pkgs._2205.swaynotificationcenter}/bin/swaync-client -d -sw";
       escape = true;
     };
   };
@@ -307,7 +307,8 @@ in
     Service = {
       # ensure sway is already started, otherwise workspaces will not work
       ExecStartPre = "${config.wayland.windowManager.sway.package}/bin/swaymsg";
-      ExecStart = "${pkgs.waybar}/bin/waybar";
+      # FIXME: use new version (currently mpd widget does not toggle playback)
+      ExecStart = "${pkgs._2205.waybar}/bin/waybar";
       ExecReload = "${pkgs.utillinux}/bin/kill -SIGUSR2 $MAINPID";
       Restart = "on-failure";
       RestartSec = "1s";