diff --git a/waybar/config b/waybar/config index d275c05..ce34d63 100644 --- a/waybar/config +++ b/waybar/config @@ -1,25 +1,29 @@ +// __ __ _ +// \ \ / /_ _ _ _| |__ __ _ _ __ +// \ \ /\ / / _` | | | | '_ \ / _` | '__| +// \ V V / (_| | |_| | |_) | (_| | | +// \_/\_/ \__,_|\__, |_.__/ \__,_|_| +// |___/ +// +// by Stephan Raabe (2023) +// ----------------------------------------------------- +// { - "layer": "top", // Waybar at top layer - "height": 30, // Waybar height (to be removed for auto height) - "spacing": 4, // Gaps between modules (4px) + "layer": "top", + "height": 30, + "spacing": 4, "margin-top": 0, "margin-left": 0, "margin-right": 0, + "include": ["~/dotfiles/waybar/modules.json"], "modules-left": [ "custom/appmenu", - // "custom/brave", - "custom/outlook", - "custom/teams", - // "custom/calculator", - "custom/chatgpt", - "custom/lookingglass" - // "hyprland/window" + "custom/brave", ], "modules-center": [ "wlr/workspaces", ], "modules-right": [ - // "hyprland/language", "keyboard-state", "pulseaudio", "disk", @@ -30,195 +34,4 @@ "custom/exit", "tray" ], - "wlr/workspaces" : { - "on-click": "activate", - "active-only": false, - "all-outputs": true, - "format": "{icon}", - "format-icons": { - "urgent": "", - "active": "", - "default": "", - "sort-by-number": true - } - }, - "custom/youtube": { - "format": "YT: {}", - "exec": "python ~/private/youtube.py", - "interval": "300", - "on-click": "brave https://studio.youtube.com" - }, - "custom/outlook": { - "format": "", - "on-click": "brave --app=https://outlook.office.com/mail/" - }, - "custom/teams": { - "format": "", - "on-click": "brave --app=https://teams.microsoft.com/go" - }, - "custom/brave": { - "format": "", - "on-click": "brave" - }, - "custom/chatgpt": { - "format": "", - "on-click": "brave --app=https://chat.openai.com" - }, - "custom/calculator": { - "format": "", - "on-click": "~/dotfiles/scripts/calculator.sh" - }, - "custom/lookingglass": { - "format": "", - "on-click": "~/dotfiles/scripts/looking-glass.sh" - }, - "custom/appmenu": { - "format": " ", - "on-click": "~/dotfiles/scripts/applauncher.sh" - }, - "custom/exit": { - "format": "", - "on-click": "~/dotfiles/scripts/powermenu-hypr.sh" - }, - "custom/reload": { - "format": "Reload", - "on-click": "~/dotfiles/waybar/reload.sh" - }, - "hyprland/language": { - "format": "{short}" - }, - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": "{name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" - } - }, - "mpd": { - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ", - "format-disconnected": "Disconnected ", - "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", - "unknown-tag": "N/A", - "interval": 2, - "consume-icons": { - "on": " " - }, - "random-icons": { - "off": " ", - "on": " " - }, - "repeat-icons": { - "on": " " - }, - "single-icons": { - "on": "1 " - }, - "state-icons": { - "paused": "", - "playing": "" - }, - "tooltip-format": "MPD (connected)", - "tooltip-format-disconnected": "MPD (disconnected)" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "tray": { - // "icon-size": 21, - "spacing": 10 - }, - "clock": { - // "timezone": "America/New_York", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - "cpu": { - "format": " {usage}%", - "tooltip": false - }, - "memory": { - "format": " {}%" - }, - "temperature": { - // "thermal-zone": 2, - // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "critical-threshold": 80, - // "format-critical": "{temperatureC}°C {icon}", - "format": "{temperatureC}°C {icon}", - "format-icons": ["", "", ""] - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", "", "", "", "", "", "", "", ""] - }, - "disk": { - "interval": 30, - "format": " {percentage_used}%", - "path": "/" - }, - "battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", - "format-alt": "{time} {icon}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": ["", "", "", "", ""] - }, - "battery#bat2": { - "bat": "BAT2" - }, - "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "{ipaddr}/{cidr} ", - "tooltip-format": "{ifname} via {gwaddr} ", - "format-linked": "{ifname} (No IP) ", - "format-disconnected": "Disconnected ⚠", - "format-alt": "{ifname}: {ipaddr}/{cidr}" - }, - "pulseaudio": { - // "scroll-step": 1, // %, can be a float - "format": "{icon} {volume}%", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": " {icon} {format_source}", - "format-muted": " {format_source}", - "format-source": "{volume}% ", - "format-source-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", " ", " "] - }, - "on-click": "pavucontrol" - }, - "custom/media": { - "format": "{icon} {}", - "return-type": "json", - "max-length": 40, - "format-icons": { - "spotify": "", - "default": "🎜" - }, - "escape": true, - "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder - // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name - } } - diff --git a/waybar/modules.json b/waybar/modules.json new file mode 100644 index 0000000..1b9bebb --- /dev/null +++ b/waybar/modules.json @@ -0,0 +1,143 @@ +// __ __ _ _ +// | \/ | ___ __| |_ _| | ___ ___ +// | |\/| |/ _ \ / _` | | | | |/ _ \/ __| +// | | | | (_) | (_| | |_| | | __/\__ \ +// |_| |_|\___/ \__,_|\__,_|_|\___||___/ +// +// +// by Stephan Raabe (2023) +// ----------------------------------------------------- +// +{ + // Workspaces + "wlr/workspaces" : { + "on-click": "activate", + "active-only": false, + "all-outputs": true, + "format": "{icon}", + "format-icons": { + "urgent": "", + "active": "", + "default": "", + "sort-by-number": true + } + }, + // Youtube Subscriber Count + "custom/youtube": { + "format": "YT: {}", + "exec": "python ~/private/youtube.py", + "interval": "300", + "on-click": "brave https://studio.youtube.com" + }, + // Outlook Launcher + "custom/outlook": { + "format": "", + "on-click": "brave --app=https://outlook.office.com/mail/" + }, + // Teams Launcher + "custom/teams": { + "format": "", + "on-click": "brave --app=https://teams.microsoft.com/go" + }, + // Brave Launcher + "custom/brave": { + "format": "", + "on-click": "brave" + }, + // ChatGPT Launcher + "custom/chatgpt": { + "format": "", + "on-click": "brave --app=https://chat.openai.com" + }, + // Rofi Calculator + "custom/calculator": { + "format": "", + "on-click": "~/dotfiles/scripts/calculator.sh" + }, + // Looking Glass Launcher + "custom/lookingglass": { + "format": "", + "on-click": "~/dotfiles/scripts/looking-glass.sh" + }, + // Rofi Application Launcher + "custom/appmenu": { + "format": " ", + "on-click": "~/dotfiles/scripts/applauncher.sh" + }, + // Rofi Power Menu + "custom/exit": { + "format": "", + "on-click": "~/dotfiles/scripts/powermenu-hypr.sh" + }, + // Keyboard State + "keyboard-state": { + "numlock": true, + "capslock": true, + "format": "{name} {icon}", + "format-icons": { + "locked": "", + "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": { + // "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% ", + "format-plugged": "{capacity}% ", + "format-alt": "{time} {icon}", + // "format-good": "", // An empty format will hide the module + // "format-full": "", + "format-icons": ["", "", "", "", ""] + }, + // Pulseaudio + "pulseaudio": { + // "scroll-step": 1, // %, can be a float + "format": "{icon} {volume}%", + "format-bluetooth": "{volume}% {icon} {format_source}", + "format-bluetooth-muted": " {icon} {format_source}", + "format-muted": " {format_source}", + "format-source": "{volume}% ", + "format-source-muted": "", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", " ", " "] + }, + "on-click": "pavucontrol" + } +} diff --git a/waybar/myconfig b/waybar/myconfig index da88825..482e702 100644 --- a/waybar/myconfig +++ b/waybar/myconfig @@ -1,16 +1,27 @@ +// __ __ _ +// \ \ / /_ _ _ _| |__ __ _ _ __ +// \ \ /\ / / _` | | | | '_ \ / _` | '__| +// \ V V / (_| | |_| | |_) | (_| | | +// \_/\_/ \__,_|\__, |_.__/ \__,_|_| +// |___/ +// +// by Stephan Raabe (2023) +// ----------------------------------------------------- +// { - "layer": "top", // Waybar at top layer - "height": 30, // Waybar height (to be removed for auto height) - "spacing": 4, // Gaps between modules (4px) + "layer": "top", + "height": 30, + "spacing": 4, "margin-top": 0, "margin-left": 0, "margin-right": 0, + "include": ["~/dotfiles/waybar/modules.json"], "modules-left": [ "custom/appmenu", - // "custom/brave", + "custom/brave", "custom/outlook", "custom/teams", - // "custom/calculator", + "custom/calculator", "custom/chatgpt", "custom/lookingglass" // "hyprland/window" @@ -19,7 +30,6 @@ "wlr/workspaces", ], "modules-right": [ - // "hyprland/language", "custom/youtube", "keyboard-state", "pulseaudio", @@ -31,195 +41,4 @@ "custom/exit", "tray" ], - "wlr/workspaces" : { - "on-click": "activate", - "active-only": false, - "all-outputs": true, - "format": "{icon}", - "format-icons": { - "urgent": "", - "active": "", - "default": "", - "sort-by-number": true - } - }, - "custom/youtube": { - "format": "YT: {}", - "exec": "python ~/private/youtube.py", - "interval": "300", - "on-click": "brave https://studio.youtube.com" - }, - "custom/outlook": { - "format": "", - "on-click": "brave --app=https://outlook.office.com/mail/" - }, - "custom/teams": { - "format": "", - "on-click": "brave --app=https://teams.microsoft.com/go" - }, - "custom/brave": { - "format": "", - "on-click": "brave" - }, - "custom/chatgpt": { - "format": "", - "on-click": "brave --app=https://chat.openai.com" - }, - "custom/calculator": { - "format": "", - "on-click": "~/dotfiles/scripts/calculator.sh" - }, - "custom/lookingglass": { - "format": "", - "on-click": "~/dotfiles/scripts/looking-glass.sh" - }, - "custom/appmenu": { - "format": " ", - "on-click": "~/dotfiles/scripts/applauncher.sh" - }, - "custom/exit": { - "format": "", - "on-click": "~/dotfiles/scripts/powermenu-hypr.sh" - }, - "custom/reload": { - "format": "Reload", - "on-click": "~/dotfiles/waybar/reload.sh" - }, - "hyprland/language": { - "format": "{short}" - }, - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": "{name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" - } - }, - "mpd": { - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ", - "format-disconnected": "Disconnected ", - "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", - "unknown-tag": "N/A", - "interval": 2, - "consume-icons": { - "on": " " - }, - "random-icons": { - "off": " ", - "on": " " - }, - "repeat-icons": { - "on": " " - }, - "single-icons": { - "on": "1 " - }, - "state-icons": { - "paused": "", - "playing": "" - }, - "tooltip-format": "MPD (connected)", - "tooltip-format-disconnected": "MPD (disconnected)" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "tray": { - // "icon-size": 21, - "spacing": 10 - }, - "clock": { - // "timezone": "America/New_York", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - "cpu": { - "format": " {usage}%", - "tooltip": false - }, - "memory": { - "format": " {}%" - }, - "temperature": { - // "thermal-zone": 2, - // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "critical-threshold": 80, - // "format-critical": "{temperatureC}°C {icon}", - "format": "{temperatureC}°C {icon}", - "format-icons": ["", "", ""] - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", "", "", "", "", "", "", "", ""] - }, - "disk": { - "interval": 30, - "format": " {percentage_used}%", - "path": "/" - }, - "battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", - "format-alt": "{time} {icon}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": ["", "", "", "", ""] - }, - "battery#bat2": { - "bat": "BAT2" - }, - "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "{ipaddr}/{cidr} ", - "tooltip-format": "{ifname} via {gwaddr} ", - "format-linked": "{ifname} (No IP) ", - "format-disconnected": "Disconnected ⚠", - "format-alt": "{ifname}: {ipaddr}/{cidr}" - }, - "pulseaudio": { - // "scroll-step": 1, // %, can be a float - "format": "{icon} {volume}%", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": " {icon} {format_source}", - "format-muted": " {format_source}", - "format-source": "{volume}% ", - "format-source-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", " ", " "] - }, - "on-click": "pavucontrol" - }, - "custom/media": { - "format": "{icon} {}", - "return-type": "json", - "max-length": 40, - "format-icons": { - "spotify": "", - "default": "🎜" - }, - "escape": true, - "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder - // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name - } } -