use jake hamilton's config!

2 files changed, 155 insertions, 181 deletions

diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc
index 0301e9f..a5efc07 100644
--- a/config/hyprland/waybar/config.jsonc
+++ b/config/hyprland/waybar/config.jsonc
@@ -1,81 +1,41 @@
 {
-    // "layer": "top", // Waybar at top layer
-    // "position": "bottom", // Waybar position (top|bottom|left|right)
-    "height": 30, // Waybar height (to be removed for auto height)
-    // "width": 1280, // Waybar width
-    "spacing": 0, // Gaps between modules (4px)
-    // Choose the order of the modules
-    "modules-left": ["wlr/workspaces"],
-    "modules-center": ["hyprland/window"],
-    "modules-right": ["mpd", "pulseaudio",  "cpu", "memory", "backlight", "battery", "battery#bat2", "clock", "tray"],
-    // Modules configuration
-    "wlr/workspaces": {
-        "disable-scroll": true,
-        "all-outputs": true,
-        "format": "{name}",
-		"on-click": "activate",
-    },
+	"layer": "top",
+	"modules-left": ["wlr/workspaces", "mpd"],
+	"modules-center": ["hyprland/window"],
+	"modules-right": ["network", "pulseaudio", "temperature", "cpu", "memory", "clock", "tray"],
+	"mpd": {
+		"tooltip": false,
+		"format": "{artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})",
+		"format-disconnected": "ﳌ",
+		"format-stopped": "",
+        "state-icons": {
+            "playing": "",
+            "paused": ""
+        }
+	},
 	"hyprland/window": {
 		"format": "{}",
-		"seperate-outputs": true
+		"separate-outputs": true,
+	},
+	"pulseaudio": {
+		"tooltip": false,
+		"scroll-step": 5,
+		"format": "{icon} {volume}%",
+		"format-icons": {
+			"default": ["奄", "奔", "墳"]
+		}
+	},
+	"network": {
+		"tooltip": false,
+		"format-wifi": " {essid}",
+		"format-ethernet": ""
+	},
+	"cpu": {
+		"tooltip": false,
+		"format": " {}%"
 	},
-    "mpd": {
-        "format": "{elapsedTime:%M:%S}/{totalTime:%M:%S} {title}",
-        "format-disconnected": "",
-        "format-stopped": "",
-        "format-paused": "",
-        "unknown-tag": "",
-        "interval": 1,
-		"title-len": 48,
-        "tooltip": false
-    },
-    "clock": {
+	"memory": {
 		"tooltip": false,
-    },
-    "cpu": {
-        "format": "{usage}% ",
-        "tooltip": false
-    },
-    "memory": {
-        "format": "{used:0.1f}G "
-    },
-    "backlight": {
-        // "device": "acpi_video1",
-        "format": "{percent}% {icon}",
-        "format-icons": ["", "", "", "", "", "", "", "", ""]
-    },
-    "battery": {
-        "states": {
-            // "good": 95,
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
-        "format-plugged": "{capacity}% ",
-        "format-alt": "{time} {icon}",
-        // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
-        "format-icons": ["", "", "", "", ""]
-    },
-    "battery#bat2": {
-        "bat": "BAT2"
-    },
-    "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
-        "format": "{volume}% {icon}",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": " {format_source}",
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "on-click": "pavucontrol"
-    },
+		"format": " {used}G"
+	}
 }
diff --git a/config/hyprland/waybar/style.css b/config/hyprland/waybar/style.css
index 6faa931..cd2e65e 100644
--- a/config/hyprland/waybar/style.css
+++ b/config/hyprland/waybar/style.css
@@ -1,148 +1,166 @@
+/*
+ ********************************************
+ *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
+ *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
+ *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
+ *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
+ *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
+ ********************************************
+ */
+
 * {
-    font-family: JetBrains Mono;
+	border: none;
+	border-radius: 0;
+	font-family: JetBrains Mono;
 	font-weight: bold;
-    font-size: 13px;
+	font-size: 14px;
+	min-height: 24px;
 }
 
 window#waybar {
-    background-color: transparent;
-	color: #d8dee9;
-    transition-property: background-color;
-    transition-duration: .5s;
+	background: transparent;
 }
 
 window#waybar.hidden {
-    opacity: 0.2;
+	opacity: 0.2;
 }
 
-button {
-    border: none;
-    border-radius: 0;
+window#waybar.termite #window,
+window#waybar.Firefox #window,
+window#waybar.Navigator #window,
+window#waybar.PCSX2 #window {
+    color: #2e3440;
+	background: #e6e6e6;
 }
 
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-button:hover {
-    background: inherit;
-    box-shadow: inset 0 -3px #d8dee9;
+#workspaces {
+	margin-top: 8px;
+	margin-left: 12px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	background: #2e3440;
+	transition: none;
 }
 
 #workspaces button {
