waybar

2 files changed, 81 insertions, 75 deletions

diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 5edd158..8f6148b 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -1,30 +1,31 @@
 {
   "layer": "top",
-  "position": "bottom",
+  // "position": "bottom",
   "output": "DP-2",
   "reload_style_on_change": true,
   "modules-left": [
-    "hyprland/workspaces"
-    // "hyprland/window"
+    "hyprland/workspaces",
+    "custom/layout",
+    "hyprland/window"
   ],
   "modules-right": [
     "custom/recording",
     // "image#album-art",
     // "custom/tasks",
     "custom/music",
-    // "custom/packages",
+    "custom/packages",
     "custom/news",
     "custom/torrent",
-    "custom/weather",
-    "cpu#usage",
+    // "custom/weather",
+    // "cpu#usage",
     // "cpu#bars",
     "custom/memory",
     "custom/mailbox",
     "wireplumber#source",
     "wireplumber#sink",
-    "custom/clock",
+    "clock",
+    // "custom/internet",
     "tray"
-    // "custom/internet"
   ],
 
   "hyprland/workspaces": {
@@ -35,6 +36,12 @@
     "format": "{icon}"
   },
 
+  "custom/layout" : {
+    "cursor": false,
+    "tooltip": false,
+    "format": " []= "
+  },
+
   "hyprland/window": {
     "rewrite": {
       "(.*) — Mozilla Firefox": "󰈹 $1",
@@ -44,14 +51,15 @@
       "(.*) - Nvim": " $1",
       "(.*) - mpv": " $1",
       "Yazi: (.*)": " $1",
-      "neomutt": " neomutt"
+      "neomutt": " neomutt",
+      "foot": " foot"
     }
   },
 
   "custom/recording" : {
     "cursor": false,
     "tooltip": false,
-    "format": "[ {} ]",
+    "format": "{}",
     "signal": 9,
     "exec" : "cat /tmp/recordingicon 2> /dev/null"
   },
@@ -81,7 +89,7 @@
     "cursor": false,
     "tooltip": false,
     "escape": true,
-    "format": "[ {} ]",
+    "format": "{}",
     "signal": 11,
     "exec" : "stmusic",
     "on-click": "BLOCK_BUTTON=1 stmusic",
@@ -108,19 +116,19 @@
   "custom/news" : {
     "cursor": false,
     "tooltip": false,
-    "format": "[ {} ]",
+    "format": "{}",
     "signal": 6,
     "exec" : "sb-news",
     "on-click": "BLOCK_BUTTON=1 sb-news; pkill -RTMIN+6 waybar",
-    "on-click-right": "BLOCK_BUTTON=3 sb-news 3",
-    "on-click-middle": "BLOCK_BUTTON=2 sb-news 2",
-    "on-click-backward": "BLOCK_BUTTON=8 sb-news 8"
+    "on-click-right": "BLOCK_BUTTON=3 sb-news",
+    "on-click-middle": "BLOCK_BUTTON=2 sb-news",
+    "on-click-backward": "BLOCK_BUTTON=8 sb-news"
   },
 
   "custom/torrent" : {
     "cursor": false,
     "tooltip": false,
-    "format": "[ {} ]",
+    "format": "{}",
     "signal": 7,
     "interval": 10,
     "exec" : "sttorrent",
@@ -133,7 +141,7 @@
   "custom/weather" : {
     "cursor": false,
     "tooltip": false,
-    "format": "[ {} ]",
+    "format": "{}",
     "signal": 5,
     "exec" : "stweath",
     "interval" : 400,
@@ -145,7 +153,7 @@
   "cpu#usage" : {
     "cursor": false,
     "tooltip": false,
-    "format": "[ {icon} {usage}%",
+    "format": "{icon} {usage}%",
     "interval": 5,
     "states": {
       "high": 70,
@@ -170,7 +178,7 @@
   "custom/memory" : {
     "cursor": false,
     "tooltip": false,
-    "format": "{} ]",
+    "format": "{}",
     "signal": 14,
     "exec" : "stmemory",
     "interval": 5,
@@ -195,7 +203,7 @@
   "custom/mailbox" : {
     "cursor": false,
     "tooltip": false,
-    "format": "[ {} ]",
+    "format": "{}",
     "signal": 12,
     "exec" : "stmail",
     "interval" : 180,
@@ -219,7 +227,7 @@
     "tooltip-format": "{ifname}",
     "tooltip-format-wifi": "{essid} ({signalStrength}%) ",
     "tooltip-format-ethernet": "{ifname} ",
-    "tooltip-format-disconnected": "Disconnected",
+    "tooltip-format-disconnected": "Disconnected"
     //"max-length": 50
   },
 
@@ -238,44 +246,39 @@
   "wireplumber#sink" : {
     "tooltip": false,
     "cursor": false,
-    "format": "{icon} {volume}% ]",
-    "format-muted": " ]",
-    "format-icons": ["", "", ""],
+    "format": "{icon}{volume}%",
+    "format-muted": "🔇",
+    "format-icons": ["🔈", "🔉", "🔊"],
     "signal": 10,
     "interval": 30,
-    "on-click": "dmenuaudioswitch output",
+    "on-click": "$TERMINAL -e pulsemixer",
     "on-click-middle": "wpctl set-mute @DEFAULT_SINK@ toggle",
     "on-scroll-up": "wpctl set-volume @DEFAULT_SINK@ 1%+",
     "on-scroll-down": "wpctl set-volume @DEFAULT_SINK@ 1%-",
-    "on-click-right": "notify-send \" Volume module\" \"\\- Shows volume ,  if muted.\n- Middle click to mute.\n- Scroll to change.\""
+    "on-click-right": "notify-send \"🔊 Volume module\" \"\\- Shows volume 🔊, 🔇 if muted.\n- Middle click to mute.\n- Scroll to change.\""
   },
 
   "wireplumber#source" : {
     "node-type": "Audio/Source",
     "tooltip": false,
     "cursor": false,
-    "format": "[  {volume}%",
-    "format-muted": "[ ",
+    "format": "🎙️{volume}%",
+    "format-muted": "",
     "signal": 23,
     "interval": 30,
-    "on-click": "dmenuaudioswitch input",
-    "on-click-middle": "wpctl set-mute @DEFAULT_SINK@ toggle",
+    "on-click": "$TERMINAL -e pulsemixer & sleep 0.1 && hyprctl --instance 0 dispatch sendshortcut ,F2 ,title:pulsemixer",
+    "on-click-middle": "wpctl set-mute @DEFAULT_SOURCE@ toggle",
     "on-scroll-up": "wpctl set-volume @DEFAULT_SOURCE@ 1%+",
     "on-scroll-down": "wpctl set-volume @DEFAULT_SOURCE@ 1%-",
-    "on-click-right": "notify-send \" Microphone volume module\" \"\\- Shows volume ,  if muted.\n- Middle click to mute.\n- Scroll to change.\""
+    "on-click-right": "notify-send \"🎙️ Microphone volume module\" \"\\- Shows volume 🎙️,  if muted.\n- Middle click to mute.\n- Scroll to change.\""
   },
 
-  "custom/clock" : {
+  "clock" : {
     "tooltip": false,
     "cursor": false,
-    "format": "[ {} ]",
+    "format": "{:%a %b %d %H:%M}",
     "signal": 1,
-    "exec" : "stclock",
-    "interval" : 1,
-    "on-click": "BLOCK_BUTTON=1 stclock",
-    "on-click-middle": "BLOCK_BUTTON=2 stclock",
-    "on-click-right": "BLOCK_BUTTON=3 stclock",
-    "on-click-backward": "setsid -f \"$TERMINAL\" -e $EDITOR ~/.local/src/statusbar/src/stclock.c"
+    "interval" : 20
   },
 
   "custom/internet" : {
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index a5b6865..b9dd3c9 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,17 +1,30 @@
+@define-color bg                #282828;
+@define-color fg                #ebdbb2;
+@define-color red               #cc241d;
+@define-color bright_red        #fb4934;
+
 * {
     font-family: monospace;
+    /* font-weight: bold; */
     font-size: 17px;
     border: none;
+    border-radius: 0px;
 }
 
 window#waybar {
-    background-color: #282828;
-    color: #ebdbb2;
+    background-color: @fg;
+    color: @bg;
+}
+
+.modules-right {
+  color: @fg;
+  background-color: @bg;
+  padding-left: 8px;
 }
 
-window#waybar > * {
-    margin-top: 3px;
-    margin-bottom: 3px; /* margin-top + bar underline thickness */
+.modules-left {
+  color: @fg;
+  background-color: @bg;
 }
 
 window#waybar.hidden {
@@ -24,26 +37,41 @@ window#waybar.hidden {
 }
 
 #workspaces button {
-    padding: 0;
+    padding: 3 8 3 8;
     min-height: 0px;
-    margin-left: 4px;
-    color: #495156;
+    /* margin-left: 4px; */
+    color: @fg;
+    background-color: @bg;
 }
 
 #workspaces button.active {
-    color: #d3c6aa;
+    color: @bg;
+    background-color: @fg;
 }
 
 #workspaces button.urgent {
     color: #e67e80;
 }
 
+#custom-layout {
+  color: @fg;
+  /* padding-left: 5px; */
+  /* padding-right: 5px; */
+  background-color: @bg;
+}
+
+#window {
+  padding-left: 10px;
+  color: @bg;
+  background-color: @fg;
+}
+
 #mode {
     background-color: #ff0000;
     box-shadow: inset 0 -3px #0000ff;
 }
 
-#custom-clock,
+#clock,
 #battery,
 #cpu,
 #custom-memory,
@@ -73,15 +101,10 @@ window#waybar.hidden {
 #custom-notifications,
 #custom-power,
 #mpd {
-    padding: 0 2px;
+    padding: 0 5px;
     margin-right: 2px;
 }
 
-#window,
-#workspaces {
-    margin: 0 4px;
-}
-
 /* If workspaces is the leftmost module, omit left margin */
 .modules-left > widget:first-child > #workspaces {
     margin-left: 0;
@@ -374,23 +397,3 @@ label:focus {
 #privacy-item.audio-out {
     background-color: #00ff00;
 }
-
-tooltip {
-  background-color: @color-tooltip-bg;
-  border: none;
-  border-radius: 5px;
-}
-
-tooltip decoration {
-  box-shadow: none;
-}
-
-tooltip decoration:backdrop {
-  box-shadow: none;
-}
-
-tooltip label {
-  color: @color-tooltip-fg;
-  padding-left: 5px;
-  padding-right: 5px;
-}