From 1e3e4f13f12ff7e269cbbb5eb2993460cb799f3f Mon Sep 17 00:00:00 2001 From: Blake Romero Date: Thu, 26 Mar 2026 00:22:34 +0000 Subject: Restructured files --- config.jsonc | 25 +----- modules.jsonc | 199 ------------------------------------------- modules/modules.jsonc | 214 +++++++++++++++++++++++++++++++++++++++++++++++ modules/power_menu.xml | 30 +++++++ power_menu.xml | 30 ------- style.css | 105 +---------------------- themes/dark/config.jsonc | 24 ++++++ themes/dark/style.css | 105 +++++++++++++++++++++++ themes/dwm/config.jsonc | 19 +++++ themes/dwm/style.css | 52 ++++++++++++ 10 files changed, 446 insertions(+), 357 deletions(-) mode change 100644 => 120000 config.jsonc delete mode 100644 modules.jsonc create mode 100644 modules/modules.jsonc create mode 100644 modules/power_menu.xml delete mode 100644 power_menu.xml mode change 100644 => 120000 style.css create mode 100644 themes/dark/config.jsonc create mode 100644 themes/dark/style.css create mode 100644 themes/dwm/config.jsonc create mode 100644 themes/dwm/style.css diff --git a/config.jsonc b/config.jsonc deleted file mode 100644 index 12e47b1..0000000 --- a/config.jsonc +++ /dev/null @@ -1,24 +0,0 @@ -{ - "output": ["DP-1", "eDP-1"], - "position": "top", - "include": ["~/.config/waybar/modules.jsonc"], - "reload_style_on_change": true, - - "modules-left": [ - "custom/apps", - "sway/workspaces" - ], - - "modules-right": [ - "cpu", - "memory", - "backlight", - "battery", - "bluetooth", - "network", - "wireplumber", - "clock#calendar", - "clock", - "tray" - ] -} diff --git a/config.jsonc b/config.jsonc new file mode 120000 index 0000000..0bfcbd5 --- /dev/null +++ b/config.jsonc @@ -0,0 +1 @@ +themes/dark/config.jsonc \ No newline at end of file diff --git a/modules.jsonc b/modules.jsonc deleted file mode 100644 index 1a22270..0000000 --- a/modules.jsonc +++ /dev/null @@ -1,199 +0,0 @@ -{ - "custom/apps": { - "format" : "󰕰", - "tooltip": false, - "on-click": "pkill nwggrid || nwggrid" - }, - - "custom/menu": { - "format" : "", - "tooltip": false, - "menu": "on-click", - "menu-file": "~/.config/waybar/power_menu.xml", - "menu-actions": { - "shutdown": "doas poweroff", - "reboot": "doas reboot" - } - }, - - "sway/workspaces": { - "format": "{icon}", - "format-icons": { "0": "󰄨" }, - "on-click": "activate", - "sort-by-number": true - }, - - "sway/scratchpad": { - "format": "#{count}", - "show-empty": false, - "tooltip": true, - "tooltip-format": "{app}: {title}" - }, - - "clock": { - "format": "{:%R} 󱑊 ", - "format-alt": "{:%I:%M %p} 󱑊 ", - "tooltip-format": "{tz_list}", - "timezones": [ - "Europe/London", - "Europe/Madrid", - "America/New_York", - "America/Los_Angeles" - ] - }, - - "clock#calendar": { - "format": "{:%a %d %b}  ", - /*"format-alt": "{:%Y-%m-%d}  ",*/ - "tooltip-format": "{calendar}", - "locale": "en_GB.UTF-8", - "on-click": "pkill calcurse || foot -Tcalendar calcurse", - "calendar": { - "mode": "month", - "mode-mon-col": 3, - "weeks-pos": "left", - "on-scroll": 1, - "format": { - "months": "{}", - "days": "{}", - "weeks": "W{}", - "weekdays": "{}", - "today": "{}" - } - }, - "actions": { - "on-click-middle": "mode", - "on-click-right": "shift_reset", - "on-scroll-up": "shift_up", - "on-scroll-down": "shift_down" - } - }, - - "battery": { - "interval": 10, - "states": { - "warning": 20, - "critical": 10 - }, - "format": "{capacity}% {icon}", - "format-alt": "({time}) {capacity}% {icon}", - "format-icons": ["󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"], - "format-time": "{H}:{m}" - }, - - "bluetooth": { - "format": "{status} ", - "format-disabled": "󰂲", // i.e. aeroplane mode - "format-no-controller": "", // i.e. bluetoothd not running - "format-connected": "{device_alias} ", - "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected", - "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}", - "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}", - "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%", - "on-click": "pkill bluetui || foot -Tbluetui bluetui" - }, - - "wireplumber": { - "format": "{volume}% {icon}", - "format-muted": "{volume}%  ", - "format-icons": [" ", " ", " "], - "tooltip-format": "{volume}% {node_name}", - "on-click": "pkill wiremix || foot -Twiremix wiremix", - "on-click-right": "wpctl set-volume @DEFAULT_SINK@ 50%", - "on-click-middle": "wpctl set-mute @DEFAULT_SINK@ toggle", - "scroll-step": 1.0 - }, - - "wireplumber#source": { - "node-type": "Audio/Source", - "format": "{volume}% 󰍬", - "format-muted": "󰍭", - "on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle", - "scroll-step": 5 - }, - - "tray": { - "spacing": 8, - "icon-size": 16, - "show-passive-items": true - }, - - "wlr/taskbar": { - "format": "{icon}", - "icon-size": 20, - "icon-theme": "Papirus", - "tooltip-format": "{title}", - "on-click": "activate", - "on-click-middle": "close", - "ignore-list": [ "foot", "Picture-in-Picture" ], - "app_ids-mapping": { - "firefoxdeveloperedition": "firefox-developer-edition" - }, - "rewrite": { - "Firefox Web Browser": "Firefox", - "Foot Server": "Terminal" - } - }, - - "network": { - "format": "{ifname}", - "format-disabled": "󰖪", - "format-wifi": "Online  ", - "format-ethernet": "{ipaddr}/{cidr}  ", - "format-disconnected": "offline 󰤮", - "tooltip-format": "{ifname} via {gwaddr} 󰊗 ", - "tooltip-format-wifi": "{essid} ({signalStrength}%)  \nSSID:\t {ifname}\nIP:\t {ipaddr}\nGateway: {gwaddr}\nNetmask: {netmask}\nCIDR:\t {cidr}bit subnet mask\nBSSID:\t {bssid}\nSignal:\t {signaldBm}dBm\nFreq:\t {frequency}", - "tooltip-format-ethernet": "{ifname} " , - "tooltip-format-disconnected": "Disconnected", - "on-click": "foot -Tiwd impala" - }, - - "memory": { - "interval": 30, - "format": "{used:0.1f}G  ", - "tooltip-format": "TYPE\tPERC\tUSED\tAVAIL\nRAM:\t{percentage}%\t{used:0.1f}G\t{total:1.0f}G\nSwap:\t{swapPercentage}%\t{swapUsed:0.1f}G\t{swapAvail}G" - }, - - "cpu": { - "interval": 10, - "format": "{usage}% {icon}", - "format-icons": [ - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - - "backlight": { - "format": "{percent}% {icon}", - "format-icons": ["󱩎 ","󱩏 ","󱩐 ","󱩑 ","󱩒 ","󱩓 ","󱩔 ","󱩕 ","󱩖 ","󰛨 "], - "scroll-step": 0.5, - "min-brightness": 0.1 - }, - - "mpd": { - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ", - "format-disconnected": "Disconnected ", - "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", - "interval": 2, - "tooltip-format": "MPD (connected)", - "tooltip-format-disconnected": "MPD (disconnected)" - }, - - "mpris": { - "format": "Now playing: {player_icon} {dynamic}", - "format-paused": "{status_icon} {dynamic}", - "player-icons": { - "default": "▶", - "mpv": "🎵" - }, - "status-icons": { - "paused": "󰏤" - } - }, -} diff --git a/modules/modules.jsonc b/modules/modules.jsonc new file mode 100644 index 0000000..05c6b7f --- /dev/null +++ b/modules/modules.jsonc @@ -0,0 +1,214 @@ +{ + "custom/apps": { + "format" : "󰕰", + "tooltip": false, + "on-click": "pkill nwggrid || nwggrid" + }, + + "custom/menu": { + "format" : "", + "tooltip": false, + "menu": "on-click", + "menu-file": "~/.config/waybar/power_menu.xml", + "menu-actions": { + "shutdown": "doas poweroff", + "reboot": "doas reboot" + } + }, + + "sway/workspaces": { + "format": "{icon}", + "format-icons": { "0": "󰄨" }, + "on-click": "activate", + "sort-by-number": true + }, + + "sway/workspaces#full": { + "disable-scroll": true, + "persistent-workspaces": { + "1": [], + "2": [], + "3": [], + "4": [], + "5": [], + "6": [], + "7": [], + "8": [], + "9": [] + } + }, + + "sway/scratchpad": { + "format": "#{count}", + "show-empty": false, + "tooltip": true, + "tooltip-format": "{app}: {title}" + }, + + "clock": { + "format": "{:%R} 󱑊 ", + "format-alt": "{:%I:%M %p} 󱑊 ", + "tooltip-format": "{tz_list}", + "timezones": [ + "Europe/London", + "Europe/Madrid", + "America/New_York", + "America/Los_Angeles" + ] + }, + + "clock#calendar": { + "format": "{:%a %d %b}  ", + /*"format-alt": "{:%Y-%m-%d}  ",*/ + "tooltip-format": "{calendar}", + "locale": "en_GB.UTF-8", + "on-click": "pkill calcurse || foot -Tcalendar calcurse", + "calendar": { + "mode": "month", + "mode-mon-col": 3, + "weeks-pos": "left", + "on-scroll": 1, + "format": { + "months": "{}", + "days": "{}", + "weeks": "W{}", + "weekdays": "{}", + "today": "{}" + } + }, + "actions": { + "on-click-middle": "mode", + "on-click-right": "shift_reset", + "on-scroll-up": "shift_up", + "on-scroll-down": "shift_down" + } + }, + + "battery": { + "interval": 10, + "states": { + "warning": 20, + "critical": 10 + }, + "format": "{capacity}% {icon}", + "format-alt": "({time}) {capacity}% {icon}", + "format-icons": ["󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"], + "format-time": "{H}:{m}" + }, + + "bluetooth": { + "format": "{status} ", + "format-disabled": "󰂲", // i.e. aeroplane mode + "format-no-controller": "", // i.e. bluetoothd not running + "format-connected": "{device_alias} ", + "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected", + "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}", + "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}", + "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%", + "on-click": "pkill bluetui || foot -Tbluetui bluetui" + }, + + "wireplumber": { + "format": "{volume}% {icon}", + "format-muted": "{volume}%  ", + "format-icons": [" ", " ", " "], + "tooltip-format": "{volume}% {node_name}", + "on-click": "pkill wiremix || foot -Twiremix wiremix", + "on-click-right": "wpctl set-volume @DEFAULT_SINK@ 50%", + "on-click-middle": "wpctl set-mute @DEFAULT_SINK@ toggle", + "scroll-step": 1.0 + }, + + "wireplumber#source": { + "node-type": "Audio/Source", + "format": "{volume}% 󰍬", + "format-muted": "󰍭", + "on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle", + "scroll-step": 5 + }, + + "tray": { + "spacing": 8, + "icon-size": 16, + "show-passive-items": true + }, + + "wlr/taskbar": { + "format": "{icon}", + "icon-size": 20, + "icon-theme": "Papirus", + "tooltip-format": "{title}", + "on-click": "activate", + "on-click-middle": "close", + "ignore-list": [ "foot", "Picture-in-Picture" ], + "app_ids-mapping": { + "firefoxdeveloperedition": "firefox-developer-edition" + }, + "rewrite": { + "Firefox Web Browser": "Firefox", + "Foot Server": "Terminal" + } + }, + + "network": { + "format": "{ifname}", + "format-disabled": "󰖪", + "format-wifi": "{essid}  ", + "format-ethernet": "{ipaddr}/{cidr}  ", + "format-disconnected": "offline 󰤮", + "tooltip-format": "{ifname} via {gwaddr} 󰊗 ", + "tooltip-format-wifi": "{essid} ({signalStrength}%)  \nSSID:\t {ifname}\nIP:\t {ipaddr}\nGateway: {gwaddr}\nNetmask: {netmask}\nCIDR:\t {cidr}bit subnet mask\nBSSID:\t {bssid}\nSignal:\t {signaldBm}dBm\nFreq:\t {frequency}", + "tooltip-format-ethernet": "{ifname} " , + "tooltip-format-disconnected": "Disconnected", + "on-click": "foot -Tiwd impala" + }, + + "memory": { + "interval": 30, + "format": "{used:0.1f}G  ", + "tooltip-format": "TYPE\tPERC\tUSED\tAVAIL\nRAM:\t{percentage}%\t{used:0.1f}G\t{total:1.0f}G\nSwap:\t{swapPercentage}%\t{swapUsed:0.1f}G\t{swapAvail}G" + }, + + "cpu": { + "interval": 10, + "format": "{usage}% {icon}", + "format-icons": [ + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + + "backlight": { + "format": "{percent}% {icon}", + "format-icons": ["󱩎 ","󱩏 ","󱩐 ","󱩑 ","󱩒 ","󱩓 ","󱩔 ","󱩕 ","󱩖 ","󰛨 "], + "scroll-step": 0.5, + "min-brightness": 0.1 + }, + + "mpd": { + "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ", + "format-disconnected": "Disconnected ", + "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", + "interval": 2, + "tooltip-format": "MPD (connected)", + "tooltip-format-disconnected": "MPD (disconnected)" + }, + + "mpris": { + "format": "Now playing: {player_icon} {dynamic}", + "format-paused": "{status_icon} {dynamic}", + "player-icons": { + "default": "▶", + "mpv": "🎵" + }, + "status-icons": { + "paused": "󰏤" + } + }, +} diff --git a/modules/power_menu.xml b/modules/power_menu.xml new file mode 100644 index 0000000..8b3ac50 --- /dev/null +++ b/modules/power_menu.xml @@ -0,0 +1,30 @@ + + + + + + + Shutdown + + + + + + + + Reboot + + + + diff --git a/power_menu.xml b/power_menu.xml deleted file mode 100644 index 8b3ac50..0000000 --- a/power_menu.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - Shutdown - - - - - - - - Reboot - - - - diff --git a/style.css b/style.css deleted file mode 100644 index 5bd6e07..0000000 --- a/style.css +++ /dev/null @@ -1,104 +0,0 @@ -/* GTK Colours */ -@define-color fg #eee; -@define-color mg #888; -@define-color bg #000; - -* { - font-family: "Hack Nerd Font", monospace; - font-size: 12px; - font-weight: normal; - text-shadow: none; - box-shadow: none; - transition-property: background; - transition-duration: .5s; -} - -/* Colours */ -/* #clock { color: lightblue; } */ -/* #clock.calendar { color: pink; }*/ -/* #wireplumber { color: #f1c40f; }*/ -/* #battery { color: mediumpurple; }*/ -/* #network.linked{ color: seagreen; }*/ -/* #network.disconnected{ color: red; }*/ -/* #bluetooth { color: royalblue; }*/ - -/* Bar */ -window#waybar { - color: @fg; - background: black; - border-bottom: 1px solid #444 - - /* - background: transparent; - border: none; - */ -} - -window#waybar.hidded { - opacity: 0.0; -} - -/* Labels */ -label.module { - padding: 4px 10px 2px 10px; -} - -label:hover { - color: white; -} - -/* Tray */ -#tray { - background: @bg; - border: 1px solid @fg; - border-radius: 5px; - padding: 0 8px; -} - -/* MENU */ -#custom-menu { - padding:0 18px 0 14px; -} - -#custom-menu:hover { - background: @fg; - color: @bg; -} - -/* TASKBAR */ -/* -#taskbar button { - color: @mg; - padding: 4px 10px 4px 10px; - border-radius: 0; -} -#taskbar button:hover { - color: @bg; - background: @fg; -} -*/ - -/* WORKSPACES & TASKBAR*/ -#workspaces button, -#taskbar button { - color: @mg; - padding: 4px 10px 2px 10px; - border-radius: 0; - border:none; -} - -#workspaces button:hover, -#workspaces button.focused:hover, -#taskbar button:hover { - color: @bg; - background: @fg; -} - -#workspaces button.focused { - color: @fg; -} - -#workspaces button.urgent { - color: red; -} - diff --git a/style.css b/style.css new file mode 120000 index 0000000..75c4c1f --- /dev/null +++ b/style.css @@ -0,0 +1 @@ +themes/dark/style.css \ No newline at end of file diff --git a/themes/dark/config.jsonc b/themes/dark/config.jsonc new file mode 100644 index 0000000..ce8ed92 --- /dev/null +++ b/themes/dark/config.jsonc @@ -0,0 +1,24 @@ +{ + "output": ["DP-1", "eDP-1"], + "position": "top", + "include": ["~/.config/waybar/modules/modules.jsonc"], + "reload_style_on_change": true, + + "modules-left": [ + "custom/apps", + "sway/workspaces" + ], + + "modules-right": [ + "cpu", + "memory", + "backlight", + "battery", + "bluetooth", + "network", + "wireplumber", + "clock#calendar", + "clock", + "tray" + ] +} diff --git a/themes/dark/style.css b/themes/dark/style.css new file mode 100644 index 0000000..c3f875f --- /dev/null +++ b/themes/dark/style.css @@ -0,0 +1,105 @@ +/* GTK Colours */ +@define-color fg #eee; +@define-color mg #444; +@define-color bg #000; + +* { + font-family: "Hack Nerd Font", monospace; + font-size: 9pt; + font-weight: normal; + text-shadow: none; + box-shadow: none; + transition-property: background; + transition-duration: .5s; +} + +/* Colours */ +/* #clock { color: lightblue; } */ +/* #clock.calendar { color: pink; }*/ +/* #wireplumber { color: #f1c40f; }*/ +/* #battery { color: mediumpurple; }*/ +/* #network.linked{ color: seagreen; }*/ +/* #network.disconnected{ color: red; }*/ +/* #bluetooth { color: royalblue; }*/ + +/* Bar */ +window#waybar { + color: @fg; + background: @bg; + border-bottom: 1px solid @mg; +} + +window#waybar.hidded { + opacity: 0.0; +} + +/* Labels */ +label.module { + padding: 0 8px; +} + +label:hover { + color: white; +} + +/* Tray */ +#tray { + background: @bg; + border: 1px solid @fg; + border-radius: 5px; + padding: 0 8px; +} + +/* MENU */ +#custom-menu, +#custom-apps { + padding:0 13px 0 10px; +} + +#custom-menu:hover, +#custom-apps:hover { + background: @fg; + color: @bg; +} + +/* TASKBAR */ +/* +#taskbar button { + color: @mg; + padding: 4px 10px 4px 10px; + border-radius: 0; +} +#taskbar button:hover { + color: @bg; + background: @fg; +} +*/ + +/* WORKSPACES & TASKBAR*/ +#workspaces button, +#taskbar button { + color: @mg; + padding: 0 6px; + border-radius: 0; + border:none; +} + +#workspaces button:hover, +#workspaces button.focused:hover, +#taskbar button:hover { + color: @bg; + background: @fg; +} + +#workspaces button.focused { + color: @fg; + background: @mg; + border-left: 1px solid @mg; + border-right: 1px solid @mg; + border-top: 1px solid @mg; +} + +#workspaces button.urgent { + color: red; +} + diff --git a/themes/dwm/config.jsonc b/themes/dwm/config.jsonc new file mode 100644 index 0000000..961196a --- /dev/null +++ b/themes/dwm/config.jsonc @@ -0,0 +1,19 @@ +{ + "output": ["DP-1", "eDP-1"], + "position": "top", + "reload_style_on_change": true, + "include": [ "~/.config/waybar/modules/modules/modules.jsonc" ], + "modules-left": [ "sway/workspaces#full" ], + "modules-right": [ + "cpu", + "memory", + "backlight", + "battery", + "bluetooth", + "network", + "wireplumber", + "clock#calendar", + "clock", + "tray" + ] +} diff --git a/themes/dwm/style.css b/themes/dwm/style.css new file mode 100644 index 0000000..dc6f08c --- /dev/null +++ b/themes/dwm/style.css @@ -0,0 +1,52 @@ +/* GTK Colours */ +@define-color blu #224488; +@define-color gry #6e6e6e; +@define-color blk #101010; +@define-color wht #b9c4d9; + +/* GLOBAL */ +* { + font-family: "Terminess Nerd Font", monospace; + font-size: 10pt; + padding: 0; + margin: 0; + box-shadow: none; +} + +label { + padding: 0 10px; +} + +label.module { + background: @blk; + color: @gry; +} + +button { + border: none; + border-radius: 0; +} + +/* BAR */ +#waybar { + background: @blu; +} + +/* WORKSPACE */ +/* active */ +#workspaces button { + background: @blk; + color: @wht; +} +/* empty */ +#workspaces button.empty { + color: @gry; + background: @blk; + border: none; +} +/* focused */ +#workspaces button.focused { + background: @blu; + color: @wht; +} + -- cgit