-    padding: 0 5px;
-    color: #d8dee9;
-}
-
-#workspaces button:hover {
-    background: rgba(0, 0, 0, 0.2);
+	transition: none;
+	color: #d8dee9;
+	background: transparent;
+	font-size: 16px;
 }
 
 #workspaces button.active {
-    background-color: #64727D;
-    box-shadow: inset 0 -3px #bcb4ee;
+	color: #88c0d0;
 }
 
-#workspaces button.urgent {
-    background-color: #eb4d4b;
+#workspaces button:hover {
+	transition: none;
+	color: #b48ead;
 }
 
-#clock,
-#battery,
-#cpu,
-#memory,
-#disk,
-#temperature,
-#backlight,
-#network,
-#pulseaudio,
-#wireplumber,
-#custom-media,
-#tray,
-#mode,
-#idle_inhibitor,
-#scratchpad,
-#window,
 #mpd {
-    padding: 0 10px;
-    box-shadow: inset 0 0 3 rgba(0, 0, 0, 1);
-}
-
-#window {
-	background-color: #8fbcbb;
+	margin-top: 8px;
+	margin-left: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	background: #2e3440;
+	transition: none;
 	color: #2e3440;
-	padding: 0 10px;
+	background: #88c0d0;
 }
 
-#window,
-#workspaces {
-    margin: 0 4px;
-}
-
-/* If workspaces is the leftmost module, omit left margin */
-.modules-left > widget:first-child > #workspaces {
-    margin-left: 0;
-}
-
-/* If workspaces is the rightmost module, omit right margin */
-.modules-right > widget:last-child > #workspaces {
-    margin-right: 0;
-}
-
-#clock {
-    background-color: #64727D;
-}
-
-#battery {
-    background-color: #ffffff;
-    color: #000000;
-}
-
-#battery.charging, #battery.plugged {
-    color: #ffffff;
-    background-color: #26A65B;
-}
-
-#battery.critical:not(.charging) {
-    background-color: #f53c3c;
-    color: #ffffff;
-}
-
-label:focus {
-    background-color: #000000;
+#mpd.disconnected,
+#mpd.stopped {
+	color: #d8dee9;
+	background: #2e3440;
 }
 
-#backlight {
-    background-color: #90b1b1;
+#window {
+	color: #88c0d0;
 }
 
-#mpd {
-    background-color: #d08770;
-    color: #2e3440;
+#network {
+	margin-top: 8px;
+	margin-left: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	transition: none;
+	color: #2e3440;
+	background: #5e81ac;
 }
 
 #pulseaudio {
-    background-color: #ebcb8b;
-    color: #2e3440;
+	margin-top: 8px;
+	margin-left: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	transition: none;
+	color: #2e3440;
+	background: #bf616a;
 }
 
-#pulseaudio.muted {
-    background-color: #b48ead;
-    color: #2a5c45;
+#temperature {
+	margin-top: 8px;
+	margin-left: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	transition: none;
+	color: #2e3440;
+	background: #d08770;
 }
 
 #cpu {
-    background-color: #a3be8c;
-    color: #2e3440;
+	margin-top: 8px;
+	margin-left: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	transition: none;
+	color: #2e3440;
+	background: #ebcb8b;
 }
 
 #memory {
-    background-color: #b48ead;
+	margin-top: 8px;
+	margin-left: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	transition: none;
+	color: #2e3440;
+	background: #a3be8c;
 }
 
-#tray {
-    background-color: #2980b9;
+#clock {
+	margin-top: 8px;
+	margin-left: 8px;
+	margin-right: 12px;
+	padding-left: 16px;
+	padding-right: 16px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	transition: none;
+	color: #d8dee9;
+	background: #2e3440;
 }
 
-#tray > .passive {
-    -gtk-icon-effect: dim;
+#tray {
+	margin-top: 8px;
+	margin-right: 12px;
+	margin-bottom: 0;
+	transition: none;
+	color: #d8dee9;
+	background: transparent;
 }
 
 #tray > .needs-attention {
@@ -150,10 +168,6 @@ label:focus {
     background-color: #eb4d4b;
 }
 
-#scratchpad {
-    background: rgba(0, 0, 0, 0.2);
-}
-
-#scratchpad.empty {
-	background-color: transparent;
+#tray > .passive {
+    -gtk-icon-effect: dim;
 }