From 68d112a8a4dd766047c619a8f0c42a11391434d3 Mon Sep 17 00:00:00 2001 From: "Matthieu Fortin (CPC/CCP)" Date: Thu, 19 Sep 2024 16:05:50 -0400 Subject: [PATCH] waybar config --- hyprland/.config/hypr/README.md | 1 + hyprland/.config/hypr/hyprland.conf | 4 +- hyprland/.config/rofi/config.rasi | 1 + hyprland/.config/waybar/config | 97 ++++++------------- hyprland/.config/waybar/style.css | 68 ++++++++++++- hyprland/.config/{waybar => waybar2}/Modules | 0 .../{waybar => waybar2}/ModulesWorkspaces | 0 hyprland/.config/waybar2/config | 69 +++++++++++++ .../.config/{waybar => waybar2}/config.old | 0 .../.config/{waybar => waybar2}/mocha.css | 0 hyprland/.config/waybar2/style.css | 1 + .../wallust/colors-waybar.css | 0 12 files changed, 171 insertions(+), 70 deletions(-) create mode 100644 hyprland/.config/hypr/README.md rename hyprland/.config/{waybar => waybar2}/Modules (100%) rename hyprland/.config/{waybar => waybar2}/ModulesWorkspaces (100%) create mode 100644 hyprland/.config/waybar2/config rename hyprland/.config/{waybar => waybar2}/config.old (100%) rename hyprland/.config/{waybar => waybar2}/mocha.css (100%) create mode 100644 hyprland/.config/waybar2/style.css rename hyprland/.config/{waybar => waybar2}/wallust/colors-waybar.css (100%) diff --git a/hyprland/.config/hypr/README.md b/hyprland/.config/hypr/README.md new file mode 100644 index 0000000..6eef01b --- /dev/null +++ b/hyprland/.config/hypr/README.md @@ -0,0 +1 @@ +https://git.sr.ht/~robertgzr/dotfiles/tree/master/item/.config/waybar/config.jsonc diff --git a/hyprland/.config/hypr/hyprland.conf b/hyprland/.config/hypr/hyprland.conf index feae018..d3fa95c 100644 --- a/hyprland/.config/hypr/hyprland.conf +++ b/hyprland/.config/hypr/hyprland.conf @@ -33,8 +33,8 @@ exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CUR exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # ##exec-once = hyprpaper exec-once = hypridle $ # -##exec-once = ~/.config/hypr/scripts/waybar.sh -exec-once = waybar & # +exec-once = ~/.config/hypr/scripts/waybar.sh +#exec-once = waybar & # exec-once = nm-applet --indicator & # exec-once = swaync & # exec-once = blueman-applet & # diff --git a/hyprland/.config/rofi/config.rasi b/hyprland/.config/rofi/config.rasi index 3a6f50e..65c3ad2 100755 --- a/hyprland/.config/rofi/config.rasi +++ b/hyprland/.config/rofi/config.rasi @@ -11,6 +11,7 @@ configuration { /* ---- Window ---- */ window { width: 60%; + } /* ---- Listview ---- */ listview { diff --git a/hyprland/.config/waybar/config b/hyprland/.config/waybar/config index f60a20b..489cba8 100644 --- a/hyprland/.config/waybar/config +++ b/hyprland/.config/waybar/config @@ -1,69 +1,32 @@ -/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ - -// ### DEFAULT - Top ### // { -"include": [ - "$HOME/.config/waybar/Modules", - "$HOME/.config/waybar/ModulesWorkspaces", - ], -"layer": "top", -//"mode": "dock", -"exclusive": true, -"passthrough": false, -"position": "top", -"spacing": 3, -"fixed-center": true, -"ipc": true, -"margin-top": 3, -"margin-left": 8, -"margin-right": 8, - -"modules-left": [ - "hyprland/workspaces#pacman", - "custom/separator#dot-line", - "cpu", - "custom/separator#dot-line", - "temperature", - "custom/separator#dot-line", - "memory", - "custom/separator#dot-line", - "custom/weather", - "custom/separator#blank_3", - "custom/cava_mviz", - ], - -"modules-center": [ - "custom/menu", - "custom/separator#dot-line", - "idle_inhibitor", - "custom/separator#dot-line", - "clock", - "custom/separator#dot-line", - "custom/light_dark", - "custom/separator#dot-line", - "custom/lock", - //], - "custom/separator#dot-line", - "custom/hint", - ], - -"modules-right": [ - "network#speed", - "custom/separator#dot-line", - "custom/swaync", - "tray", - "mpris", - "custom/separator#dot-line", - "bluetooth", - "custom/separator#dot-line", - "pulseaudio", - "custom/separator#dot-line", - "pulseaudio#microphone", - "custom/separator#dot-line", - "keyboard-state", - "custom/separator#dot-line", - "custom/keyboard", - "custom/separator#dot-line", - "custom/power", - ], + "layer":"top", + "position":"top", + "modules-left":["hyprland/workspaces"], + "modules-center":["hyprland/window"], + "modules-right":["wireplumber","battery","clock"], + "battery":{ + "format":"{capacity}% {icon}", + "format-icons": ["", "", "", "", ""], + }, + "clock": { + "format":"{:%H:%M}", + "format-alt": "{:%Y-%m-%d %H:%M}" + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "wireplumber": { + "format":"{volume}% {icon}", + "format-muted": "", + "scroll-step": 1, + "on-click":"qpwgraph", + "format-icons": ["", "", ""], + "tooltip":true, + "tooltip-format": "{volume}%" + } } + diff --git a/hyprland/.config/waybar/style.css b/hyprland/.config/waybar/style.css index 062c1ee..65fdb80 100644 --- a/hyprland/.config/waybar/style.css +++ b/hyprland/.config/waybar/style.css @@ -1 +1,67 @@ -@import "mocha.css"; +* { + font-family: FontAwesome, NotoSans, Helvetica, Arial, sans-serif; + font-size: 1rem; +} + +window#waybar { + background-color: rgba(43,48,59,0.5); + color: #ffffff; + transition-property: background-color; + transition-duration: .5s; +} + +window#waybar.hidden { + opacity: 0.2; +} + +#wireplumber, +#clock, +#battery { + padding: 0 0.625rem; + color: #ffffff; +} + +#window, +#workspaces { + margin: 0 0.25rem; +} + +.modules-left > widget:first-child > #workspaces { + margin-left: 0; +} + +.modules-right > widget:last-child > #workspaces { + margin-right: 0; +} + +#wireplumber, +#battery { + background-color: #ffffff; + color: #000000; +} + +#battery.plugged { + color: #ffffff; + background-color: #26A65B; +} + +#battery.discharging { + background-color: #ff1111; +} + +#battery.charging { + background-color: #00ff00; +} + +#clock { + background-color: #ffffff; + color: #000000; +} + +#idle_inhibitor.activated { + font-size: 1.5rem; +} + +#idle_inhibitor.deactivated { + font-size: 1.5rem; +} diff --git a/hyprland/.config/waybar/Modules b/hyprland/.config/waybar2/Modules similarity index 100% rename from hyprland/.config/waybar/Modules rename to hyprland/.config/waybar2/Modules diff --git a/hyprland/.config/waybar/ModulesWorkspaces b/hyprland/.config/waybar2/ModulesWorkspaces similarity index 100% rename from hyprland/.config/waybar/ModulesWorkspaces rename to hyprland/.config/waybar2/ModulesWorkspaces diff --git a/hyprland/.config/waybar2/config b/hyprland/.config/waybar2/config new file mode 100644 index 0000000..f60a20b --- /dev/null +++ b/hyprland/.config/waybar2/config @@ -0,0 +1,69 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT - Top ### // +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + ], +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "hyprland/workspaces#pacman", + "custom/separator#dot-line", + "cpu", + "custom/separator#dot-line", + "temperature", + "custom/separator#dot-line", + "memory", + "custom/separator#dot-line", + "custom/weather", + "custom/separator#blank_3", + "custom/cava_mviz", + ], + +"modules-center": [ + "custom/menu", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/separator#dot-line", + "clock", + "custom/separator#dot-line", + "custom/light_dark", + "custom/separator#dot-line", + "custom/lock", + //], + "custom/separator#dot-line", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "custom/separator#dot-line", + "custom/swaync", + "tray", + "mpris", + "custom/separator#dot-line", + "bluetooth", + "custom/separator#dot-line", + "pulseaudio", + "custom/separator#dot-line", + "pulseaudio#microphone", + "custom/separator#dot-line", + "keyboard-state", + "custom/separator#dot-line", + "custom/keyboard", + "custom/separator#dot-line", + "custom/power", + ], +} diff --git a/hyprland/.config/waybar/config.old b/hyprland/.config/waybar2/config.old similarity index 100% rename from hyprland/.config/waybar/config.old rename to hyprland/.config/waybar2/config.old diff --git a/hyprland/.config/waybar/mocha.css b/hyprland/.config/waybar2/mocha.css similarity index 100% rename from hyprland/.config/waybar/mocha.css rename to hyprland/.config/waybar2/mocha.css diff --git a/hyprland/.config/waybar2/style.css b/hyprland/.config/waybar2/style.css new file mode 100644 index 0000000..062c1ee --- /dev/null +++ b/hyprland/.config/waybar2/style.css @@ -0,0 +1 @@ +@import "mocha.css"; diff --git a/hyprland/.config/waybar/wallust/colors-waybar.css b/hyprland/.config/waybar2/wallust/colors-waybar.css similarity index 100% rename from hyprland/.config/waybar/wallust/colors-waybar.css rename to hyprland/.config/waybar2/wallust/colors-waybar.css