diff --git a/waybar/config.json b/waybar/config.json index bc8f6a1..aa03aba 100755 --- a/waybar/config.json +++ b/waybar/config.json @@ -3,9 +3,11 @@ "name": "main", "layer": "top", "position": "top", - "height": 34, + "height": 38, "spacing": 4, - "margin-top": 10, + "margin-top": 5, + "margin-left": 800, + "margin-right": 800, "margin-bottom": 0, "output": "DP-2", "modules-left": [ @@ -15,9 +17,8 @@ "cpu", "temperature" ], - "modules-center": ["wlr/taskbar"], + "modules-center": ["hyprland/workspaces"], "modules-right": [ - "hyprland/workspaces", "tray", "custom/weather", "network#ethernet", @@ -68,27 +69,24 @@ "format": "{}" }, "hyprland/workspaces": { - "format": "{name}", + "format": "{icon}", "sort-by-number": true, - "all-outputs": true - }, - "wlr/taskbar": { - "format": "{name}", - "icon-size": 32, - "tooltip": false, - "on-click": "activate", - "on-click-right": "close", "all-outputs": true, - "ignore-list": [ - "xwaylandvideobridge" - ], - "rewrite": { - "(.*)Firefox Web Browser": "", - "(.*)Discord": "", - "(.*)Alacritty": "", - "Steam(.*)": "", - "(.*)Spotify": "" + "disable-scroll": true, + "active-only": false, + "format-icons": { + "default": "", + "persistent": "", + "active": "" + }, + "persistent-workspaces": { + "1": [ ], + "2": [ ], + "3": [ ], + "4": [ ], + "5": [ ] } + }, "wireplumber": { "format": " {volume}%", @@ -102,13 +100,6 @@ "icon-size": 21, "spacing": 10 }, - "custom/spotify": { - "interval": 1, - "return-type": "json", - "exec": "~/.config/waybar/scripts/spotify.sh", - "exec-if": "pgrep spotify", - "escape": true - }, "custom/poweroff": { "tooltip": false, "format": " ", @@ -119,7 +110,7 @@ "return-type": "json", "format": "{}", "tooltip": true, - "interval": 3600 + "interval": 600 } } ] diff --git a/waybar/style.css b/waybar/style.css index a5dae49..beb5ac1 100755 --- a/waybar/style.css +++ b/waybar/style.css @@ -4,44 +4,36 @@ border: none; border-radius: 0px; min-height: 0; - font-size: 15px; + font-size: 14px; font-family: "Hack Nerd Font"; - /*background: @base;*/ } window#waybar { - background-color: transparent; - color: #ffffff; - transition-property: background-color; - transition-duration: .5s; + background-color: @base; + color: @text; + border-radius: 6px; } window#waybar.hidden { opacity: 0.2; } +#workspaces { + margin: 4px 0; + border-radius: 5px; + background: transparent; +} + #workspaces button { - border-radius: 20px; + color: @overlay0; + background: transparent; + transition: all 0.1s ease; } -#workspaces button:hover { - color: black; - border-bottom: 3px solid #ffffff; -} - -#mode { - background-color: #64727D; - border-bottom: 3px solid #ffffff; -} - -/* Sections */ - -.modules-left, -.modules-center, -.modules-right { - border-radius: 20px; - border: 3px solid @crust; - padding: 0 10px; +#workspaces button.active { + color: @lavender; + border-top: 2px solid @lavender; + transition: all 0.1s ease; } #clock, @@ -50,28 +42,14 @@ window#waybar.hidden { #memory, #network, #temperature, -#taskbar, #tray, #workspaces, #wireplumber, #custom-poweroff, -#custom-weather, -#custom-spotify { +#custom-weather { padding: 0 10px; } -.modules-left { - background-image: linear-gradient(90deg, @base, @surface0, @surface2); -} - -.modules-center { - background-image: linear-gradient(270deg, @base, @overlay2, @base); -} - -.modules-right { - background-image: linear-gradient(270deg, @base, @surface0, @surface2); -} - #wireplumber{ color: @sapphire; } @@ -87,6 +65,3 @@ window#waybar.hidden { #temperature { color: @sky; } -#taskbar button { - color: @rosewater; -}