waybar: update config

diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index 5e51afa5db71a664ebae34a02215eeef7631ef5d..012b86dd06d7f96871ab47e6968e2294515b04cb 100644 (file)
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -1,13 +1,14 @@
 {
     "layer": "top", // Waybar at top layer
     "position": "bottom", // Waybar position (top|bottom|left|right)
-    "height": 30, // Waybar height (to be removed for auto height)
+    "height": 26, // Waybar height (to be removed for auto height)
     // "width": 1280, // Waybar width
     "spacing": 5, // Gaps between modules (4px)
     // Choose the order of the modules
-    "modules-left": ["hyprland/workspaces"],
+    "modules-left": ["hyprland/workspaces", "mpd"],
     "modules-center": ["hyprland/window"],
-    "modules-right": ["mpris", "idle_inhibitor", "pulseaudio", "keyboard-state", "network", "cpu", "memory", "temperature", "clock", "tray"],
+       "margin": "0",
+    "modules-right": ["keyboard-state", "cpu", "memory", "temperature#temp2", "temperature", "pulseaudio", "idle_inhibitor", "clock", "tray"],
 
     // Modules configuration
 
@@ -59,30 +60,45 @@
     "hyprland/window": {
         "format": "{title}",
     },
+
+
     "keyboard-state": {
         "numlock": true,
         "capslock": true,
-        "format": "{name} {icon}",
+        "format": "{icon} {name}",
         "format-icons": {
-            "locked": "",
-            "unlocked": ""
+            "locked": " ",
+            "unlocked": " "
         },
     },
 
 
-    "mpris": {
-    "format": "DEFAULT: {player_icon} {dynamic}",
-    "format-paused": "DEFAULT: {status_icon} <i>{dynamic}</i>",
-    "player-icons": {
-        "default": "▶",
-        "mpv": "🎵"
-    },
-
-
-    "status-icons": {
-        "paused": "⏸"
-    },
-    // "ignored-players": ["firefox"]
+    "mpd": {
+        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
+        "format-disconnected": "Disconnected ",
+        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon} ",
+        "unknown-tag": "N/A",
+        "interval": 2,
+        "consume-icons": {
+            "on": " "
+        },
+        "random-icons": {
+            //"off": "<span color=\"#f53c3c\"></span> ",
+            "off": "",
+            "on": " "
+        },
+        "repeat-icons": {
+            "on": " "
+        },
+        "single-icons": {
+            "on": "1 "
+        },
+        "state-icons": {
+            "paused": "",
+            "playing": ""
+        },
+        "tooltip-format": "MPD (connected)",
+        "tooltip-format-disconnected": "MPD (disconnected)"
     },
 
 
@@ -109,22 +125,34 @@
 
 
     "cpu": {
-        "format": "{usage}% ",
-        "tooltip": false
+        "format": "{usage:2}% ",
+        "tooltip": true,
+               "on-click": "/usr/bin/foot -a popup htop",
+               "interval": 2,
     },
 
 
     "memory": {
-        "format": "{}% "
+        "format": "{percentage:2}% ",
+               "interval": 2,
     },
 
 
     "temperature": {
         // "thermal-zone": 2,
-        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
-        "critical-threshold": 80,
+        "hwmon-path": "/sys/class/hwmon/hwmon4/temp7_input",
+        "critical-threshold": 60,
+        // "format-critical": "{temperatureC}°C {icon}",
+        "format": "WaterGPU: {temperatureC}°C {icon}",
+        "format-icons": ["", "", ""]
+    },
+
+    "temperature#temp2": {
+        // "thermal-zone": 2,
+        "hwmon-path": "/sys/class/hwmon/hwmon4/temp6_input",
+        "critical-threshold": 60,
         // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C {icon}",
+        "format": "WaterCPU: {temperatureC}°C {icon}",
         "format-icons": ["", "", ""]
     },
 

diff --git a/waybar/.config/waybar/oldstyle.css b/waybar/.config/waybar/oldstyle.css
new file mode 100644 (file)
index 0000000..fa32580
--- /dev/null
+++ b/waybar/.config/waybar/oldstyle.css
@@ -0,0 +1,184 @@
+/* window#waybar {*/
+   /*background: transparent;*/
+/*   background-color: rgba(43, 48, 59, 1);*/
+   /*    border-bottom: 3px solid rgba(100, 114, 125, 0.5); */
+/*   border-top: 1px solid rgba(100, 114, 125, 0.8);*/
+/*   color: #ffffff;*/
+/*   transition-property: background-color;*/
+/*   transition-duration: .5s;*/
+/* }*/
+/* */
+/* window#waybar.hidden {*/
+/*   opacity: 0.2;*/
+/* }*/
+/* */
+/* #waybar.empty #window {*/
+/*   background-color: transparent;*/
+/* }*/
+/* */
+/* #workspaces {*/
+/* }*/
+/* */
+/* #window {*/
+/*   margin: 2px;*/
+/*   padding-left: 8px;*/
+/*   padding-right: 8px;*/
+/*   background-color: rgba(23,28,39,0.3);*/
+/* }*/
+/* */
+/* */
+/* #workspaces button {*/
+/*   padding: 0 8px;*/
+/*   background-color: rgba(23,28,39,0.3);*/
+/*   color:#ffffff;*/
+/*   border-top: 1px solid rgba(100, 114, 125, 0.8);*/
+/*   font-weight: bold;*/
+/*   border: none;*/
+/*   border-radius: 0;*/
+/* }*/
+/* */
+/* #workspaces button:hover {*/
+/*   background: inherit;*/
+/*   border-top: 2px solid tomato;*/
+/*  box-shadow: inset 0 -28px #c9545d;*/
+/* }*/
+/* */
+/* #workspaces button.active {*/
+/*     font-weight: bold;*/
+/*     border-top: 2px solid lightblue;*/
+/* }*/
+/* */
+/* #workspaces button.focused {*/
+   /*    box-shadow: inset 0 -2px #c9545d; */
+/*   background-color: rgba(23,28,39,0.5);*/
+/*   color:#c9545d;*/
+/*   border-top: 2px solid #c9545d;*/
+/* }*/
+/* */
+/* #workspaces button.urgent {*/
+   /*background-color: #eb4d4b;*/
+/*   border-top: 2px solid #eb4d4b;*/
+/* }*/
+/* */
+/* #mode {*/
+/*   background-color: #64727D;*/
+/*   border-bottom: 3px solid #ffffff;*/
+/* }*/
+/* */
+/* #clock,*/
+/* #battery,*/
+/* #cpu,*/
+/* #memory,*/
+/* #disk,*/
+/* #temperature,*/
+/* #backlight,*/
+/* #network,*/
+/* #pulseaudio,*/
+/* #wireplumber,*/
+/* #custom-media,*/
+/* #tray,*/
+/* #mode,*/
+/* #idle_inhibitor,*/
+/* #scratchpad,*/
+/* #mpris {*/
+/*   margin: 2px;*/
+/*   padding-left: 4px;*/
+/*   padding-right: 4px;*/
+/*   background-color: rgba(23,28,39,0.3);*/
+/*   color: #ffffff;*/
+/* }*/
+/* */
+/* 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 {*/
+/*   font-size: 18px;*/
+/*   font-weight: normal;*/
+/* }*/
+/* */
+/* #battery icon {*/
+/*   color: red;*/
+/* }*/
+/* */
+/* #battery.charging, #battery.plugged {*/
+/*   color: #ffffff;*/
+/*   background-color: #26A65B;*/
+/* }*/
+/* */
+/* @keyframes blink {*/
+/*   to {*/
+/*     background-color: #ffffff;*/
+/*     color: #000000;*/
+/*   }*/
+/* }*/
+/* */
+/* #battery.warning:not(.charging) {*/
+/*   background-color: #f53c3c;*/
+/*   color: #ffffff;*/
+/*   animation-name: blink;*/
+/*   animation-duration: 0.5s;*/
+/*   animation-timing-function: linear;*/
+/*   animation-iteration-count: infinite;*/
+/*   animation-direction: alternate;*/
+/* }*/
+/* */
+/* #battery.critical:not(.charging) {*/
+/*   background-color: #f53c3c;*/
+/*   color: #ffffff;*/
+/*   animation-name: blink;*/
+/*   animation-duration: 0.5s;*/
+/*   animation-timing-function: linear;*/
+/*   animation-iteration-count: infinite;*/
+/*   animation-direction: alternate;*/
+/* }*/
+/* */
+/* label:focus {*/
+/*   background-color: #000000;*/
+/* }*/
+/* */
+/* #network.disconnected {*/
+/*   background-color: #f53c3c;*/
+/* }*/
+/* */
+/* #temperature.critical {*/
+/*   background-color: #eb4d4b;*/
+/* }*/
+/* */
+/* #idle_inhibitor.activated {*/
+/*   background-color: #ecf0f1;*/
+/*   color: #2d3436;*/
+/* }*/
+/* */
+/* #tray > .passive {*/
+/*   -gtk-icon-effect: dim;*/
+/* }*/
+/* */
+/* #tray > .needs-attention {*/
+/*   -gtk-icon-effect: highlight;*/
+/*   background-color: #eb4d4b;*/
+/* }*/
+/* */
+/* */
+/* */
+/* window#waybar.solo {*/
+/* background-color: #FFFFFF;*/
+/* }*/
+/* */
+/* window#waybar.kitty {*/
+/* background-color: #3F3F3F;*/
+/* }*/
+/* */
+/* window#waybar.chromium {*/
+/* background-color: #000000;*/
+/* border: none;*/
+/* }*/
+/*  */
+/* */
+

diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 7a4bff49cfee25a8ac3f0b3b90e9d19c3b4e644d..203526a551e84d7262ab5b7f8bd0f615e6e641a5 100644 (file)
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -1,190 +1,123 @@
 * {
-  /* `otf-font-awesome` is required to be installed for icons */
   font-family: "LiterationMono Nerd Font";
-  font-size: 16px;
+  font-size: 17px;
   min-height: 0px;
 }
 
+
 window#waybar {
-  /*background: transparent;*/
-  background-color: rgba(43, 48, 59, 1);
-  /*    border-bottom: 3px solid rgba(100, 114, 125, 0.5); */
-  border-top: 1px solid rgba(100, 114, 125, 0.8);
-  color: #ffffff;
-  transition-property: background-color;
-  transition-duration: .5s;
+    background-color: rgba(43, 48, 59, 1);
+    border-bottom: 3px solid rgba(100, 114, 125, 1);
+    color: #ffffff;
+    transition-property: background-color;
+    transition-duration: .5s;
 }
 
 window#waybar.hidden {
