From e1125b19cb7bf9445f024120dc48266c30b50d80 Mon Sep 17 00:00:00 2001 From: Mark Hoekveen Date: Mon, 15 Apr 2024 15:46:32 +0200 Subject: [PATCH] waybar config move --- .config/hypr/hyprland.conf | 2 +- .config/waybar/config | 96 +++++++++++++++++++++++++++----------- .config/waybar/config.bak | 30 ++++++++++++ .config/waybar/hypr-config | 64 ------------------------- .config/waybar/style.css | 4 ++ 5 files changed, 103 insertions(+), 93 deletions(-) create mode 100644 .config/waybar/config.bak delete mode 100644 .config/waybar/hypr-config diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 36e20b6..41590c8 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -5,7 +5,7 @@ $Mod = SUPER # $launcher = rofi -show drun $launcher = bemenu-run $record = wf-recorder -c libx264 -g "$(slurp)" -f ~/screenshots/mov-$(date +"%Y-%m-%d--%H-%M-%S.mp4") -$bar = waybar -c ~/.config/waybar/hypr-config +$bar = waybar $wallpaper = swaybg -m fill -i ~/.cache/wallpaper.jpeg $term = kitty diff --git a/.config/waybar/config b/.config/waybar/config index 4602703..d704aa7 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -1,30 +1,70 @@ { - "layer": "bottom", - "position": "top", - "modules-left": [], - "modules-center": ["sway/workspaces", "sway/mode"], - "modules-right": ["clock", "idle_inhibitor", "tray"], - "sway/workspaces": { - "disable-scroll": true, - "all-outputs": false, - "format": "{name}" - }, - "sway/mode": { - "format": "{}" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "deactivated": "💤", - "activated": "🦉", - "default": "" - } - }, - "tray": { - "icon-size": 24, - "spacing": 16 - }, - "clock": { - "format": "{:%m-%d %H:%M}", - } + "layer": "top", + "position": "top", + "spacing": 0, + "modules-left": ["hyprland/workspaces"], + "modules-center": ["clock"], + "modules-right": ["custom/recording", "cpu", "disk", "disk#sda", "idle_inhibitor", "tray", "custom/transmission", "network"], + "hyprland/workspaces": { + "format": "{name}", + "all-outputs": false, + "on-click": "activate", + "sort-by-number": true + }, + "custom/recording": { + "format": "●", + "exec": "pgrep wf-recorder", + "format-icons": ["", "O"], + "exec-if": "pgrep wf-recorder", + "interval": 1 + }, + "network": { + "interface": "moz0", + "format": "🕵️", + "format-disconnected": "" + }, + "custom/gpu": { + "exec": "cat /sys/class/hwmon/hwmon2/device/gpu_busy_percent", + "format": "{icon}", + "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"], + "interval": 1 + }, + "custom/transmission": { + "exec": "/home/mark/.scripts/transmission", + "format": "{icon}", + "format-icons": ["", ""], + "interval": 5 + }, + "cpu": { + "interval": 1, + "format": "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}", + "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"], + }, + "disk": { + "path": "/", + "format": "{free}", + "tooltip-format": "{free} available on {path}" + }, + "disk#sda": { + "path": "/home/mark/Files", + "format": "{free}", + "interval": 5, + "tooltip-format": "{free} available on {path}" + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "deactivated": "💤", + "activated": "🦉", + "default": "" + } + }, + "tray": { + "icon-size": 26, + "spacing": 8 + }, + "clock": { + "format": "{:%H:%M}", + "tooltip-format": "{:%d %m}" + } } diff --git a/.config/waybar/config.bak b/.config/waybar/config.bak new file mode 100644 index 0000000..4602703 --- /dev/null +++ b/.config/waybar/config.bak @@ -0,0 +1,30 @@ +{ + "layer": "bottom", + "position": "top", + "modules-left": [], + "modules-center": ["sway/workspaces", "sway/mode"], + "modules-right": ["clock", "idle_inhibitor", "tray"], + "sway/workspaces": { + "disable-scroll": true, + "all-outputs": false, + "format": "{name}" + }, + "sway/mode": { + "format": "{}" + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "deactivated": "💤", + "activated": "🦉", + "default": "" + } + }, + "tray": { + "icon-size": 24, + "spacing": 16 + }, + "clock": { + "format": "{:%m-%d %H:%M}", + } +} diff --git a/.config/waybar/hypr-config b/.config/waybar/hypr-config deleted file mode 100644 index 656b833..0000000 --- a/.config/waybar/hypr-config +++ /dev/null @@ -1,64 +0,0 @@ -{ - "layer": "top", - "position": "top", - "spacing": 0, - "modules-left": ["hyprland/workspaces"], - "modules-center": ["clock"], - "modules-right": ["custom/recording", "custom/gpu", "cpu", "disk", "disk#sda", "idle_inhibitor", "tray", "network"], - "hyprland/workspaces": { - "format": "{name}", - "all-outputs": false, - "on-click": "activate", - "sort-by-number": true - }, - "custom/recording": { - "format": "●", - "exec": "pgrep wf-recorder", - "format-icons": ["", "O"], - "exec-if": "pgrep wf-recorder", - "interval": 1 - }, - "network": { - "interface": "moz0", - "format": "🕵️", - "format-disconnected": "" - }, - "custom/gpu": { - "exec": "cat /sys/class/hwmon/hwmon2/device/gpu_busy_percent", - "format": "{icon}", - "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"], - "interval": 1 - }, - "cpu": { - "interval": 1, - "format": "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}", - "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"], - }, - "disk": { - "path": "/", - "format": "{free}", - "tooltip-format": "{free} available on {path}" - }, - "disk#sda": { - "path": "/home/mark/Files", - "format": "{free}", - "interval": 5, - "tooltip-format": "{free} available on {path}" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "deactivated": "💤", - "activated": "🦉", - "default": "" - } - }, - "tray": { - "icon-size": 26, - "spacing": 8 - }, - "clock": { - "format": "{:%H:%M}", - "tooltip-format": "{:%d %m}" - } -} diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 6b7980b..b58c14b 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -49,6 +49,7 @@ window { #disk, #idle_inhibitor, #custom-gpu, +#custom-transmission, #custom-recording, #network, #wireplumber @@ -60,6 +61,9 @@ window { #custom-recording { color: red; } +#custom-transmission { + color:#FEE; +} #clock { background-color: alpha(@background, 0.8);