From 0ac58b8dbcacaa9f8ca796760d82b77f90054fbc Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 28 Aug 2023 10:52:47 +0200 Subject: [PATCH] cal: attempt to fix "jump into video call" link --- bin/cal.py | 9 ++++++--- home-manager/desktop.nix | 2 +- home-manager/waybar.css | 3 +++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bin/cal.py b/bin/cal.py index 9977c83..8cd0bbe 100755 --- a/bin/cal.py +++ b/bin/cal.py @@ -50,6 +50,9 @@ def tooltip(evt): {evt["s"].strftime("%b %d %H:%M")} - {evt["e"].strftime("%H:%M")} """ +def openURI(uri): + subprocess.call(["systemd-run", "--user", "chromium", uri]) + def click(evt): # todo: only on certain time before if 'hangoutLink' in evt: @@ -57,12 +60,12 @@ def click(evt): url = evt["hangoutLink"] + "?authuser=" + str(authuser(evt)) subprocess.call(["playerctl", "pause"]) i3.command("focus output 'DVI-D-1', workspace --no-auto-back-and-forth 9") - subprocess.call(["chromium", url]) + openURI(url) else: - subprocess.call(["xdg-open", evt["htmlLink"]]) + openURI(evt["htmlLink"]) def rightclick(evt): - subprocess.call(["xdg-open", "https://calendar.google.com"]) + openURI("https://calendar.google.com") events = [e for e in events if not gcal._DeclinedEvent(e)] if opt == "dump": diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix index ac8e2d2..a62fecb 100644 --- a/home-manager/desktop.nix +++ b/home-manager/desktop.nix @@ -22,7 +22,7 @@ in { onChange = "systemctl --user restart waybar"; }; systemd.user.services.waybar.Service.Environment = [ - "PATH=${lib.makeBinPath (with pkgs; [ pavucontrol xdg-utils bin.y-cal-widget playerctl bluez gnugrep bash ])}" + "PATH=${lib.makeBinPath (with pkgs; [ pavucontrol xdg-utils bin.y-cal-widget playerctl bluez gnugrep bash systemd chromium ])}" ]; programs.waybar = { enable = true; diff --git a/home-manager/waybar.css b/home-manager/waybar.css index b7aef0c..fa0da01 100644 --- a/home-manager/waybar.css +++ b/home-manager/waybar.css @@ -106,6 +106,9 @@ window#waybar { #custom-cal.user-1 { background: #f67755; } +#custom-cal.user-2 { + background: #33b679; +} #tray { background-color: #2980b9;