-  opacity: 0.2;
+    opacity: 0.2;
 }
 
-#waybar.empty #window {
-  background-color: transparent;
+/*
+window#waybar.empty {
+    background-color: transparent;
 }
+window#waybar.solo {
+    background-color: #FFFFFF;
+}
+*/
 
-#workspaces {
+window#waybar.termite {
+    background-color: #3F3F3F;
 }
 
-#window {
-  margin: 2px;
-  padding-left: 8px;
-  padding-right: 8px;
-  background-color: rgba(23,28,39,0.3);
+window#waybar.chromium {
+    background-color: #000000;
+    border: none;
 }
 
 
+
 #workspaces button {
-  padding: 0 8px;
-  background-color: rgba(23,28,39,0.3);
-  color:#ffffff;
-  border-top: 1px solid rgba(100, 114, 125, 0.8);
-  font-weight: bold;
-  border: none;
-  border-radius: 0;
+       padding: 0 10px;
+       background: inherit;
+       color:#ffffff;
+       border-bottom: 3px solid rgba(100, 114, 125, 0.0);
+       font-weight: bold;
+       border: none;
+       border-radius: 0;
 }
 
 #workspaces button:hover {
-  background: inherit;
-  border-top: 2px solid tomato;
-/*  box-shadow: inset 0 -28px #c9545d;*/
+       background: inherit;
+       border-bottom: 3px solid tomato;
+       box-shadow: inset 0 -28px #c9545d;
 }
 
 #workspaces button.active {
        font-weight: bold;
