big updatesHEADmain

2 files changed, 204 insertions, 168 deletions

diff --git a/waybar/dot-config/waybar/config.jsonc b/waybar/dot-config/waybar/config.jsonc
index 8788765..d6859b2 100644
--- a/waybar/dot-config/waybar/config.jsonc
+++ b/waybar/dot-config/waybar/config.jsonc
@@ -1,136 +1,111 @@
+// vim: ft=jsonc
 {
-    "position": "right",
-    "exclusive": false,
     "layer": "top",
-    "margin": "5 2 5 0",
-    // "height": 18,
-    "spacing": 5,
+    "position": "bottom",
+    "height": 20,
+    "spacing": 0,
     "reload_style_on_change": true,
     "modules-left": [
-    ],
-    "modules-right": [
+        "niri/workspaces",
+        "niri/window"
     ],
     "modules-center": [
-        "niri/workspaces",
-        "custom/weather",
+    ],
+    "modules-right": [
         "idle_inhibitor",
-        "wireplumber",
+        "wireplumber#sink",
         "network",
         "power-profiles-daemon",
+        "cpu",
+        "memory",
+        "temperature",
         "backlight",
         "niri/language",
         "battery",
-        "tray",
-        "clock"
+        "clock",
+        "tray"
     ],
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {
-            "activated": "󰒳",
-            "deactivated": "󰒲"
+            "activated": "",
+            "deactivated": ""
         }
     },
     "tray": {
         "icon-size": 12,
-        "spacing": 5
+        "spacing": 10
     },
     "clock": {
-        "interval": 60,
-        "format": "{:%a\n%d\n%b\n\n%H\n%M}",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt>{calendar}</tt>",
-        "justify": "center"
+	"format": "{:%a %d %b %H:%M}",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+	"interval": 60
+    },
+    "cpu": {
+        "format": "{usage}% ",
+        "tooltip": false
+    },
+    "memory": {
+        "format": "{}% "
+    },
+    "temperature": {
+        // "thermal-zone": 2,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        // "format-critical": "{temperatureC}°C {icon}",
+        "critical-threshold": 80,
+        "format": "{temperatureC}°C {icon}",
+        "format-icons": ["", "", ""]
     },
     "backlight": {
-        "format": "{icon}",
-        "format-icons": [
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-        ],
-        "tooltip-format": "{percent}%"
+        // "device": "acpi_video1",
+        "format": "{percent}% {icon}",
+        "format-icons": ["", "", "", "", "", "", "", "", ""]
     },
     "battery": {
         "states": {
+            // "good": 95,
             "warning": 30,
-            "critical": 10
+            "critical": 15
         },
-        "format": "{icon}\n{capacity}",
-        "format-full": "{icon}",
-        "format-charging": "󰢝\n{capacity}%",
-        "format-plugged": "",
-        "format-icons": [
-            "",
-            "",
-            "",
-            "",
-            ""
-        ],
-        "justify": "center",
-        "tooltip-format": "{capacity}% {power}W ({time})"
+        "format": "{capacity}% {icon}",
+        "format-full": "{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": ["", "", "", "", ""]
     },
     "power-profiles-daemon": {
-        "format": "{icon}",
-        "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
-        "tooltip": true,
-        "format-icons": {
-            "performance": "",
-            "balanced": "󰞍",
-            "power-saver": ""
-        }
+      "format": "{icon}",
+      "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+      "tooltip": true,
+      "format-icons": {
+        "default": "",
+        "performance": "",
+        "balanced": "",
+        "power-saver": ""
+      }
     },
     "network": {
-        "format-wifi": "",
-        "format-ethernet": "",
-        "format-disconnected": "󰲛",
-        "tooltip-format-ethernet": "{ipaddr}/{cidr}",
-        "tooltip-format-wifi": "{essid} ({signalStrength}%) {gwaddr}",
-        "tooltip-format-disconnected": "Disconnected",
-        "format-linked": "-",
-        "justify": "center",
-        "on-click": "runapp -o -- alacritty -e impala"
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "{ipaddr}/{cidr} ",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}"
     },
