From b7eb3edb6ba20befb5051612d9b3e96b91df323c Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Thu, 13 Jul 2023 10:51:22 -0500
Subject: [PATCH] Add media and window info

---
 common/fish/config.fish   | 2 +-
 os/linux/waybar/config    | 6 +++++-
 os/linux/waybar/style.css | 7 ++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/common/fish/config.fish b/common/fish/config.fish
index a9cc563..c149ec2 100755
--- a/common/fish/config.fish
+++ b/common/fish/config.fish
@@ -8,7 +8,7 @@ for f in vars colors functions
 	source $FISH_PATH/$f.fish
 end
 
-if has_command rtx && not set --query RTX_SHELL
+if has_command rtx
 	rtx activate fish | source
 else if has_command brew && test -f (brew --prefix asdf)/libexec/asdf.fish
 	set --universal --export ASDF_DIR (brew --prefix asdf)
diff --git a/os/linux/waybar/config b/os/linux/waybar/config
index 56a2e54..cc500ce 100644
--- a/os/linux/waybar/config
+++ b/os/linux/waybar/config
@@ -3,7 +3,7 @@
 	"position": "bottom",
 	"output": ["eDP-1", "DP-3"],
 	"height": 32,
-	"modules-left": ["clock", "sway/title"],
+	"modules-left": ["clock", "sway/window"],
 	"modules-center": ["sway/workspaces"],
 	"modules-right": [
 		"idle_inhibitor",
@@ -16,6 +16,7 @@
 		// "temperature",
 		"backlight",
 		"battery",
+		"mpris",
 		"tray"
 	],
 	"bluetooth": {
@@ -107,6 +108,9 @@
 		"format-disconnected": "Disconnected ⚠",
 		"format-alt": "{ifname}: {ipaddr}/{cidr}"
 	},
+	"mpris": {
+		"format": "{title} by {artist}"
+	},
 	"pulseaudio": {
 		// "scroll-step": 1, // %, can be a float
 		"format": "{volume} <span foreground=\"#666666\">{icon}</span> {format_source}",
diff --git a/os/linux/waybar/style.css b/os/linux/waybar/style.css
index 32af862..05801ec 100644
--- a/os/linux/waybar/style.css
+++ b/os/linux/waybar/style.css
@@ -66,14 +66,15 @@ window#waybar.empty {
 #tray,
 #mode,
 #idle_inhibitor,
+#mpris,
+#window,
 #mpd {
 	padding: 0 0.75em;
 	background-color: inherit;
 	color: @text;
 }
 
-#clock {
-}
+#clock {}
 
 #battery {
 	/* background-color: #ffffff; */
@@ -186,4 +187,4 @@ label:focus {
 
 #mpd.paused {
 	/* background-color: #51a37a; */
-}
+}
\ No newline at end of file