From 95a725957e1823e658dffd2a9b619b8262cbac5a Mon Sep 17 00:00:00 2001 From: pika Date: Mon, 10 Jun 2024 12:22:51 +0200 Subject: [PATCH] addet new config --- config | 91 ++++++++++++++++++++++++++++++-------------- style.css | 110 +++++++++++++++++++++++++++++++----------------------- 2 files changed, 126 insertions(+), 75 deletions(-) diff --git a/config b/config index 6dd2df6..d593bc6 100644 --- a/config +++ b/config @@ -3,12 +3,15 @@ { "layer": "top", "position": "top", - "margin": 0, + "margin-left": 4, + "margin-right": 4, + "margin-top": 0, + "margin-bottom": 0, "spacing": 4, "modules-left": ["hyprland/workspaces","hyprland/window"], - "modules-center": ["clock","tray"], + "modules-center": ["group/weather","tray"], "modules-right": ["pulseaudio","battery","network","group/info","group/power"], @@ -22,37 +25,41 @@ "modules": [ "custom/power", // First element is the "group leader" and won't ever be hidden "custom/powerm", + "custom/reboot", "custom/quit", "custom/lock", - "custom/reboot", ] }, "custom/quit": { "format": "󰗼", - "tooltip": false, + "tooltip": true, + "tooltip-format": "terminate session", "on-click": "hyprctl dispatch exit" }, "custom/lock": { "format": "󰍁", - "tooltip": false, - "on-click": "swaylock" + "tooltip": true, + "tooltip-format": "screenlock", + "on-click": "swaylock --screenshots --clock --indicator --effect-pixelate 18 --effect-blur 8x8" }, "custom/reboot": { "format": "󰜉", - "tooltip": false, + "tooltip": true, + "tooltip-format": "reboot", "on-click": "reboot" }, "custom/powerm": { "format": "", - "tooltip": false, - "on-click": "shutdown now" + "tooltip": true, + "tooltip-format": "shutdown!", + "on-click": "sudo systemctl shutdown now" }, "group/info": { "orientation": "inherit", "drawer": { - "children-class": "info", - "parent-class": "p_info", - "transition-left-to-right": false, + "children-class": "group-info", + "parent-class": "group-p-info", + "transition-left-to-right": true, }, "modules": [ "memory", "disk", "cpu" @@ -68,6 +75,7 @@ "2": "󰁕", "3": "󰁕", "4": "󰁕", + "5": "󰁕", "urgent": "󰊰", "active": "󰢚", "special": "󰮯", @@ -75,33 +83,60 @@ }, "window-rewrite-default": "", "window-rewrite": { - "nvim": " ", - "foot": " ", - "Thorium": "󰊯 ", - "mercury": " ", - "title<.*youtube.*>": " ", + "foot class": " ", + "foot": "", + "thorium": "󰊯", + "class": "󰝰", + "mercury":"", + "VSCodium": "", + "title": "", + "balenaEtcher": "󱊞", + "title<.*youtube.*>": "", "title<*netflix.*>": "󰝆", + "title": "", + "title": "󰓓", + "title": "󰓓", "Invidious": " ", "class title<.*github.*>": "", // Windows whose class is "firefox" and title contains "github". Note that "class" always comes first. }, }, "hyprland/window": { - "format": " {}", + "format": " {title}", "rewrite": { - "(.*) — Mozilla Firefox": "🌎 $1", + "~*": " $1", + "(.*) — ~/*": " $1" }, "separate-outputs": false }, + "group/weather": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "group-weather", + "transition-left-to-right": false, + }, + "modules": [ + "clock", + "custom/weather" + ] + }, "clock": { "format": "{:%H:%M}", - "tooltip": false + "tooltip": true + }, + "custom/weather": { + "format": "{}°", + "tooltip": true, + "interval": 3600, + "exec": "wttrbar", + "return-type": "json" }, "network": { "interval": 30, "on-click": "wl-copy $(ip address show up scope global | grep inet | head -n1 | cut -d/ -f 1 | tr -d [:space:] | cut -c5-)", - "on-click-right": "kitty --class floating $HOME/.config/hypr/scripts/wlan.sh", + "on-click-right": "foot $HOME/.config/hypr/scripts/wlan.sh", "format-wifi": "󰤨 {essid}", "format-ethernet": "󰈀 Wired", "fomat-disconnected": "󰤯 Disconnected", @@ -110,7 +145,7 @@ "tooltip-format-disconnected": "Disconnected", }, "pulseaudio": { - "format": "{icon} {volume}%", + "format": "{icon} {volume}%", "format-bluetooth": "{icon} {volume}%", "format-muted": " ", "format-icons": { @@ -145,11 +180,11 @@ }, "format": "{icon} {capacity}%", "format-icons": [ - "", - "", - "", - "", - "" + "󰁺", + "󰁼", + "󰁿", + "󰂁", + "󰁹" ] }, "disk": { @@ -162,7 +197,7 @@ "spacing": 10 }, "custom/power": { - "format": "⏼", + "format": "⏼ ", "on-click": "wlogout" }, "css-name": "style.css" diff --git a/style.css b/style.css index 0b3d70a..979f492 100644 --- a/style.css +++ b/style.css @@ -4,22 +4,25 @@ } @keyframes urgent-workspace { from { - color: yellow; + color: white; +} +75% { + color: red; } to { - color: red; + color: white; } } @keyframes border-expand { 0% { - border-top: none; - border-left: none; - border-right: none; + border-top: transparent; + border-left: transparent; + border-right: transparent; border-bottom: solid 2px currentcolor; border-radius: 100px; } 33% { - border-top: none; + border-top: transparent; border-left: solid 2px currentcolor; border-right: solid 2px currentcolor; border-bottom: solid 2px currentcolor; @@ -29,7 +32,7 @@ to { border-top: solid 2px currentcolor; border-left: solid 2px currentcolor; border-right: solid 2px currentcolor; - border-bottom: none; + border-bottom: transparent; border-radius: 33px; } to { @@ -43,72 +46,80 @@ tooltip { background: black; color: white; } -#p_info, +#p-info, +#weather, #info { - border-top: solid 1px #9649cd; - color: #9649cd; + border-top: solid 1px currentcolor; transition: 650ms; } -#p_info, +#p-info:hover, +#weather:hover, #info:hover { - border-bottom: solid 2px #9649cd; - border-top: none; - transition: 150ms; + border-bottom: solid 2px currentcolor; + border-top: solid 0px transparent; + transition: 350ms; } -window#waybar { - border-top: solid 1px transparent; - background: transparent; - opacity: 0.7; - /* background: rgba(153, 153, 153, 0.3); */ - color: white; -} -window#waybar.empty { - opacity: 1.125; -} -window#waybar.fullscreen { - border: solid 2px #d70947; - opacity: 1.0; -} #window { padding: 2px; - margin: 4px 4px 0; color: #fdf6e3; font-weight: 600; - border-top: solid 1px transparent; - transition: 2s; + transition: 300ms; +} +window#waybar { + border: solid 2px rgba(160, 160, 160, 0.329); + border-radius: 6px; + background: transparent; + transition: 700ms; +} +window#waybar.empty { + margin-top: 4px; + border: solid 2px rgba(136, 136, 136, 0.8); +} +window#waybar.fullscreen { + background: rgba(55, 55, 55, 0.6); + margin: 0; + border: solid 3px rgba(145, 11, 53, 0.8); + border-radius: 8px 8px 4px 4px; + transition: 300ms; } #workspaces button { - border-top: solid 2px currentcolor; - border-right: solid 2px currentcolor; - margin-top: 4px; + border-top: solid 1px currentcolor; + border-right: solid 1px currentcolor; + border-bottom: solid 1px transparent; + margin-top: 5px; + margin-left: 0px; padding: 0; + padding-right: 4px; transition: 200ms; - /* transition: transform 0.4s; */ - border-radius: 0; + border-radius: 2px 2px 2 0; } #workspaces button.empty { - opacity: 0.4; } #workspaces button.active { - color: #e44cdf; - padding: 0 10px; + color: rgba(255, 238, 0, 0.9); + padding: 0 8px; margin-top: 0; + margin-right: 2px; + margin-left: 1px; + border-top: solid 2px currentcolor; border-right: solid 2px currentcolor; - /* transition: translateY(0.75rem) 400ms; */ + border-radius: 8px 4px 2px 0; } #workspaces button.urgent { color: red; - animation: urgent-workspace ease-out 2s infinite; + animation: urgent-workspace ease-out 4s infinite; } #pulseaudio { color: #cbb643; } -/* #memory { */ -/* color: #740cbe; */ -/* } */ +#p-info, +#info, +#memory { + color: #9649cd; +} #cpu { color: #a70a3c; } @@ -121,12 +132,17 @@ window#waybar.fullscreen { #disk { color: #b58900; } +#custom-power { + border-radius: 0 8px 0 0; +} +#custom-weather, #custom-reboot, #custom-quit, #custom-lock, #custom-powerm, #custom-power { padding: 0.2rem 1rem; + margin: 0 1px; font-weight: 600; border-top: solid 1px currentcolor; transition: 350ms; @@ -138,10 +154,10 @@ window#waybar.fullscreen { #custom-power:hover { border-top: solid 2px red; transition: 250ms; + margin: 0; /* border-radius: 2rem; */ font-size: 1.5rem; } - #pulseaudio, #memory, #cpu, @@ -162,9 +178,9 @@ window#waybar.fullscreen { #memory:hover, #cpu:hover, #battery:hover, -#network:hover, #disk:hover, -#clock:hover { +#clock:hover, +#network:hover { border-top: solid 2px currentcolor; transition: 250ms; }