From 8a217a7c248f37c13452ad59c735b1752a6b162a Mon Sep 17 00:00:00 2001 From: Dante <150515748+xsghetti@users.noreply.github.com> Date: Mon, 15 Apr 2024 01:07:42 -0400 Subject: [PATCH] Add files via upload --- .../Themes/Old Theme 4⁄15⁄24/config | 260 ++++++++++++++++ .../Themes/Old Theme 4⁄15⁄24/style.css | 221 ++++++++++++++ .config/waybar/config | 99 ++---- .config/waybar/style.css | 287 ++++++------------ 4 files changed, 607 insertions(+), 260 deletions(-) create mode 100644 .config/waybar/Themes/Old Theme 4⁄15⁄24/config create mode 100644 .config/waybar/Themes/Old Theme 4⁄15⁄24/style.css diff --git a/.config/waybar/Themes/Old Theme 4⁄15⁄24/config b/.config/waybar/Themes/Old Theme 4⁄15⁄24/config new file mode 100644 index 00000000..7ba8f171 --- /dev/null +++ b/.config/waybar/Themes/Old Theme 4⁄15⁄24/config @@ -0,0 +1,260 @@ +{ + "layer": "top", // Waybar at top layer + // "output": ["eDP-1"], + "position": "top", // Waybar position (top|bottom|left|right) + // "height": 30, // Waybar height (to be removed for auto height) + // "width": 1280, // Waybar width + // "spacing": 4, // Gaps between modules (4px) + // Choose the order of the modules + "modules-left": ["custom/menu", "hyprland/workspaces", "custom/updates"], + "modules-center": ["custom/playerctl", "custom/playerlabel"], + "modules-right": ["custom/swaync", "custom/chatgpt", "network", "pulseaudio", "clock", "tray", "battery", "backlight", "custom/power"], + + "keyboard-state": { + "numlock": true, + "capslock": true, + "format": "{name} {icon}", + "format-icons": { + "locked": "", + "unlocked": "" + } + }, + "sway/mode": { + "format": "{}" + }, + "sway/scratchpad": { + "format": "{icon} {count}", + "show-empty": false, + "format-icons": ["", ""], + "tooltip": true, + "tooltip-format": "{app}: {title}" + }, + "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": "󰥔" + + }, + + "tray": { + // "icon-size": 21, + "spacing": 10 + }, + "clock": { + "format": "{:%H:%M}", + "tooltip-format": "{:%Y %B}\n{calendar}" + }, + "cpu": { + "format": "{usage}% ", + "tooltip": false + }, + "memory": { + "format": "{}% " + }, + "temperature": { + "thermal-zone": 1, + "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": ["", "", "", "", "", "", "", "", ""] + }, + "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}", + "format-ethernet": "󱘖 hardwired", + "tooltip-format": "󱘖 {ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}", + "format-linked": "󱘖 {ifname} (No IP)", + "format-disconnected": " Disconnected", + "format-alt": "󰤨 {signalStrength}%", + "interval": 5 + }, + "pulseaudio": { + "scroll-step": 1, // %, can be a float, + "format": "{volume}% {icon} {format_source}", + "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 + }, + "custom/menu": { + "format": "󰣇", + "tooltip": false, + "on-click": "rofi -show drun", + }, + "hyprland/workspaces": { + "active-only": false, + "format": "{icon}", + "format-icons": { + "urgent": "", + "active": "", + "default": "󰧞", + "sort-by-number": true, + }, + + + }, + "custom/div": { + "format": "/", + "tooltip": false, + + }, + "custom/playerctl": { + "format": "{icon}", + "return-type": "json", + "max-length": 64, + "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F", + "on-click-middle": "playerctl play-pause", + "on-click": "playerctl previous", + "on-click-right": "playerctl next", + "format-icons": { + "Playing": "󰒮 󰐌 󰒭", + "Paused": "󰒮 󰏥 󰒭" + }, + }, + "custom/playerlabel": { + "format": "{}", + "return-type": "json", + "max-length": 40, + "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F", + "on-click-middle": "playerctl play-pause", + "on-click": "playerctl previous", + "on-click-right": "playerctl next", + "format-icons": { + "Playing": "󰒮 󰐌 󰒭", + "Paused": "󰒮 󰏥 󰒭" + }, + }, + "custom/name": { + "format": "ダンテコンピュータ", + "tooltip":false, + }, + "custom/power": { + "format": " ⏻ ", + "tooltip": false, + "on-click": "wlogout --protocol layer-shell" + }, + + "custom/updates": { + "exec": "~/.config/hypr/scripts/systemupdate.sh", + "return-type": "json", + "format": "󰮯 {}", + "on-click": "~/.config/hypr/scripts/systemupdate.sh up", + "interval": 86400, // once every day + "tooltip": true, + }, + "wlr/taskbar": { + "format": "{icon}", + "icon-size": 15, + //"icon-theme": "Numix-Circle", + "tooltip-format": "{title}", + "on-click": "activate", + "on-click-middle": "close" + }, + +"custom/swaync": { + "tooltip": true, + "format": "{icon} {}", + "format-icons": { + "notification": "", + "none": "", + "dnd-notification": "", + "dnd-none": "", + "inhibited-notification": "", + "inhibited-none": "", + "dnd-inhibited-notification": "", + "dnd-inhibited-none": "" + }, + "return-type": "json", + "exec-if": "which swaync-client", + "exec": "swaync-client -swb", + "on-click": "sleep 0.1 && swaync-client -t -sw", + "on-click-right": "swaync-client -d -sw", + "escape": true +}, +"custom/chatgpt": { + "format": "󰢚", + "on-click": "firefox https://chatgpt.com", + "tooltip": false +}, + + + + + + + +}, + + + + diff --git a/.config/waybar/Themes/Old Theme 4⁄15⁄24/style.css b/.config/waybar/Themes/Old Theme 4⁄15⁄24/style.css new file mode 100644 index 00000000..57117685 --- /dev/null +++ b/.config/waybar/Themes/Old Theme 4⁄15⁄24/style.css @@ -0,0 +1,221 @@ + +* { + border: none; + border-radius: 0; + font-family: 'FiraCode Nerd Font'; + font-size: 13px; + min-height: 0; +} +@import '../../.cache/wal/colors-waybar.css'; +window#waybar { + background: transparent; + /* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */ + color: @color6; +} + + +tooltip { + background: @color1; + border: 1px solid @color7; + color: @color7 +} +tooltip label { + color: white; +} + +#workspaces{ + background-color: @color1; + margin-top: 5px; + margin-bottom: 3px; + border-radius: 4px; + margin-left: 5px; + padding-right: 5px; + border: 1.2px solid @color7; +} +#workspaces button { + padding: 5px 5px; + background: transparent; + color: @color7; + border-bottom: 3px solid transparent; + margin-top: 3px; + margin-left: 3px; + border-radius: 4px; + + +} + +#workspaces button.focused { + /* background: #64727D; */ + /* border-bottom: 3px solid white; */ +} + +#workspaces button:hover{ + border-radius: 6px; + /* background-color: rgba(114, 101, 138, 0.8); */ + box-shadow: inset 2px 2px 2px @color7; + +} + +#mode, #clock, #battery { + padding: 0 10px; +} + +#mode { + /* background: #64727D; */ + border-bottom: 3px solid white; +} + +#clock, #idle_inhibitor, #network, #pulseaudio, #tray, #temperature, #battery, #backlight{ + background-color: @color1; + padding: 2px 10px; + margin-top: 5px; + margin-bottom: 3px; + padding-left: 10px; + color: @color7; + border: 1.2px solid @color7; +} +#backlight{ + border-radius: 4px; + margin-right: 2px; + margin-left: 4px; +} +#clock { + padding-left: 15px; + padding-right: 0; + margin-right: 5px; +} +#idle_inhibitor{ + background-color: rgba(0, 255, 255, 0.3); +} + +#battery { + background-color: @color7; + color: black; + border: 1.2px solid @color7; + border-radius: 4px; + padding-top: 5px; + margin-left: 2px; +} + +#battery.charging { + color: white; + background-color: @color1; +} + +@keyframes blink { + to { + background-color: #ffffff; + color: black; + } +} + +#battery.warning:not(.charging) { + background: #f53c3c; + color: white; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: steps(12); + animation-iteration-count: infinite; + animation-direction: alternate; +} +#custom-menu{ + padding-left: 8px; + padding-right: 11px; + background-color: @color1; + border-radius: 4px; + margin-top: 5px; + margin-bottom: 3px; + margin-left: 5px; + color: @color7; + border: 1.2px solid @color7; + +} + + +#tray{ + padding-left: 5px; + padding-right: 5px; + border-radius: 4px; + margin-right: 2px +} + +#clock{ + border-radius:0px 4px 4px 0px; + padding-right: 10px; +} +#custom-updates{ + padding-left: 5px; + padding-right: 5px; + color: @color7; + background-color: @color1; + border: 1.2px solid @color7; + border-radius: 4px; + margin-top: 5px; + margin-bottom: 3px; + margin-left: 4px; +} + +#pulseaudio.muted{ + color: rgb(189, 5, 5); + font-weight: bold; + +} + +#custom-power{ + margin-right: 5px; + margin-left: 2px; + margin-top: 5px; + margin-bottom: 3px; + border-radius: 4px; + padding-right: 2px; + background-color: @color1; + color: @color7; + border: 1.2px solid @color7; +} +#network{ + border-radius: 4px 0px 0px 4px; +} + +#custom-playerctl, +#custom-playerlabel{ + + padding-top: 5px; + padding-left: 5px; + padding-right: 5px; + padding-bottom: 5px; + background-color: @color1; + margin-bottom: 3px; + margin-top: 5px; + margin-right: 5px; + border-radius: 4px; + margin-left: 5px; + border: 1.2px solid @color7; + color: @color7; +} + +#custom-name{ +border: solid 2px; +border-color: rgba(156, 120, 223, 1); +border-radius: 2pc 0px 2pc 0px; +padding-left: 20px; +padding-right: 20px; +margin-top: 3px; +margin-bottom: 3px; +} +#wlr-taskbar{ + margin-top: 5px; + margin-bottom: 5px; + background-color: rgba(114, 101, 138, 0.5); + + +} +#custom-chatgpt { + margin-right: 10px; + margin-left: 10px; + background-repeat: no-repeat; + background-position: center; + padding-right: 10px; + } + + + diff --git a/.config/waybar/config b/.config/waybar/config index 8042418b..5bf1aea9 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -1,71 +1,38 @@ -{ - "layer": "top", // Waybar at top layer - // "output": ["eDP-1"], - "position": "top", // Waybar position (top|bottom|left|right) - // "height": 30, // Waybar height (to be removed for auto height) - // "width": 1280, // Waybar width - // "spacing": 4, // Gaps between modules (4px) - // Choose the order of the modules - "modules-left": ["custom/menu", "hyprland/workspaces", "custom/updates"], - "modules-center": ["custom/playerctl", "custom/playerlabel"], - "modules-right": ["custom/swaync", "custom/chatgpt", "network", "pulseaudio", "clock", "tray", "battery", "backlight", "custom/power"], - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": "{name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" - } - }, - "sway/mode": { - "format": "{}" - }, - "sway/scratchpad": { - "format": "{icon} {count}", - "show-empty": false, - "format-icons": ["", ""], - "tooltip": true, - "tooltip-format": "{app}: {title}" - }, - "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": "󰥔" - - }, +{ + + "layer": "top", // Waybar at top layer + // "output": "DP-1", + "position": "top", // Waybar position (top|bottom|left|right) + "height": 30, // Waybar height (to be removed for auto height) + // "spacing": 4, // Gaps between modules (4px) + "margin-top": 5, + "margin-left": 10, + "margin-right": 10, + "modules-left": ["custom/menu", "hyprland/workspaces"], + "modules-center": ["custom/playerctl", "custom/playerlabel"], + "modules-right": ["group/widgets", "network", "pulseaudio", "clock", "battery", "backlight", "tray", "custom/power"], + + + // Modules + "group/widgets": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "not-power", + "transition-left-to-right": false, + }, + "modules": ["custom/swaync", "custom/chatgpt", "custom/updates", "network" ] + }, + + "tray": { // "icon-size": 21, "spacing": 10 }, "clock": { - "format": "{:%H:%M}", + "format": "{:%H:%M}", "tooltip-format": "{:%Y %B}\n{calendar}" }, "cpu": { @@ -244,18 +211,12 @@ "custom/chatgpt": { "format": "󰢚", "on-click": "firefox https://chatgpt.com", - "tooltip": false + "tooltip-format": "ChatGPT" }, - - - - - }, - - + diff --git a/.config/waybar/style.css b/.config/waybar/style.css index b35a732b..1838051a 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,222 +1,127 @@ - * { - border: none; - border-radius: 0; + /* `otf-font-awesome` is required to be installed for icons */ font-family: 'FiraCode Nerd Font'; font-size: 13px; - min-height: 0; + } @import '../../.cache/wal/colors-waybar.css'; + window#waybar { - background: transparent; - /* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */ - color: @foreground; + background-color: alpha(@background, 0.8); + border: 1.5px solid @color6; + color: @color7; + transition-property: background-color; + transition-duration: .5s; } - - tooltip { - background: @color1; - border: 1px solid @color7; - color: @color7 -} -tooltip label { - color: white; -} + background: @color1; + border: 1px solid @color7; + color: @color7 + } + tooltip label { + color: white; + } -#workspaces{ - background-color: @color1; - margin-top: 5px; - margin-bottom: 3px; - border-radius: 4px; - margin-left: 5px; + +#network, +#custom-updates, +#custom-swaync, +#custom-chatgpt, +#clock, +#pulseaudio, +#custom-playerctl{ + padding-left: 5px; padding-right: 5px; - border: 1.2px solid @color7; -} -#workspaces button { - padding: 5px 5px; - background: transparent; - color: @color7; - border-bottom: 3px solid transparent; - margin-top: 3px; - margin-left: 3px; - border-radius: 4px; - - } -#workspaces button.focused { - /* background: #64727D; */ - /* border-bottom: 3px solid white; */ -} - -#workspaces button:hover{ - border-radius: 6px; - /* background-color: rgba(114, 101, 138, 0.8); */ - box-shadow: inset 2px 2px 2px @color7; - -} - -#mode, #clock, #battery { - padding: 0 10px; -} - -#mode { - /* background: #64727D; */ - border-bottom: 3px solid white; -} - -#clock, #idle_inhibitor, #network, #pulseaudio, #tray, #temperature, #battery, #backlight{ - background-color: @color1; - padding: 2px 10px; - margin-top: 5px; - margin-bottom: 3px; - padding-left: 10px; - color: @color7; - border: 1.2px solid @color7; -} -#backlight{ - border-radius: 4px; - margin-right: 2px; - margin-left: 4px; -} -#clock { - padding-left: 15px; - padding-right: 0; - margin-right: 5px; -} -#idle_inhibitor{ - background-color: rgba(0, 255, 255, 0.3); -} - -#battery { - background-color: @color7; - color: black; - border: 1.2px solid @color7; - border-radius: 4px; - padding-top: 5px; - margin-left: 2px; -} - -#battery.charging { - color: white; - background-color: @color1; -} - -@keyframes blink { - to { - background-color: #ffffff; - color: black; - } -} - -#battery.warning:not(.charging) { - background: #f53c3c; - color: white; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: steps(12); - animation-iteration-count: infinite; - animation-direction: alternate; -} #custom-menu{ - padding-left: 8px; - padding-right: 11px; - background-color: @color1; - border-radius: 4px; - margin-top: 5px; - margin-bottom: 3px; margin-left: 5px; - color: @color7; - border: 1.2px solid @color7; - -} - - -#tray{ - padding-left: 5px; - padding-right: 5px; - border-radius: 4px; - margin-right: 2px -} - -#clock{ - border-radius:0px 4px 4px 0px; - padding-right: 10px; -} -#custom-updates{ - padding-left: 5px; - padding-right: 5px; - color: @color7; - background-color: @color1; - border: 1.2px solid @color7; - border-radius: 4px; margin-top: 5px; - margin-bottom: 3px; - margin-left: 4px; -} - -#pulseaudio.muted{ - color: rgb(189, 5, 5); - font-weight: bold; + margin-bottom: 5px; + padding-left: 7px; + padding-right: 10px; + background-color: @color1; + border: 1px solid @color7; + border-radius: 0px; } #custom-power{ - margin-right: 5px; - margin-left: 2px; - margin-top: 5px; - margin-bottom: 3px; - border-radius: 4px; - padding-right: 2px; background-color: @color1; - color: @color7; - border: 1.2px solid @color7; -} -#network{ - border-radius: 4px 0px 0px 4px; -} - -#custom-playerctl, -#custom-playerlabel{ - - padding-top: 5px; - padding-left: 5px; - padding-right: 5px; - padding-bottom: 5px; - background-color: @color1; - margin-bottom: 3px; - margin-top: 5px; - margin-right: 5px; - border-radius: 4px; + border: 1px solid @color7; + margin-left: 5px; - border: 1.2px solid @color7; - color: @color7; -} - -#custom-name{ -border: solid 2px; -border-color: rgba(156, 120, 223, 1); -border-radius: 2pc 0px 2pc 0px; -padding-left: 20px; -padding-right: 20px; -margin-top: 3px; -margin-bottom: 3px; -} -#wlr-taskbar{ + margin-right: 5px; margin-top: 5px; margin-bottom: 5px; - background-color: rgba(114, 101, 138, 0.5); + padding-right: 3px; +} +#tray, +#network, +#pulseaudio, +#clock, +#custom-swaync, +#custom-updates{ + margin-left: 5px; + margin-top: 5px; + margin-bottom: 5px; + padding-left: 5px; + padding-right: 5px; + background-color: @color1; + border: 1px solid @color7; + +} +#custom-chatgpt{ + background-color: @color1; + border: 1px solid @color7; + + margin-left: 5px; + margin-top: 5px; + margin-bottom: 5px; + padding-left: 5px; + padding-right: 7px; } -#custom-chatgpt { - margin-right: 10px; - margin-left: 10px; - background-repeat: no-repeat; - background-position: center; + + +#workspaces{ + margin-left: 5px; + border: 1px solid @color7; + background-color: @color1; + margin-top: 5px; + margin-bottom: 5px; + /* */ +} + +#workspaces button { + color: @color7; +} +#workspaces button:hover{ + border-color: @color7; + border-radius: 0px; +} + +#custom-playerlabel{ + background-color: @color1; + border: 1px solid @color7; + color: @color7; + margin-left: 5px; + margin-top: 5px; + margin-bottom: 5px; + padding-left: 10px; padding-right: 10px; - } + /* border-radius: 0pc 5pc 0pc 5pc; */ +} +#custom-playerctl{ + +} + + + + +