From 726b9ab296db278b9664714533267eef22748c09 Mon Sep 17 00:00:00 2001 From: Stephan Raabe Date: Mon, 28 Aug 2023 14:42:41 +0200 Subject: [PATCH] Updates --- waybar/colors-waybar.css | 38 ++++++++++++++-------------- waybar/modules.json | 54 ++++++++++++++++++++++++++++++++-------- waybar/myconfig | 3 ++- waybar/style.css | 24 ++++++++++++++++++ 4 files changed, 89 insertions(+), 30 deletions(-) diff --git a/waybar/colors-waybar.css b/waybar/colors-waybar.css index 2a27d52..2a57899 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 #c0c1c1; +@define-color background #06090a; +@define-color cursor #c0c1c1; -@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 #06090a; +@define-color color1 #536768; +@define-color color2 #656D6A; +@define-color color3 #868570; +@define-color color4 #798D85; +@define-color color5 #98A19D; +@define-color color6 #D7DADA; +@define-color color7 #c0c1c1; +@define-color color8 #444647; +@define-color color9 #536768; +@define-color color10 #656D6A; +@define-color color11 #868570; +@define-color color12 #798D85; +@define-color color13 #98A19D; +@define-color color14 #D7DADA; +@define-color color15 #c0c1c1; diff --git a/waybar/modules.json b/waybar/modules.json index 1b9bebb..53c44e5 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -22,53 +22,72 @@ "sort-by-number": true } }, + // Youtube Subscriber Count "custom/youtube": { - "format": "YT: {}", + "format": " {}", "exec": "python ~/private/youtube.py", "interval": "300", - "on-click": "brave https://studio.youtube.com" + "on-click": "brave https://studio.youtube.com", + "tooltip": false }, + // Outlook Launcher "custom/outlook": { "format": "", - "on-click": "brave --app=https://outlook.office.com/mail/" + "on-click": "brave --app=https://outlook.office.com/mail/", + "tooltip": false }, + // Teams Launcher "custom/teams": { "format": "", - "on-click": "brave --app=https://teams.microsoft.com/go" + "on-click": "brave --app=https://teams.microsoft.com/go", + "tooltip": false }, + // Brave Launcher "custom/brave": { "format": "", - "on-click": "brave" + "on-click": "brave", + "tooltip": false }, + // ChatGPT Launcher "custom/chatgpt": { "format": "", - "on-click": "brave --app=https://chat.openai.com" + "on-click": "brave --app=https://chat.openai.com", + "tooltip": false }, + // Rofi Calculator "custom/calculator": { "format": "", - "on-click": "~/dotfiles/scripts/calculator.sh" + "on-click": "~/dotfiles/scripts/calculator.sh", + "tooltip": false }, + // Looking Glass Launcher "custom/lookingglass": { "format": "", - "on-click": "~/dotfiles/scripts/looking-glass.sh" + "on-click": "~/dotfiles/scripts/looking-glass.sh", + "tooltip": false }, + // Rofi Application Launcher "custom/appmenu": { "format": " ", - "on-click": "~/dotfiles/scripts/applauncher.sh" + "on-click": "~/dotfiles/scripts/applauncher.sh", + "tooltip": false }, + // Rofi Power Menu "custom/exit": { "format": "", - "on-click": "~/dotfiles/scripts/powermenu-hypr.sh" + "on-click": "~/dotfiles/scripts/powermenu-hypr.sh", + "tooltip": false }, + // Keyboard State "keyboard-state": { "numlock": true, @@ -79,32 +98,38 @@ "unlocked": "" } }, + // System tray "tray": { // "icon-size": 21, "spacing": 10 }, + // Clock "clock": { // "timezone": "America/New_York", "tooltip-format": "{:%Y %B}\n{calendar}", "format-alt": "{:%Y-%m-%d}" }, + // CPU "cpu": { "format": " {usage}%", "tooltip": false }, + // Memory "memory": { "format": " {}%" }, + // Harddisc space used "disk": { "interval": 30, "format": " {percentage_used}%", "path": "/" }, + // Battery "battery": { "states": { @@ -120,6 +145,7 @@ // "format-full": "", "format-icons": ["", "", "", "", ""] }, + // Pulseaudio "pulseaudio": { // "scroll-step": 1, // %, can be a float @@ -139,5 +165,13 @@ "default": ["", " ", " "] }, "on-click": "pavucontrol" + }, + + "user": { + "format": "{user}", + "interval": 60, + "height": 30, + "width": 30, + "icon": false, } } diff --git a/waybar/myconfig b/waybar/myconfig index 482e702..96105c2 100644 --- a/waybar/myconfig +++ b/waybar/myconfig @@ -38,7 +38,8 @@ "memory", "battery", "clock", - "custom/exit", + "user", + "custom/exit", "tray" ], } diff --git a/waybar/style.css b/waybar/style.css index e811f7f..d252c45 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,5 +1,24 @@ +/* + * __ __ _ ____ _ _ + * \ \ / /_ _ _ _| |__ __ _ _ __ / ___|| |_ _ _| | ___ + * \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ + * \ V V / (_| | |_| | |_) | (_| | | ___) | |_| |_| | | __/ + * \_/\_/ \__,_|\__, |_.__/ \__,_|_| |____/ \__|\__, |_|\___| + * |___/ |___/ + * + * by Stephan Raabe (2023) + * ----------------------------------------------------- +*/ + +/* ----------------------------------------------------- + * Import Pywal colors + * ----------------------------------------------------- */ @import 'colors-waybar.css'; +/* ----------------------------------------------------- + * General + * ----------------------------------------------------- */ + * { font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif; font-size: 14px; @@ -24,6 +43,10 @@ button { } */ +/* ----------------------------------------------------- + * Workspaces + * ----------------------------------------------------- */ + #workspaces button { padding: 0px 10px; border-radius: 10px; @@ -77,6 +100,7 @@ button { #scratchpad, #language, #custom-youtube, +#user, #mpd { margin: 6px 10px 6px 0px; padding: 0 0px;