rollback dotfiles and fix dotter

2 files changed, 47 insertions, 34 deletions

diff --git a/.config/waybar/config b/.config/waybar/config
index 1a5e021..ac10670 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -8,24 +8,12 @@
 	"margin-right": 13,
 	"modules-left": ["hyprland/workspaces"],
 	"modules-center": ["hyprland/window"],
-	"modules-right": ["tray","custom/keylock","custom/media","pulseaudio","memory","cpu","clock"],
+	"modules-right": ["tray","battery","custom/keylock","mpris","pulseaudio","clock"],
 	// custom modules ////////////////
 	"wlr/workspaces": {
 		"format": "{icon}",
 		"format-active": "{icon}",
 		"on-click": "activate",
-		"format-icons":{
-			"1": "α",
-			"2": "β",
-			"3": "γ",
-			"4": "δ",
-			"5": "ε",
-			"6": "ζ",
-			"7": "η",
-			"8": "θ",
-			"9": "ι",
-			"10":"κ"
-		}
 	},
 	"hyprland/window": {
 		"format": "{}",
@@ -34,7 +22,8 @@
 			"(.*) - qutebrowser": "$1",
 			"": "Hyprland"
 		},
-		"separate-outputs": true
+		"separate-outputs": true,
+		"max-length": 20
 	},
 	"tray": {
 		// "icon-size": 21,
@@ -56,31 +45,22 @@
 		"format": "{}%  "
 	},
 	"pulseaudio": {
-		// "scroll-step": 1, // %, can be a float
-		"format": "{format_source}",
-		"format-bluetooth": "{volume}% {icon}  {format_source}",
-		"format-bluetooth-muted": " {icon} {format_source}",
-		"format-muted": " {format_source}",
+		"format": "{volume}% {icon}",
+		"format-bluetooth": "{volume}% {icon} ",
+		"format-muted": "",
 		"format-icons": {
-			"headphone": "󰋋",
-			"hands-free": "󰋋",
+			"alsa_output.pci-0000_00_1f.3.analog-stereo": "󰓃",
+			"headphones": "",
+			"handsfree": "󰋋",
 			"headset": "󰋋",
 			"phone": "",
 			"portable": "",
 			"car": "",
-			"default": ["", "", ""]
+			"default": ["", ""]
 		},
+		"scroll-step": 1,
 		"on-click": "pavucontrol"
 	},
-	"custom/media": {
-		"interval": "once",
-		"format": "{}",
-		"max-length": 40,
-		"on-click": "playerctl play-pause && pkill -RTMIN+9 waybar",
-		"on-click-right": "playerctl stop && pkill -RTMIN+9 waybar",
-		"exec": "sleep 0.1 && playerctl status",
-		"signal": 9
-	},
 	"custom/keylock": {
 		"interval": "once",
 		"format": "{}",
@@ -88,5 +68,28 @@
 		"exec": "keylock",
 		"exec-on-event" : true,
 		"signal": 10
+	},
+	"battery": {
+		"interval": 60,
+		"states": {
+			"warning": 30,
+			"critical": 15
+		},
+		"format": "{capacity}% {icon}",
+		"format-icons": ["", "", "", "", ""],
+	},
+	"mpris": {
+		"format": "{player_icon} {dynamic}",
+		"format-paused": "{status_icon} <i>{dynamic}</i>",
+		"player-icons": {
+			"default": "▶",
+			"mpv": "🎵"
+		},
+		"status-icons": {
+			"paused": "⏸"
+		},
+		"interval": 0.1,
+		"dynamic-len": 20,
+		// "ignored-players": ["firefox"]
 	}
 }
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index b9e2e8a..724a084 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,5 +1,5 @@
 * {
-	font-family: SauceCodePro Nerd Font,FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+	font-family: SauceCodePro NF,FontAwesome, Roboto, Helvetica, Arial, sans-serif;
 	font-size: 13px;
 	font-weight: bold;
 	color: #ebdbb2;
@@ -7,7 +7,6 @@
 
 window#waybar {
 	background-color: transparent;
-	/*background-color: #1d2021;*/
 }
 
 #workspaces{
@@ -40,11 +39,13 @@ window#waybar {
 #tray,
 #custom-media,
 #custom-keylock,
+#mpris,
 #pulseaudio,
 #memory,
 #cpu,
 #clock,
-#window
+#window,
+#battery
 {
 	background-color: rgba(60, 56, 54, 0.8);
 	border-radius: 5px;
@@ -52,6 +53,15 @@ window#waybar {
 	padding: 5px 10px;
 }
 
+#battery {
+	padding: 5px 10px;
+	padding-right: 18px;
+}
+
 #custom-keylock {
 	padding: 5px 13px;
 }
+
+#mpris.playing {
+	background-color: #b16286;
+}