Merge branch 'master' of zachir.xyz:zachir/dotfiles into awesome-bling

4 files changed, 78 insertions, 40 deletions

diff --git a/waybar/config b/waybar/config
index 6be1ce2..e17ac9a 100644
--- a/waybar/config
+++ b/waybar/config
@@ -11,7 +11,7 @@
 
     "modules-left":[ "custom/launcher"],
     "modules-center":[],
-    "modules-right":[ "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight",  "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"],
+    "modules-right":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight",  "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"],
 
     // Modules configuration
 
@@ -24,6 +24,17 @@
             "unlocked": ""
         }
     },
+    "mpd": {
+      "format": "{artist}-{title}",
+      "format-stopped": "",
+      "format-paused": "{artist}-{title}",
+      "format-disconnected": "",
+      "artist-len": 15,
+      "title-len": 15,
+      //"album-len": 15,
+      //"max-length": 30,
+      "on-click": "mpc toggle"
+    },
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {
diff --git a/waybar/config-Hyprland b/waybar/config-Hyprland
index 903fcc7..1d4743a 100644
--- a/waybar/config-Hyprland
+++ b/waybar/config-Hyprland
@@ -11,7 +11,7 @@
 
     "modules-left":[ "wlr/workspaces", "custom/launcher", "hyprland/window"],
     "modules-center":[],
-    "modules-right":[ "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight",  "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"],
+    "modules-right":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight",  "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"],
 
     // Modules configuration
 
@@ -35,6 +35,17 @@
             "unlocked": ""
         }
     },
+    "mpd": {
+      "format": "{artist} - {title}",
+      "format-stopped": "",
+      "format-paused": "{artist} - {title}",
+      "format-disconnected": "",
+      "artist-len": 15,
+      "title-len": 15,
+      //"album-len": 15,
+      //"max-length": 200,
+      "on-click": "mpc toggle"
+    },
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {
diff --git a/waybar/config-river b/waybar/config-river
index 3e84358..6dfbd36 100644
--- a/waybar/config-river
+++ b/waybar/config-river
@@ -11,7 +11,7 @@
 
     "modules-left":[ "river/tags", "custom/launcher"],
     "modules-center":[],
-    "modules-right":[ "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight",  "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"],
+    "modules-right":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight",  "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"],
 
     // Modules configuration
 
@@ -27,6 +27,17 @@
             "unlocked": ""
         }
     },
+    "mpd": {
+      "format": "{artist}-{title}",
+      "format-stopped": "",
+      "format-paused": "{artist}-{title}",
+      "format-disconnected": "",
+      "artist-len": 15,
+      "title-len": 15,
+      //"album-len": 15,
+      //"max-length": 30,
+      "on-click": "mpc toggle"
+    },
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {
diff --git a/waybar/style.css b/waybar/style.css
index 8333fb6..f002c9b 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -21,38 +21,42 @@ window#waybar.hidden {
 }
 
 
+/*
 #workspaces button {
     background: #1f1f1f;
     color: #ffffff;
     border-radius: 20px;
-
 }
+*/
 
 /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 
 #workspaces button {
-    background: #2b55b2;
+    background: #333333;
     color: white;
-    border-bottom: 3px solid #000000;
+    border-bottom: 3px solid #1b1d1c;
 }
 
+/*
 #workspaces button:hover {
     background: #39c1ed;
     color: black;
     border-bottom: 3px solid #ffffff;
 
 }
+*/
 
 #workspaces button.active {
-    background: #39c1ed;
+    background: #198844;
 }
 
+/*
 #workspaces button.active:hover {
     background: #39c1ed;
     color: black;
     border-bottom: 3px solid #ffffff;
-
 }
+*/
 
 #workspaces button.urgent {
     background-color: #eb4d4b;
@@ -106,18 +110,18 @@ window#waybar.hidden {
 }
 
 #clock {
-    background-color: #171717;
+    background-color: #1b1d1c;
     color: #ffffff;
 }
 
 #battery {