-       border-top: 2px solid lightblue;
+       border-bottom: 3px solid lightblue;
 }
 
 #workspaces button.focused {
-  /*    box-shadow: inset 0 -2px #c9545d; */
-  background-color: rgba(23,28,39,0.5);
-  color:#c9545d;
-  border-top: 2px solid #c9545d;
+       border-bottom: 3px solid #c9545d;
 }
 
 #workspaces button.urgent {
-  /*background-color: #eb4d4b;*/
-  border-top: 2px solid #eb4d4b;
+       border-bottom: 3px solid #eb4d4b;
 }
 
-#mode {
-  background-color: #64727D;
-  border-bottom: 3px solid #ffffff;
-}
 
-#clock,
-#battery,
-#cpu,
-#memory,
-#disk,
-#temperature,
-#backlight,
-#network,
-#pulseaudio,
-#wireplumber,
-#custom-media,
-#tray,
-#mode,
-#idle_inhibitor,
-#scratchpad,
-#mpris {
-  margin: 2px;
-  padding-left: 4px;
-  padding-right: 4px;
-  background-color: rgba(23,28,39,0.3);
-  color: #ffffff;
-}
 
-/* If workspaces is the leftmost module, omit left margin */
-.modules-left > widget:first-child > #workspaces {
-  margin-left: 0;
+button {
+    /* Use box-shadow instead of border so the text isn't offset */
+    box-shadow: inset 0 -3px transparent;
+    /* Avoid rounded borders under each button name */
+    border: none;
+    border-radius: 0;
 }
 
