From 1ab7f13373999b7f9d678fe34115083e4cb19b2e Mon Sep 17 00:00:00 2001 From: Stephan Raabe Date: Thu, 31 Aug 2023 09:05:39 +0200 Subject: [PATCH] Updates --- hypr/hyprland.conf | 1 + waybar/colors-waybar.css | 38 +++--- waybar/config | 16 ++- waybar/modules.json | 21 +++- waybar/myconfig | 18 +-- waybar/style.css | 250 ++++++++++++++------------------------- 6 files changed, 152 insertions(+), 192 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index a2c0eb1..c2116b6 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -126,6 +126,7 @@ device:epic-mouse-v1 { # Window rules # ----------------------------------------------------- windowrule = tile,^(Brave-browser)$ +windowrule = tile,^(chromium)$ # ----------------------------------------------------- # Key bindings diff --git a/waybar/colors-waybar.css b/waybar/colors-waybar.css index 2a27d52..42a93d1 100644 --- a/waybar/colors-waybar.css +++ b/waybar/colors-waybar.css @@ -1,20 +1,20 @@ -@define-color foreground #bfbfc0; -@define-color background #000204; -@define-color cursor #bfbfc0; +@define-color foreground #bfc0c0; +@define-color background #020305; +@define-color cursor #bfc0c0; -@define-color color0 #000204; -@define-color color1 #26506F; -@define-color color2 #496773; -@define-color color3 #0F588A; -@define-color color4 #186DA7; -@define-color color5 #157DBF; -@define-color color6 #2597DB; -@define-color color7 #bfbfc0; -@define-color color8 #3f4142; -@define-color color9 #26506F; -@define-color color10 #496773; -@define-color color11 #0F588A; -@define-color color12 #186DA7; -@define-color color13 #157DBF; -@define-color color14 #2597DB; -@define-color color15 #bfbfc0; +@define-color color0 #020305; +@define-color color1 #0F325B; +@define-color color2 #5A2E4A; +@define-color color3 #084B6F; +@define-color color4 #6B5156; +@define-color color5 #A13E45; +@define-color color6 #0B658F; +@define-color color7 #bfc0c0; +@define-color color8 #414243; +@define-color color9 #0F325B; +@define-color color10 #5A2E4A; +@define-color color11 #084B6F; +@define-color color12 #6B5156; +@define-color color13 #A13E45; +@define-color color14 #0B658F; +@define-color color15 #bfc0c0; diff --git a/waybar/config b/waybar/config index e2004ac..9bb5b1a 100644 --- a/waybar/config +++ b/waybar/config @@ -18,7 +18,8 @@ "spacing": 0, "include": ["~/dotfiles/waybar/modules.json"], "modules-left": [ - "custom/appmenu", + "custom/appmenu", + "wlr/taskbar", "custom/brave", "hyprland/window" ], @@ -26,13 +27,18 @@ "wlr/workspaces" ], "modules-right": [ - "keyboard-state", "pulseaudio", - "disk", - "cpu", - "memory", + "group/hardware", "battery", "custom/exit", "clock" ], + "group/hardware": { + "orientation": "horizontal", + "modules": [ + "disk", + "cpu", + "memory" + ] + } } diff --git a/waybar/modules.json b/waybar/modules.json index 50ed193..8bbfcc2 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -23,6 +23,25 @@ } }, + // Taskbar + "wlr/taskbar": { + "format": "{icon}", + "icon-size": 16, + "tooltip-format": "{title}", + "on-click": "activate", + "on-click-middle": "close", + "ignore-list": [ + "Alacritty" + ], + "app_ids-mapping": { + "firefoxdeveloperedition": "firefox-developer-edition" + }, + "rewrite": { + "Firefox Web Browser": "Firefox", + "Foot Server": "Terminal" + } + }, + // Youtube Subscriber Count "custom/youtube": { "format": " {}", @@ -42,7 +61,7 @@ // Teams Launcher "custom/teams": { "format": "", - "on-click": "brave --app=https://teams.microsoft.com/go", + "on-click": "chromium --app=https://teams.microsoft.com/go", "tooltip": false }, diff --git a/waybar/myconfig b/waybar/myconfig index 4c09a71..e12de8e 100644 --- a/waybar/myconfig +++ b/waybar/myconfig @@ -18,9 +18,8 @@ "spacing": 0, "include": ["~/dotfiles/waybar/modules.json"], "modules-left": [ - "custom/appmenu", - "custom/outlook", - "custom/teams", + "custom/appmenu", + "wlr/taskbar", "custom/chatgpt", "custom/lookingglass", "hyprland/window" @@ -30,13 +29,18 @@ ], "modules-right": [ "custom/youtube", - "keyboard-state", "pulseaudio", - "disk", - "cpu", - "memory", + "group/hardware", "battery", "custom/exit", "clock" ], + "group/hardware": { + "orientation": "horizontal", + "modules": [ + "disk", + "cpu", + "memory" + ] + } } diff --git a/waybar/style.css b/waybar/style.css index 361aaf8..484512f 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -93,36 +93,44 @@ tooltip label { color: @color11; } -#mode { - background-color: #64727D; - border-bottom: 3px solid #ffffff; +/* ----------------------------------------------------- + * Window + * ----------------------------------------------------- */ + +#window { + background: #FFFFFF; + margin: 5px 15px 5px 5px; + padding: 2px 10px 0px 10px; + border-radius: 12px; + color:@background; + font-size:16px; + font-weight:normal; + opacity:0.8; } -#clock, -#battery, -#cpu, -#memory, -#disk, -#temperature, -#backlight, -#network, -#pulseaudio, -#wireplumber, -#custom-media, -#tray, -#mode, -#idle_inhibitor, -#scratchpad, -#language, -#user, -#window, -#mpd { - margin: 0px 20px 0px 10px; - padding: 0 0px; - color: #FFFFFF; - font-size:16px; +/* ----------------------------------------------------- + * Taskbar + * ----------------------------------------------------- */ + +#taskbar { + background: #FFFFFF; + margin: 5px 15px 5px 5px; + padding: 0px 1px; + border-radius: 12px; + font-weight: normal; + font-style: normal; + opacity:0.8; } +#taskbar button { + margin:0; + padding: 0px 5px 0px 5px; +} + +/* ----------------------------------------------------- + * Modules + * ----------------------------------------------------- */ + .modules-left > widget:first-child > #workspaces { margin-left: 0; } @@ -131,47 +139,73 @@ tooltip label { margin-right: 0; } +/* ----------------------------------------------------- + * Custom Modules + * ----------------------------------------------------- */ + #custom-appmenu { background-color: #FFFFFF; - font-size: 18px; + font-size: 16px; color: @background; border-radius: 12px; padding: 2px 10px 0px 10px; - margin: 5px 10px 5px 20px; + margin: 5px 10px 5px 14px; opacity:0.8; } -#disk,#memory,#cpu { - margin:0px; - - padding:0px; -} - #custom-youtube, #custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-lookingglass { - margin-right:10px; + margin-right:15px; font-size:16px; } -#user { - margin-right:10px; - font-size:20px; -} - #custom-exit { margin: 0px 10px 0px 10px; font-size:20px; } +/* ----------------------------------------------------- + * Hardware Group + * ----------------------------------------------------- */ + +#disk,#memory,#cpu { + margin:0px; + padding:0px; + font-size:16px; +} + +/* ----------------------------------------------------- + * Clock + * ----------------------------------------------------- */ + #clock { background-color: #FFFFFF; - font-size: 18px; + font-size: 16px; color: @background; border-radius: 12px; padding: 2px 10px 0px 10px; - margin: 5px 20px 5px 10px; + margin: 5px 14px 5px 10px; opacity:0.8; } +/* ----------------------------------------------------- + * Pulseaudio + * ----------------------------------------------------- */ + +#pulseaudio { + font-size:16px; + margin-right:15px; + +} + +#pulseaudio.muted { + background-color: #90b1b1; + color: #2a5c45; +} + +/* ----------------------------------------------------- + * Battery + * ----------------------------------------------------- */ + #battery { color: @color11; } @@ -198,75 +232,9 @@ tooltip label { animation-direction: alternate; } -label:focus { - background-color: #000000; -} - -#cpu { - background-color: transparent; -} - -#memory { - background-color: transparent; -} - -#disk { - background-color: transparent; -} - -#backlight { - background-color: #90b1b1; -} - -#network { - background-color: #2980b9; -} - -#network.disconnected { - background-color: #f53c3c; -} - -#pulseaudio { - background-color: transparent; -} - -#pulseaudio.muted { - /* - background-color: #90b1b1; - color: #2a5c45; - */ -} - -#wireplumber { - background-color: #fff0f5; - color: #000000; -} - -#wireplumber.muted { - background-color: #f53c3c; -} - -#custom-media { - background-color: #66cc99; - color: #2a5c45; - min-width: 100px; -} - -#custom-media.custom-spotify { - background-color: #66cc99; -} - -#custom-media.custom-vlc { - background-color: #ffa000; -} - -#temperature { - background-color: #f0932b; -} - -#temperature.critical { - background-color: #eb4d4b; -} +/* ----------------------------------------------------- + * Tray + * ----------------------------------------------------- */ #tray { background-color: #2980b9; @@ -281,61 +249,23 @@ label:focus { background-color: #eb4d4b; } -#idle_inhibitor { - background-color: #2d3436; +/* ----------------------------------------------------- + * Other + * ----------------------------------------------------- */ + +label:focus { + background-color: #000000; } -#idle_inhibitor.activated { - background-color: #ecf0f1; - color: #2d3436; -} - -#mpd { - background-color: #66cc99; - color: #2a5c45; -} - -#mpd.disconnected { - background-color: #f53c3c; -} - -#mpd.stopped { +#backlight { background-color: #90b1b1; } -#mpd.paused { - background-color: #51a37a; +#network { + background-color: #2980b9; } -#language { - color:#FFFFFF; - /* - background: #00b093; - color: #740864; - padding: 0 5px; - margin: 0 5px; - min-width: 16px; - */ +#network.disconnected { + background-color: #f53c3c; } -#keyboard-state { - background: #97e1ad; - color: #000000; - padding: 0 0px; - margin: 0 5px; - min-width: 16px; -} - -#keyboard-state > label { - padding: 0 5px; -} - -#keyboard-state > label.locked { - background: rgba(0, 0, 0, 0.2); -} - -#window { - margin:0; -} - -