refactor(waybar): misc tweaks + additions (#371)

scottames · Nov 13, 2024 · 09fe6d5 · 09fe6d5
1 parent 3ef2e04
commit 09fe6d5
Show file tree

Hide file tree

Showing 4 changed files with 169 additions and 66 deletions.
diff --git a/home/.chezmoiexternal.toml.tmpl b/home/.chezmoiexternal.toml.tmpl
@@ -113,6 +113,14 @@
     stripComponents = 2
     include = ["*/themes/**"]
 
+[".config/waybar/themes"]
+    type = "archive"
+    url = "https://github.com/catppuccin/waybar/archive/main.tar.gz"
+    exact = true
+    refreshPeriod = "168h"
+    stripComponents = 2
+    include = ["*/themes/**"]
+
 #  ╭──────────────────────────────────────────────────────────╮
 #  │ git-repo                                                 │
 #  │ | utils                                                  │

diff --git a/home/private_dot_config/hypr/hyprlock.conf.tmpl b/home/private_dot_config/hypr/hyprlock.conf.tmpl
@@ -65,7 +65,7 @@ input-field {
     inner_color = $surface0
     font_color = $text
     fade_on_empty = false
-    placeholder_text = <span foreground="##$textAlpha"><i>󰌾 Logged in as </i><span foreground="##$accentAlpha">$USER</span></span>
+    placeholder_text = ...
     hide_input = false
     check_color = $accent
     fail_color = $red

diff --git a/home/private_dot_config/waybar/config.jsonc b/home/private_dot_config/waybar/config.jsonc
@@ -1,32 +1,75 @@
 {
+  "fixed-center": true,
   "layer": "top",
   "position": "top",
-  "modules-left": ["clock", "niri/workspaces", "niri/window"],
+  "modules-left": [
+    "niri/workspaces",
+    "niri/window",
+    "custom/music"
+  ],
   "modules-center": [
-    "custom/music",
-    // "wlr/taskbar"
+    "clock"
   ],
   "modules-right": [
     "tray",
-    "pulseaudio",
-    "backlight",
+    "cpu",
+    "memory",
+    "temperature",
+    "power-profiles-daemon",
+    "disk",
     "battery",
+    "backlight",
+    "network",
+    "pulseaudio",
     "custom/lock",
-    "custom/power",
+    "custom/power"
   ],
   "niri/window": {
     "icon": true,
-    "format": "",
+    "format": ""
   },
   "niri/workspaces": {
     "format": "{icon}",
     "format-icons": {
-      "default": "",
-    },
+      "default": ""
+    }
+  },
+  "power-profiles-daemon": {
+    "format": "{icon}",
+    "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+    "tooltip": true,
+    "format-icons": {
+      "default": "",
+      "performance": "󰓅",
+      "balanced": "󰾅",
+      "power-saver": "󰾆"
+    }
   },
   "tray": {
     "icon-size": 13,
-    "spacing": 10,
+    "spacing": 10
+  },
+  "disk": {
+    "interval": 30,
+    "format": "{path} {percentage_used}%",
+    "path": "/"
+  },
+  "cpu": {
+    "format": "{usage}% ",
+    "tooltip": false
+  },
+  "memory": {
+    "format": "{}% "
+  },
+  "temperature": {
+    "critical-threshold": 80,
+    // "format-critical": "{temperatureC}°C {icon}",
+    "format": "{temperatureC}°C {icon}",
+    "format-icons": [
+      "",
+      "",
+      ""
+    ]
   },
   "custom/music": {
     "format": "  {}",
@@ -35,63 +78,95 @@
     "tooltip": false,
     "exec": "playerctl metadata --format='{{ title }}'",
     "on-click": "playerctl play-pause",
-    "max-length": 50,
+    "max-length": 50
   },
   "clock": {
     "timezone": "America/Los_Angeles",
     // "format": "{:%H:%M}"
-    "format": "{:%R  %h %d}",
+    "format": " {:%R  %h %d} ",
     "format-alt": "{:%d/%m/%Y}",
-    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
     // "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
   },
   "backlight": {
     "device": "intel_backlight",
     "format": "{icon}",
-    "format-icons": ["", "", "", "", "", "", "", "", ""],
+    "format-icons": [
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      ""
+    ]
   },
   "battery": {
     "states": {
       "good": 75,
       "warning": 40,
-      "critical": 25,
+      "critical": 25
     },
     "format": "{icon} {capacity}%",
     "format-charging": " {capacity}%",
     "format-plugged": " {capacity}%",
     "format-alt": "{time} {icon}",
-    "format-icons": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰂀", "󰂂", "󰁹"],
+    "format-icons": [
+      "󰁺",
+      "󰁻",
+      "󰁼",
+      "󰁽",
+      "󰁾",
+      "󰂀",
+      "󰂂",
+      "󰁹"
+    ]
+  },
+  "network": {
+    "format-wifi": " ",
+    "format-ethernet": "",
+    "tooltip-format": "{essid} ({signalStrength}%)",
+    "tooltip-format-ethernet": "{ifname} {ipaddr}/{cidr}",
+    "format-linked": "{ifname} via {gwaddr} ",
+    "format-disconnected": "",
+    "format-alt": "{ifname}: {ipaddr}/{cidr}"
   },
   "pulseaudio": {
     "format": "{icon} {volume}%",
     "format-muted": "",
     "on-click": "pavucontrol",
     "scroll-step": 1,
     "format-icons": {
-      "default": ["", "", " "],
+      "default": [
+        "",
+        "",
+        " "
+      ],
       "headphone": "",
       "hands-free": "",
       "headset": "",
       "phone": "",
       "portable": "",
-      "car": "",
-    },
+      "car": ""
+    }
   },
   "wlr/taskbar": {
     "format": "{icon}",
     "icon-size": 14,
     "tooltip-format": "{title}",
     "on-click": "activate",
-    "on-click-middle": "close",
+    "on-click-middle": "close"
   },
   "custom/lock": {
     "tooltip": false,
     "on-click": "sh -c '(sleep 0.5s; hyprlock)' & disown",
-    "format": "",
+    "format": ""
   },
   "custom/power": {
     "tooltip": false,
     "on-click": "wlogout &",
-    "format": "",
-  },
+    "format": ""
+  }
 }