-/* If workspaces is the rightmost module, omit right margin */
-.modules-right > widget:last-child > #workspaces {
-  margin-right: 0;
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+button:hover {
+    background: inherit;
+    box-shadow: inset 0 -3px #ffffff;
 }
 
-#clock {
-  font-size: 18px;
-  font-weight: normal;
-}
 
-#battery icon {
-  color: red;
+#cpu,
+#memory,
+#temperature {
+    padding: 0 15px;
+    color: #ffffff;
 }
 
-#battery.charging, #battery.plugged {
-  color: #ffffff;
-  background-color: #26A65B;
-}
 
-@keyframes blink {
-  to {
-    background-color: #ffffff;
-    color: #000000;
-  }
+#temperature#temp2 {
+    padding: 0 15px;
+    color: #ffffff;
 }
 
-#battery.warning:not(.charging) {
-  background-color: #f53c3c;
-  color: #ffffff;
-  animation-name: blink;
-  animation-duration: 0.5s;
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-  animation-direction: alternate;
-}
 
-#battery.critical:not(.charging) {
-  background-color: #f53c3c;
+#mpris {
+  margin: 2px;
+  padding: 10px;
+  background-color: rgba(23,28,39,0.3);
   color: #ffffff;
-  animation-name: blink;
-  animation-duration: 0.5s;
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-  animation-direction: alternate;
-}
-
-label:focus {
-  background-color: #000000;
-}
-
-#network.disconnected {
-  background-color: #f53c3c;
 }
 
-#temperature.critical {
-  background-color: #eb4d4b;
-}
-
-#idle_inhibitor.activated {
-  background-color: #ecf0f1;
-  color: #2d3436;
-}
 
-#tray > .passive {
-  -gtk-icon-effect: dim;
+#mpd {
+    padding: 0 20px;
+    color: #ffffff;
 }
 
-#tray > .needs-attention {
-  -gtk-icon-effect: highlight;
-  background-color: #eb4d4b;
-}
-
-/*
 
-window#waybar.solo {
-background-color: #FFFFFF;
+#clock {
+    padding: 0 3px;
+    margin: 0 2px;
 }
 
-window#waybar.kitty {
-background-color: #3F3F3F;
-}
 
-window#waybar.chromium {
-background-color: #000000;
-border: none;
+#idle_inhibitor {
+    padding: 0 15px;
+    color: #ffffff;
 }
- */
-