-    background-color: #ffffff;
-    color: #000000;
+    background-color: #1b1d1c;
+    color: #ffffff;
 }
 
 #battery.charging, #battery.plugged {
-    color: #ffffff;
-    background-color: #26A65B;
+    color: #26A65B;
+    background-color: #1b1d1c;
 }
 
 @keyframes blink {
@@ -142,99 +146,100 @@ label:focus {
 }
 
 #cpu {
-    background-color: #171717;
+    background-color: #1b1d1c;
     color: #ffffff;
 }
 
 #memory {
-    background-color: #171717;
+    background-color: #198844;
     color: #ffffff;
 }
 
 #disk {
-    background-color: #171717;
+    background-color: #1b1d1c;
     color: #ffffff;
 }
 
 #backlight {
-    background-color: #90b1b1;
+    background-color: #198844;
+    color: #ffffff;
 }
 
 #network {
-    background-color: #171717;
+    background-color: #198844;
     color: #ffffff;
 }
 
 #network.disconnected {
-    background-color: #171717;
-    color: red;
+    background-color: #1b1d1c;
+    color: #ffffff;
 }
 
 #pulseaudio {
-    background-color: #171717;
+    background-color: #198844;
     color: #ffffff;
 }
 
 #pulseaudio.muted {
-    background-color: #171717;
-    color: red;
+    background-color: #1b1d1c;
+    color: #198844;
 }
 
 #custom-media {
-    background-color: #171717;
+    background-color: #1b1d1c;
     color: white;
 }
 
 #custom-media.custom-spotify {
-    background-color: #171717;
+    background-color: #1b1d1c;
     color: white;
 
 }
 
 #custom-media.custom-vlc {
-    background-color: #171717;
+    background-color: #1b1d1c;
     color: white;
 }
 
 #custom-power{
-    background-color: #171717;
+    background-color: #1b1d1c;
     font-size: 18px;
     margin-right: 5px;
 
 }
 
 #custom-launcher{
-    background-color: #171717;
+    background-color: #1b1d1c;
     font-size: 20px;
     margin-left: 5px;
 
 }
 
 #custom-layout{
-    background-color: #171717;
+    background-color: #1b1d1c;
     color: white;
     font-size:20px;
 }
 
 #custom-updater {
-    background-color: #171717;
+    background-color: #1b1d1c;
     color: white;
 }
 
 #custom-snip {
-    background-color: #171717;
+    background-color: #1b1d1c;
     color: skyblue;
     font-size: 20px;
 }
 
 #custom-wallpaper {
-    background-color: #171717;
+    background-color: #1b1d1c;
     color: pink;
     font-size: 20px;
 }
 
 #tags{
-    background-color: #171717;
+    background-color: #1b1d1c;
     font-size: 20px;
 }
 
@@ -253,12 +258,12 @@ label:focus {
 
 
 #taskbar{
-    background-color: #171717;
+    background-color: #1b1d1c;
     border-radius: 0px 20px 20px 0px;
 }
 
 #temperature {
-    background-color: #171717;
+    background-color: #1b1d1c;
     color: #ffffff;
 }
 
@@ -267,24 +272,24 @@ label:focus {
 }
 
 #tray {
-    background-color: #171717;
+    background-color: #198844;
     color: #ffffff;
 }
 
 #tray > .passive {
     -gtk-icon-effect: dim;
-    background-color: #171717;
+    background-color: #198844;
     color: #ffffff;
 }
 
 #tray > .needs-attention {
     -gtk-icon-effect: highlight;
-    background-color: #171717;
+    background-color: #198844;
     color: #ffffff;
 }
 
 #idle_inhibitor {
-    background-color: #171717;
+    background-color: #1b1d1c;
     border-radius: 20px 0px 0px 20px;
 
 }
@@ -297,7 +302,7 @@ label:focus {
 }
 
 #language {
-    background-color: #171717;
+    background-color: #1b1d1c;
     color: #ffffff;
     min-width: 16px;
 }