-    "wireplumber": {
-        "format": "{icon}",
+    "wireplumber#sink": {
+        "node-type": "Audio/Sink",
+        "format": "{volume}% ",
         "format-muted": "",
-        "on-click": "runapp -o -- alacritty -e bash -c 'wpctl status | less'",
-        "on-click-right": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && update-led-mute sink",
-        "max-volume": 100,
-        "scroll-step": 5,
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": [
-                "",
-                "",
-                ""
-            ]
-        },
-        "justify": "center"
+        "on-click-right": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
+        "scroll-step": 4
     },
     "niri/language": {
         "format": "{}",
-        "format-en": "en",
-        "format-fa": "فا"
-    },
-    "niri/window": {
-        "icon": true,
-        "icon-size": 13
-    },
-    "custom/weather": {
-        "format": "{}°",
-        "tooltip": true,
-        "interval": 3600,
-        "exec": "wttrbar",
-        "return-type": "json"
+	"format-en": "en",
+	"format-fa": "فا"
     }
 }
diff --git a/waybar/dot-config/waybar/style.css b/waybar/dot-config/waybar/style.css
index 357f320..d6f56ec 100644
--- a/waybar/dot-config/waybar/style.css
+++ b/waybar/dot-config/waybar/style.css
@@ -1,95 +1,65 @@
-@import url("file:///home/moreka/.cache/wal/colors-waybar.css");
-@define-color transp alpha(@background, 0);
-@define-color effort2 alpha(@background, 0.8);
-@define-color border lighter(@background);
-@define-color shadow darker(@background);
-/* @define-color foreground #eeeeee; */
-
 * {
-    font-family: Dejavu Sans Mono, Vazirmatn UI;
+    font-family: monospace, "Nerd Font Symbols";
     font-size: 12px;
-    min-width: 0;
+    min-height: 0;
 }
 
 window#waybar {
-    background-color: @transp;
-    background-blend-mode: screen;
-    color: @foreground;
+    background-color: rgba(43, 48, 59, 1.0);
+    color: #ffffff;
+    transition-property: background-color;
+    transition-duration: .2s;
 }
 
-.modules-center {
-    background: @effort2;
-    background-blend-mode: overlay;
-    padding: 4px 2px;
-    margin:  0px 5px;
-    border-radius: 20px;
-    border: 2px solid @border;
-    box-shadow: 0px 0px 3px 4px @shadow;
+window#waybar.hidden {
+    opacity: 0.2;
 }
 
-tooltip {
-  background: #000000;
-  padding: 4px;
+window#waybar.termite {
+    background-color: #3F3F3F;
 }
 
-tooltip label {
-  color: white;
-  padding: 0;
-  margin: 0;
+window#waybar.chromium {
+    background-color: #000000;
+    border: none;
+}
+
+button {
+    /* Use box-shadow instead of border so the text isn't offset */
+    box-shadow: inset 0 -1px transparent;
+    /* Avoid rounded borders under each button name */
+    border: none;
+    border-radius: 0;
 }
 
 /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-#workspaces button:hover {
+button:hover {
     background: inherit;
+    box-shadow: inset 0 -1px #ffffff;
 }
 
 #workspaces button {
-    padding: 0px;
-    border: none;
-    border-radius: 40px;
+    padding: 0 5px;
     background-color: transparent;
-    margin-bottom: 4px;
-}
-
-#workspaces:last-child {
-    margin-bottom: 0px;
-}
-
-#workspaces button label {
-    color: #bbbbbb;
-    font-size: 10px;
-    padding: 0px;
-    margin: 0px;
+    color: #ffffff;
 }
 
 #workspaces button:hover {
