From 4684c110ed69fb9d5345ead14711ff11590f43f9 Mon Sep 17 00:00:00 2001 From: samantha42 Date: Sun, 8 Mar 2026 06:26:52 +0100 Subject: [PATCH] changed waybar --- hypr/hyprland.conf | 12 ++-- waybar/config | 104 ------------------------------ waybar/config.jsonc | 112 ++++++++++++++++++++++++++++++++ waybar/style.css | 153 +++++++++++++++++--------------------------- 4 files changed, 176 insertions(+), 205 deletions(-) delete mode 100644 waybar/config create mode 100644 waybar/config.jsonc diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 56c20d0..121b39b 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -7,13 +7,13 @@ monitor=DP-2,1920x1080@119.98200, 0x0,1 # --- Workspace assignments --- -workspace = 1, monitor:DP-2, default:true -workspace = 2, monitor:DP-2 -workspace = 3, monitor:DP-2 -workspace = 4, monitor:DP-2 -workspace = 5, monitor:DP-2 +workspace = 1, monitor:DP-2, default:true +workspace = 2, monitor:DP-2 +workspace = 3, monitor:DP-2 +workspace = 4, monitor:DP-2 +workspace = 5, monitor:DP-2 -workspace = 6, monitor:HDMI-A-1, default:true +workspace = 6, monitor:HDMI-A-1, default:true workspace = 7, monitor:HDMI-A-1 workspace = 8, monitor:HDMI-A-1 workspace = 9, monitor:HDMI-A-1 diff --git a/waybar/config b/waybar/config deleted file mode 100644 index c240127..0000000 --- a/waybar/config +++ /dev/null @@ -1,104 +0,0 @@ -{ - "layer": "top", - "position": "top", - "height": 36, - "spacing": 4, - "margin-top": 4, - "margin-left": 10, - "margin-right": 10, - - "modules-left": ["hyprland/workspaces", "hyprland/window"], - "modules-center": ["clock"], - "modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "tray"], - - "hyprland/workspaces": { - "format": "{icon}", - "on-click": "activate", - "all-outputs": true, - "active-only": false, - "persistent-workspaces": { - "1": [], - "2": [], - "3": [], - "4": [], - "5": [], - "6": [], - "7": [], - "8": [], - "9": [], - "10": [] - }, - "format-icons": { - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7", - "8": "8", - "9": "9", - "10": "10", - "urgent": "", - "active": "", - "default": "" - } - }, - - "hyprland/window": { - "format": " {}", - "max-length": 50, - "separate-outputs": true - }, - - "clock": { - "format": " {:%H:%M}", - "format-alt": " {:%A, %B %d %Y}", - "tooltip-format": "{:%Y %B}\n{calendar}" - }, - - "cpu": { - "format": " {usage}%", - "tooltip": true, - "interval": 2 - }, - - "memory": { - "format": " {used:0.1f}G", - "interval": 2 - }, - - "battery": { - "states": { - "warning": 30, - "critical": 15 - }, - "format": "{icon} {capacity}%", - "format-charging": " {capacity}%", - "format-plugged": " {capacity}%", - "format-icons": ["", "", "", "", ""] - }, - - "network": { - "format-wifi": " {signalStrength}%", - "format-ethernet": " {ipaddr}", - "format-disconnected": "󰌙 Offline", - "tooltip-format": "{essid} — {ipaddr}\n{bandwidthUpBits} up {bandwidthDownBits} down", - "interval": 5 - }, - - "pulseaudio": { - "format": "{icon} {volume}%", - "format-muted": "󰝟 Muted", - "format-icons": { - "headphone": "󰋋", - "default": ["󰕿", "󰖀", "󰕾"] - }, - "on-click": "pavucontrol" - }, - - "tray": { - "spacing": 8, - "icon-size": 16 - } -} diff --git a/waybar/config.jsonc b/waybar/config.jsonc new file mode 100644 index 0000000..288acff --- /dev/null +++ b/waybar/config.jsonc @@ -0,0 +1,112 @@ +[ + { + "layer": "top", + "output": "DP-2", + "position": "top", + "height": 36, + "spacing": 4, + "margin-top": 4, + "margin-left": 10, + "margin-right": 10, + "modules-left": ["hyprland/workspaces", "hyprland/window"], + "modules-center": ["clock"], + "modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "tray"], + "hyprland/workspaces": { + "format": "{icon}", + "on-click": "activate", + "all-outputs": false, + "active-only": false, + "persistent-workspaces": { + "DP-2": [1, 2, 3, 4, 5] + }, + "format-icons": { + "1": "1", "2": "2", "3": "3", "4": "4", "5": "5", + "urgent": "", "active": "╳", "default": "" + } + }, + "hyprland/window": { "format": " {}", "max-length": 20, "separate-outputs": true }, + "clock": { + "format": "{:%H:%M, %A, %B %d %Y}", + "format-alt": "{:%H:%M}", + "tooltip-format": "{:%Y %B}\n{calendar}" + }, + "cpu": { "format": "{usage}%", "tooltip": true, "interval": 2 }, + "memory": { "format": "{used:0.1f}G", "interval": 2 }, + "battery": { + "states": { "warning": 30, "critical": 15 }, + "format": "{icon} {capacity}%", + "format-charging": "{capacity}%", + "format-plugged": "{capacity}%", + "format-icons": ["", "", "", "", ""] + }, + "network": { + "format-wifi": "{signalStrength}%", + "format-ethernet": " {ipaddr}", + "format-disconnected": "󰌙 Offline", + "tooltip-format": "{essid} — {ipaddr}\n{bandwidthUpBits} up {bandwidthDownBits} down", + "interval": 5 + }, + "pulseaudio": { + "format": "{icon} {volume}%", + "format-muted": "󰝟 Muted", + "format-icons": { "headphone": "󰋋", "default": ["󰕿", "󰖀", "󰕾"] }, + "on-click": "pavucontrol" + }, + "tray": { "spacing": 8, "icon-size": 16 } + }, + { + "layer": "top", + "output": "HDMI-A-1", + "position": "top", + "height": 36, + "spacing": 4, + "margin-top": 4, + "margin-left": 10, + "margin-right": 10, + "modules-left": ["hyprland/workspaces", "hyprland/window"], + "modules-center": ["clock"], + "modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "tray"], + "hyprland/workspaces": { + "format": "{icon}", + "on-click": "activate", + "all-outputs": false, + "active-only": false, + "persistent-workspaces": { + "HDMI-A-1": [6, 7, 8, 9, 10] + }, + "format-icons": { + "6": "6", "7": "7", "8": "8", "9": "9", "10": "10", + "urgent": "", "active": "╳", "default": "" + } + }, + "hyprland/window": { "format": " {}", "max-length": 50, "separate-outputs": true }, + "clock": { + "format": "{:%H:%M, %A, %B %d %Y}", + "format-alt": "{:%H:%M}", + "tooltip-format": "{:%Y %B}\n{calendar}" + }, + "cpu": { "format": "{usage}%", "tooltip": true, "interval": 2 }, + "memory": { "format": "{used:0.1f}G", "interval": 2 }, + "battery": { + "states": { "warning": 30, "critical": 15 }, + "format": "{icon} {capacity}%", + "format-charging": "{capacity}%", + "format-plugged": "{capacity}%", + "format-icons": ["", "", "", "", ""] + }, + "network": { + "format-wifi": "{signalStrength}%", + "format-ethernet": " {ipaddr}", + "format-disconnected": "󰌙 Offline", + "tooltip-format": "{essid} — {ipaddr}\n{bandwidthUpBits} up {bandwidthDownBits} down", + "interval": 5 + }, + "pulseaudio": { + "format": "{icon} {volume}%", + "format-muted": "󰝟 Muted", + "format-icons": { "headphone": "󰋋", "default": ["󰕿", "󰖀", "󰕾"] }, + "on-click": "pavucontrol" + }, + "tray": { "spacing": 8, "icon-size": 16 } + } +] \ No newline at end of file diff --git a/waybar/style.css b/waybar/style.css index ba23f4f..2dc5b2c 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,71 +1,70 @@ /* ── Global ─────────────────────────────────────────── */ * { - font-family: "JetBrainsMono Nerd Font", "Noto Sans", monospace; - font-size: 13px; - border: none; - border-radius: 0; - min-height: 0; + font-family: "JetBrainsMono Nerd Font", "Noto Sans", monospace; + font-size: 13px; + border: none; + border-radius: 0; + min-height: 0; } window#waybar { - background: rgba(17, 17, 27, 0.90); - color: #cdd6f4; - border-bottom: 2px solid rgba(137, 180, 250, 0.25); - border-radius: 10px; + background: rgba(17, 17, 27, 0); + color: #cdd6f4; + /*border-bottom: 2px solid rgba(137, 180, 250, 0.25);*/ + border-radius: 10px; } /* ── Workspaces ─────────────────────────────────────── */ #workspaces { - background: rgba(30, 30, 46, 0.85); - border-radius: 8px; - padding: 2px 6px; - margin: 4px 6px; + background: rgba(30, 30, 46, 0.85); + border-radius: 8px; + padding: 2px 6px; } #workspaces button { - padding: 2px 8px; - margin: 0 2px; - color: #6c7086; - background: transparent; - border-radius: 6px; - font-size: 15px; - transition: all 0.2s ease; + padding: 2px 8px; + color: #6c7086; + background: transparent; + border-radius: 6px; + font-size: 15px; + transition: all 0.2s ease; } #workspaces button:hover { - background: rgba(137, 180, 250, 0.15); - color: #89b4fa; + background: rgba(137, 180, 250, 0.15); + color: #89b4fa; } #workspaces button.active { - color: #89b4fa; - background: rgba(137, 180, 250, 0.20); - border-bottom: 2px solid #89b4fa; + color: #89b4fa; + background: rgba(137, 180, 250, 0.20); + border-bottom: 2px solid #89b4fa; } #workspaces button.urgent { - color: #f38ba8; - background: rgba(243, 139, 168, 0.15); + color: #f38ba8; + background: rgba(243, 139, 168, 0.15); } #workspaces button.empty { - color: #313244; + color: #313244; } /* ── Window title ───────────────────────────────────── */ #window { - color: #a6adc8; - padding: 0 10px; - font-style: italic; + color: #a6adc8; + padding: 0 10px; + font-style: italic; + border-bottom: 2px solid rgba(45, 57, 76, 0.819); } /* ── Clock ──────────────────────────────────────────── */ #clock { - color: #cba6f7; - background: rgba(203, 166, 247, 0.10); - border-radius: 8px; - padding: 2px 14px; - font-weight: bold; + color: #cba6f7; + padding: 1px 14px; + font-weight: bold; + border-radius: 8px; + background: rgba(30, 30, 46, 0.85); } /* ── Right modules shared style ─────────────────────── */ @@ -74,83 +73,47 @@ window#waybar { #battery, #network, #pulseaudio { - padding: 2px 10px; - margin: 4px 2px; - border-radius: 8px; - background: rgba(30, 30, 46, 0.85); + padding: 2px 10px; + border-radius: 8px; + background: rgba(30, 30, 46, 0.85); } /* ── CPU ────────────────────────────────────────────── */ -#cpu { - color: #a6e3a1; -} - -#cpu.warning { - color: #fab387; -} - -#cpu.critical { - color: #f38ba8; -} +#cpu { color: #a6e3a1; } +#cpu.warning { color: #fab387; } +#cpu.critical { color: #f38ba8; } /* ── Memory ─────────────────────────────────────────── */ -#memory { - color: #89dceb; -} +#memory { color: #89dceb; } /* ── Battery ────────────────────────────────────────── */ -#battery { - color: #a6e3a1; -} - -#battery.warning { - color: #fab387; -} - -#battery.critical { - color: #f38ba8; - animation: blink 1s linear infinite; -} - -#battery.charging { - color: #a6e3a1; -} +#battery { color: #a6e3a1; } +#battery.warning { color: #fab387; } +#battery.critical { color: #f38ba8; animation: blink 1s linear infinite; } +#battery.charging { color: #a6e3a1; } @keyframes blink { - to { color: transparent; } + to { color: transparent; } } /* ── Network ────────────────────────────────────────── */ -#network { - color: #89b4fa; -} - -#network.disconnected { - color: #6c7086; -} +#network { color: #89b4fa; } +#network.disconnected { color: #6c7086; } /* ── Audio ──────────────────────────────────────────── */ -#pulseaudio { - color: #f5c2e7; -} - -#pulseaudio.muted { - color: #6c7086; -} +#pulseaudio { color: #f5c2e7; } +#pulseaudio.muted { color: #6c7086; } /* ── Tray ───────────────────────────────────────────── */ #tray { - padding: 2px 8px; - margin: 4px 4px; - border-radius: 8px; - background: rgba(30, 30, 46, 0.85); -} - -#tray > .passive { - -gtk-icon-effect: dim; + padding: 2px 8px; + border-radius: 8px; + background: rgba(30, 30, 46, 0.85); } +#tray > .passive { -gtk-icon-effect: dim; } #tray > .needs-attention { - -gtk-icon-effect: highlight; - background-color: rgba(243, 139, 168, 0.2); + -gtk-icon-effect: highlight; + background-color: rgba(243, 139, 168, 0.2); } +