diff --git a/configs/waybar_l/MacAirT2/Scale1x/README.md b/configs/waybar_l/MacAirT2/Scale1x/README.md new file mode 100644 index 0000000..5de23f2 --- /dev/null +++ b/configs/waybar_l/MacAirT2/Scale1x/README.md @@ -0,0 +1,3 @@ +## Scale Screen to 1x + +I had to upscale multiple settings in the `style` and `config` file to make the bar a bit bigger, the spacing of all modules also needed to be upcaled diff --git a/configs/waybar_l/MacAirT2/Scale1x/config.jsonc b/configs/waybar_l/MacAirT2/Scale1x/config.jsonc new file mode 100644 index 0000000..7f6bc8d --- /dev/null +++ b/configs/waybar_l/MacAirT2/Scale1x/config.jsonc @@ -0,0 +1,138 @@ +{ + "layer": "top", + "modules-left": ["custom/launcher", "wlr/taskbar", "hyprland/workspaces"], + /*"modules-center": ["hyprland/window"],*/ + "modules-center": ["clock"], + "modules-right": [ "idle_inhibitor", "custom/cpu", "custom/gpu", "tray", "backlight", "pulseaudio", "battery"], + "margin": 8, + "spacing": 22, + "margin-bottom": 6, + "margin-top": 8, + "margin-left": 12, + "margin-right": 12, + + + /*"hyprland/window": { + "format-empty": "nothing is running", + "separate-outputs": true, + "icon": true, + "icon-size": 11 + },*/ + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": " ", + "deactivated":" " + } + }, + "pulseaudio": { + "tooltip": false, + "scroll-step": 1, + "format": "{icon} {volume}%", + "format-muted": " {volume}%", + "on-click":"pavucontrol", + "format-icons": { + "default": [" ", " ", " "] + } + }, + + "custom/cpu": { + "format": "\udb83\udee0 {}℃", + "interval": 5, + "exec": "bash ~/.config/waybar/scripts/cpu-temp.sh", + "on-click": "kitty -e bash -c 'htop; read'" + }, + + "custom/gpu": { + "format": "\udb82\udcae {}℃", + "interval": 5, + "exec": "bash ~/.config/waybar/scripts/gpu-temp.sh", + "on-click": "kitty -e bash -c 'nvtop; read'" + }, + + "backlight": { + "tooltip": false, + "format": " {}%", + "interval":1, + "on-scroll-up": "brightnessctl s +5", + "on-scroll-down": "brightnessctl s 5-" + }, + "battery": { + "states": { + "good": 95, + "warning": 30, + "critical": 20 + }, + "format": "{icon} {capacity}%", + "format-charging": "\udb80\udc84 {capacity}%", + "format-plugged": "\udb81\udea5 {capacity}%", + "format-alt": "{time} {icon}", + "format-icons": ["\udb80\udc7a", "\udb80\udc7b", "\udb80\udc7c", "\udb80\udc7d", "\udb80\udc7e", "\udb80\udc7f", "\udb80\udc80", "\udb80\udc81", "\udb80\udc82", "\udb80\udc79"] + }, + + "clock": { + "format": "{:%A %B %d %Y %R}", + "on-click": "firefox --new-window https://www.google.com/calendar" + }, + + "custom/launcher":{ + "format": " ", + "on-click": "hyprctl dispatch exec '[floating] wofi --show drun -normal-window'" + }, + + "hyprland/workspaces": { + "on-click": "activate", + "persistent-workspaces": { +/* "eDP-1": [1], / Sets workspaces as invisible unless something is running on them / + "eDP-1": [2], + "eDP-1": [3], + "eDP-1": [4], + "eDP-1": [5], + "eDP-1": [6], + "DP-2": [7], + "DP-2": [8], + "DP-2": [9], + "DP-2": [10], */ + +/* "hyprland/workspaces": { + "format": "{icon}", + "on-click": "activate", + "format-icons": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "urgent": "", + "active": "", + "default": "" + }, + "sort-by-number": true */ /* testing, these new set up*/ + + }, + "eDP-1": [ 1, 2, 3, 4, 5, 6 ], /* All workspaces shows visible */ + "DP-2": [ 7, 8, 9, 10 ] + } + }, + + "wlr/taskbar": { + "format": "{icon}", + "icon-size": 26, + "tooltip-format": "{title}", + "on-click": "activate", + "on-click-middle": "close", + "app_ids-mapping": { + "firefoxdeveloperedition": "firefox-developer-edition" + }, + "ignore-list": ["rofi"], + "rewrite": { + "Firefox Web Browser": "Firefox", + "Foot Server": "Terminal" + } + }, + + "tray": { + "icon-size": 21, + "spacing": 16 + } +} diff --git a/configs/waybar_l/MacAirT2/Scale1x/scripts/cpu-temp.sh b/configs/waybar_l/MacAirT2/Scale1x/scripts/cpu-temp.sh new file mode 100644 index 0000000..359e144 --- /dev/null +++ b/configs/waybar_l/MacAirT2/Scale1x/scripts/cpu-temp.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +sensors | awk -F '[+°]' '/^Package id 0:/ {printf "%d\n", $2}' diff --git a/configs/waybar_l/MacAirT2/Scale1x/scripts/gpu-temp.sh b/configs/waybar_l/MacAirT2/Scale1x/scripts/gpu-temp.sh new file mode 100644 index 0000000..9cab930 --- /dev/null +++ b/configs/waybar_l/MacAirT2/Scale1x/scripts/gpu-temp.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +nvidia-smi --query-gpu=temperature.gpu --format=csv,noheader diff --git a/configs/waybar_l/MacAirT2/Scale1x/style.css b/configs/waybar_l/MacAirT2/Scale1x/style.css new file mode 100644 index 0000000..60274d5 --- /dev/null +++ b/configs/waybar_l/MacAirT2/Scale1x/style.css @@ -0,0 +1,123 @@ +@import "./themes/catppuccin/mocha.css"; + +* { + font-size: 26px; + font-family: Iosevka Nerd Font; +} + +window#waybar { + background: @mantle; + border-radius: 18px; +} + +window#waybar.empty #window { + background-color: transparent; +} + +.modules-left { + background: @surface0; + border-top-right-radius: 24px; + border-bottom-right-radius: 24px; + padding: 0px 18px 0px 8px; +} + +.modules-right { + background: @surface0; + border-top-left-radius: 24px; + border-bottom-left-radius: 24px; + padding: 0px 18px 0px 8px; + font-weight: bold; +} + +.modules-center { + background: transparent; +} + +#window { + color: @text; + font-weight: bold; +} + +#custom-launcher { + font-size: 26px; + font-weight: bold; + color: @blue; +} + +#custom-launcher:hover { + color: @red; +} + +#workspaces button { + padding: 0px; + border-radius: 0px; + margin: 0px; + color: @text; + font-weight: bold; + border-top: 2px solid transparent; + border-bottom: 2px solid transparent; +} + +#workspaces button.active { + color: @mauve; + border-bottom: 2px solid @mauve; + margin: 6px; +} + +#taskbar { + background: @surface0; + padding: 0px 4px 1px; +} + +#taskbar button { + border-radius: 0px; + transition: all 0.3s; + padding: 1px 2px 0px 4px; + margin: 0px; + opacity: 0.3; + background: transparent; +} + +#taskbar button.active { + background: transparent; + opacity: 1; +} + +#taskbar button:hover { + background: @surface3; + opacity: 0.8; +} + +#custom-pacman { + color: @red; + margin-right: 8px; +} + +#idle_inhibitor { + margin: 0px 4px; + color: @lavender; +} +#clock, +#tray, +#backlight, +#pulseaudio, +#battery, +#custom-cpu, +#custom-gpu { + margin: 0px 4px; +} +#custom-cpu { + color: @lavender; +} +#custom-gpu { + color: @blue; +} +#backlight, +#pulseaudio, +#battery { + color: @text; +} + +#clock { + color: @green; +} diff --git a/configs/waybar_l/MacAirT2/Scale1x/themes/catppuccin/mocha.css b/configs/waybar_l/MacAirT2/Scale1x/themes/catppuccin/mocha.css new file mode 100644 index 0000000..0eb6a82 --- /dev/null +++ b/configs/waybar_l/MacAirT2/Scale1x/themes/catppuccin/mocha.css @@ -0,0 +1,26 @@ +@define-color rosewater #f5e0dc; +@define-color flamingo #f2cdcd; +@define-color pink #f5c2e7; +@define-color mauve #cba6f7; +@define-color red #f38ba8; +@define-color maroon #eba0ac; +@define-color peach #fab387; +@define-color yellow #f9e2af; +@define-color green #a6e3a1; +@define-color teal #94e2d5; +@define-color sky #89dceb; +@define-color sapphire #74c7ec; +@define-color blue #89b4fa; +@define-color lavender #b4befe; +@define-color text #cdd6f4; +@define-color subtext1 #bac2de; +@define-color subtext0 #a6adc8; +@define-color overlay2 #9399b2; +@define-color overlay1 #7f849c; +@define-color overlay0 #6c7086; +@define-color surface2 #585b70; +@define-color surface1 #45475a; +@define-color surface0 #313244; +@define-color base #1e1e2e; +@define-color mantle #181825; +@define-color crust #11111b; diff --git a/configs/waybar_l/MacAirT2/Scale2x/README.md b/configs/waybar_l/MacAirT2/Scale2x/README.md new file mode 100644 index 0000000..0cbe5b9 --- /dev/null +++ b/configs/waybar_l/MacAirT2/Scale2x/README.md @@ -0,0 +1,3 @@ +## Scale Screen to 2x + +I had to upscale multiple settings in the `style` and `config` file to make the bar a bit bigger, the spacing of all modules also needed to be upcaled diff --git a/configs/waybar_l/MacAirT2/Scale2x/config.jsonc b/configs/waybar_l/MacAirT2/Scale2x/config.jsonc new file mode 100644 index 0000000..77b7e3c --- /dev/null +++ b/configs/waybar_l/MacAirT2/Scale2x/config.jsonc @@ -0,0 +1,106 @@ +{ + "layer": "top", + "modules-left": ["custom/launcher", "wlr/taskbar", "hyprland/workspaces"], + /*"modules-center": ["hyprland/window"],*/ + "modules-center": ["clock"], + "modules-right": ["idle_inhibitor", "custom/cpu", "custom/gpu", "tray", "backlight", "pulseaudio", "battery"], + "margin": "0", + + /*"hyprland/window": { + "format-empty": "nothing is running", + "separate-outputs": true, + "icon": true, + "icon-size": 11 + },*/ + + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": " ", + "deactivated":" " + } + }, + "pulseaudio": { + "tooltip": false, + "scroll-step": 5, + "format": "{icon} {volume}%", + "format-muted": " {volume}%", + "on-click":"pavucontrol", + "format-icons": { + "default": [" ", " ", " "] + } + }, + + "custom/cpu": { + "format": "\udb83\udee0 {}℃", + "interval": 5, + "exec": "bash ~/.config/waybar/scripts/cpu-temp.sh", + "on-click": "kitty -e bash -c 'htop; read'" + }, + + "custom/gpu": { + "format": "\udb82\udcae {}℃", + "interval": 5, + "exec": "bash ~/.config/waybar/scripts/gpu-temp.sh", + "on-click": "kitty -e bash -c 'nvtop; read'" + }, + + "backlight": { + "tooltip": false, + "format": " {}%", + "interval":1, + "on-scroll-up": "brightnessctl s +5", + "on-scroll-down": "brightnessctl s 5-" + }, + "battery": { + "states": { + "good": 95, + "warning": 30, + "critical": 20 + }, + "format": "{icon} {capacity}%", + "format-charging": "\udb80\udc84 {capacity}%", + "format-plugged": "\udb81\udea5 {capacity}%", + "format-alt": "{time} {icon}", + "format-icons": ["\udb80\udc7a", "\udb80\udc7b", "\udb80\udc7c", "\udb80\udc7d", "\udb80\udc7e", "\udb80\udc7f", "\udb80\udc80", "\udb80\udc81", "\udb80\udc82", "\udb80\udc79"] + }, + + "clock": { + "format": "{:%A %B %d %Y %R}", + "on-click": "firefox --new-window https://www.google.com/calendar" + }, + + "custom/launcher":{ + "format": " ", + "on-click": "hyprctl dispatch exec '[floating] wofi --show drun -normal-window'" + }, + + "hyprland/workspaces": { + "on-click": "activate", + "persistent-workspaces": { + "eDP-1": [ 1, 2, 3, 4, 5 ], + "DP-2": [ 6, 7, 8, 9, 10 ] + } + }, + + "wlr/taskbar": { + "format": "{icon}", + "icon-size": 11, + "tooltip-format": "{title}", + "on-click": "activate", + "on-click-middle": "close", + "app_ids-mapping": { + "firefoxdeveloperedition": "firefox-developer-edition" + }, + "ignore-list": ["rofi"], + "rewrite": { + "Firefox Web Browser": "Firefox", + "Foot Server": "Terminal" + } + }, + + "tray": { + "icon-size": 11, + "spacing": 4 + } +} diff --git a/configs/waybar_l/MacAirT2/Scale2x/scripts/cpu-temp.sh b/configs/waybar_l/MacAirT2/Scale2x/scripts/cpu-temp.sh new file mode 100644 index 0000000..359e144 --- /dev/null +++ b/configs/waybar_l/MacAirT2/Scale2x/scripts/cpu-temp.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +sensors | awk -F '[+°]' '/^Package id 0:/ {printf "%d\n", $2}' diff --git a/configs/waybar_l/MacAirT2/Scale2x/scripts/gpu-temp.sh b/configs/waybar_l/MacAirT2/Scale2x/scripts/gpu-temp.sh new file mode 100644 index 0000000..9cab930 --- /dev/null +++ b/configs/waybar_l/MacAirT2/Scale2x/scripts/gpu-temp.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +nvidia-smi --query-gpu=temperature.gpu --format=csv,noheader diff --git a/configs/waybar_l/MacAirT2/Scale2x/style.css b/configs/waybar_l/MacAirT2/Scale2x/style.css new file mode 100644 index 0000000..b658ccc --- /dev/null +++ b/configs/waybar_l/MacAirT2/Scale2x/style.css @@ -0,0 +1,122 @@ +@import "./themes/catppuccin/mocha.css"; + +* { + font-size: 16px; + font-family: IosevkaTermSlab Nerd Font; +} + +window#waybar { + background: @mantle; + border-radius: 0px; +} + +window#waybar.empty #window { + background-color: transparent; +} + +.modules-left { + background: @surface0; + border-top-right-radius: 14px; + border-bottom-right-radius: 14px; + padding: 0px 12px 0px 4px; +} + +.modules-right { + background: @surface0; + border-top-left-radius: 14px; + border-bottom-left-radius: 14px; + padding: 0px 4px 0px 12px; + font-weight: bold; +} + +.modules-center { + background: transparent; +} + +#window { + color: @text; + font-weight: bold; +} + +#custom-launcher { + font-size: 16px; + font-weight: bold; + color: @blue; +} + +#custom-launcher:hover { + color: @red; +} + +#workspaces button { + padding: 0px; + border-radius: 0px; + margin: 0px; + color: @text; + font-weight: bold; + border-top: 2px solid transparent; + border-bottom: 2px solid transparent; +} + +#workspaces button.active { + color: @mauve; + border-bottom: 2px solid @mauve; +} + +#taskbar { + background: @surface0; + padding: 0px 4px 1px; +} + +#taskbar button { + border-radius: 0px; + transition: all 0.3s; + padding: 1px 2px 0px 4px; + margin: 0px; + opacity: 0.3; + background: transparent; +} + +#taskbar button.active { + background: transparent; + opacity: 1; +} + +#taskbar button:hover { + background: @surface3; + opacity: 0.8; +} + +#custom-pacman { + color: @red; + margin-right: 8px; +} + +#idle_inhibitor { + margin: 0px 4px; + color: @lavender; +} +#clock, +#tray, +#backlight, +#pulseaudio, +#battery, +#custom-cpu, +#custom-gpu { + margin: 0px 4px; +} +#custom-cpu { + color: @lavender; +} +#custom-gpu { + color: @blue; +} +#backlight, +#pulseaudio, +#battery { + color: @text; +} + +#clock { + color: @green; +} diff --git a/configs/waybar_l/MacAirT2/Scale2x/themes/catppuccin/mocha.css b/configs/waybar_l/MacAirT2/Scale2x/themes/catppuccin/mocha.css new file mode 100644 index 0000000..0eb6a82 --- /dev/null +++ b/configs/waybar_l/MacAirT2/Scale2x/themes/catppuccin/mocha.css @@ -0,0 +1,26 @@ +@define-color rosewater #f5e0dc; +@define-color flamingo #f2cdcd; +@define-color pink #f5c2e7; +@define-color mauve #cba6f7; +@define-color red #f38ba8; +@define-color maroon #eba0ac; +@define-color peach #fab387; +@define-color yellow #f9e2af; +@define-color green #a6e3a1; +@define-color teal #94e2d5; +@define-color sky #89dceb; +@define-color sapphire #74c7ec; +@define-color blue #89b4fa; +@define-color lavender #b4befe; +@define-color text #cdd6f4; +@define-color subtext1 #bac2de; +@define-color subtext0 #a6adc8; +@define-color overlay2 #9399b2; +@define-color overlay1 #7f849c; +@define-color overlay0 #6c7086; +@define-color surface2 #585b70; +@define-color surface1 #45475a; +@define-color surface0 #313244; +@define-color base #1e1e2e; +@define-color mantle #181825; +@define-color crust #11111b;