-    background-color: rgba(0, 0, 0, 0.2);
-}
-
-
-#workspaces button.active.empty {
-    background-color: #005577;
-}
-
-#workspaces button.active:not(.empty) {
-    background-color: #005577;
-    /* border: 1px solid #0088aa; */
-}
-
-#workspaces button.active label {
-    font-weight: 900;
-    color: #eeeeee;
+    background: rgba(0, 0, 0, 0.2);
 }
 
-#workspaces button:not(.active):not(.empty) {
-    /* border: 1px solid #444444; */
+#workspaces button.focused, #workspaces button.active {
+    background-color: #64727D;
+    box-shadow: inset 0 -1px #ebebeb;
 }
 
-
 #workspaces button.urgent {
     background-color: #eb4d4b;
 }
 
+#window {
+    padding-left: 5px;
+}
 
 #clock,
 #battery,
@@ -108,27 +78,47 @@ tooltip label {
 #scratchpad,
 #power-profiles-daemon,
 #mpd {
-    padding: 5px 0px;
+    padding: 0 10px;
+    color: #ffffff;
+}
+
+#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 {
     font-weight: bold;
-    border-top: 1px solid #777777;
-    padding-top: 10px;
 }
 
-#window,
-#workspaces {
-    margin: 4px 0px;
+#battery {
+    /* background-color: #ffffff; */
+    /* color: #000000; */
+}
+
+#battery.charging, #battery.plugged {
+    /* color: #ffffff; */
+    /* background-color: #26A65B; */
 }
 
 @keyframes blink {
     to {
-        background-color: #ffffff;
-        color: #000000;
+        background-color: #000000;
+        color: #ffffff;
     }
 }
 
+/* Using steps() instead of linear as a timing function to limit cpu usage */
 #battery.critical:not(.charging) {
     background-color: #f53c3c;
     color: #ffffff;
@@ -139,14 +129,73 @@ tooltip label {
     animation-direction: alternate;
 }
 
+#power-profiles-daemon {
+    padding: 0 5px;
+    min-width: 16px;
+    /* padding-right: 15px; */
+}
+
 #power-profiles-daemon.performance {
-    color: #f53c3c;
+    background-color: #f53c3c;
+    color: #ffffff;
+}
+
+#power-profiles-daemon.balanced {
+    /* background-color: #2980b9; */
+    /* color: #ffffff; */
+}
+
+#power-profiles-daemon.power-saver {
+    /* background-color: #2ecc71; */
+    /* color: #000000; */
 }
 
 label:focus {
     background-color: #000000;
 }
 
+#cpu {
+    /* background-color: #2ecc71; */
+    /* color: #000000; */
+}
+
+#memory {
+    /* background-color: #9b59b6; */
+}
+
+#backlight {
+    /* background-color: #90b1b1; */
+}
+
+#network {
+    /* background-color: #2980b9; */
+}
+
+#network.disconnected {
+    background-color: #f53c3c;
+}
+
+#wireplumber {
+    /* background-color: #f1c40f; */
+    /* color: #000000; */
+}
+
+#wireplumber.muted {
+    background-color: #f53c3c;
+}
+
+#temperature {
+    /* background-color: #f0932b; */
+}
+
+#temperature.critical {
+    background-color: #eb4d4b;
+}
+
+#tray {
+    /* background-color: #2980b9; */
+}
+
 #tray > .passive {
     -gtk-icon-effect: dim;
 }
@@ -156,6 +205,18 @@ label:focus {
     background-color: #eb4d4b;
 }
 
+#idle_inhibitor {
+    /* background-color: #2d3436; */
+}
+
 #idle_inhibitor.activated {
-    color: #f53c3c;
+    background-color: #ecf0f1;
+    color: #2d3436;
+}
+
+#language {
+    /* background: #00b093; */
+    /* color: #740864; */
+    padding: 0 5px;
+    min-width: 16px;
 }