From 179c38c7fad9154620261035f89b0d07f7ea3fa9 Mon Sep 17 00:00:00 2001 From: tonizz_m1pro Date: Mon, 10 Jun 2024 22:38:38 -0700 Subject: [PATCH] edit M1Pro waybar and hyprland configs --- configs/hyprland/M1Pro/hyprland.conf | 14 +-- configs/waybar_l/M1Pro/shvedes/config | 115 +++++++++++++++++++++++ configs/waybar_l/M1Pro/shvedes/style.css | 67 +++++++++++++ 3 files changed, 190 insertions(+), 6 deletions(-) create mode 100644 configs/waybar_l/M1Pro/shvedes/config create mode 100644 configs/waybar_l/M1Pro/shvedes/style.css diff --git a/configs/hyprland/M1Pro/hyprland.conf b/configs/hyprland/M1Pro/hyprland.conf index a8ab7fc..537ba6f 100644 --- a/configs/hyprland/M1Pro/hyprland.conf +++ b/configs/hyprland/M1Pro/hyprland.conf @@ -1,5 +1,5 @@ # Monitors 󰍺 -monitor = eDP-1,preferred,auto,auto # Laptop Display +monitor = eDP-1,preferred,auto,1.6 # Laptop Display # StartUp  source = ~/.config/hypr/startup.conf @@ -36,13 +36,15 @@ general { gaps_in = 5 gaps_out = 10 border_size = 2 - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) +# col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg +# col.inactive_border = rgba(595959aa) + col.active_border = rgb(EBDBB2) + col.inactive_border = rgba(31313600) layout = dwindle allow_tearing = false } -decoration { +decoration { active_opacity = 1 inactive_opacity = 0.7 rounding = 10 @@ -94,7 +96,7 @@ device { $lock = swaylock -f --color 1e1e2eFF exec-once = swayidle -w timeout 300 '$lock' timeout 300 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$lock' $mainMod = SUPER -$terminal = alacritty # kitty, foot, wezterm +$terminal = kitty # alacritty , foot, wezterm $fileManager = thunar # dolphin, nautilus $menu = wofi --show drun $lock = swaylock @@ -105,7 +107,7 @@ bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle bind = $mainMod, F, fullscreen bind = $mainMod SHIFT, R, exec, hyprctl reload -bind = $mainMod, Return, exec, alacritty +bind = $mainMod, Return, exec, $terminal bind = $mainMod, Q, killactive, bind = $mainMod, D, exec, wofi --show drun bind = $mainMod SHIFT, F, togglefloating diff --git a/configs/waybar_l/M1Pro/shvedes/config b/configs/waybar_l/M1Pro/shvedes/config new file mode 100644 index 0000000..d7e94b9 --- /dev/null +++ b/configs/waybar_l/M1Pro/shvedes/config @@ -0,0 +1,115 @@ + +{ + "layer": "bottom", + "position": "top", + "height": 28, + "reload_style_on_change": true, + "height": 4, + "margin-top": 4, + "margin-left": 10, + "margin-right": 10, + "modules-left": [ "custom/spotify", "custom/cpu", "memory", "disk" ], + "modules-center": [ "hyprland/workspaces" ], + "modules-right": [ "battery", "clock#time", "tray", "idle_inhibitor" ], + + "custom/spotify": { + "exec": "$HOME/.config/waybar/scripts/spotify.py --player spotify", + "format": "{}", + "return-type": "json", + "on-click": "playerctl -p spotify play-pause", + "on-scroll-up": "playerctl -p spotify next", + "on-scroll-down": "playerctl -p spotify previous", + "on-click-right-release": "hyprctl dispatch workspace 6", + "tooltip": false + }, + + "memory": { + "interval": 1, + "format": "{used:0.1f}GiB" + }, + + "disk": { + "interval": 60, + "format": "{used}", + "tooltip": false + }, + + "hyprland/workspaces": { + "format": "{icon}", + "on-click-release": "activate", + "sort-by-numbers": false, + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "format-icons": { + "1": "I", + "2": "II", + "3": "III", + "4": "IV", + "5": "V", + "6": "VI", + "7": "VII", + "8": "VIII", + "9": "IX", + "10": "X" + } + }, + + /* "network": { + "interval": 1, + "format-wifi": "{icon} {essid}{bandwidthUpBytes}{bandwidthDownBytes} ", + "format-disconnected": "", + "format-ethernet": "Connected", + "on-click-right-release": "alacritty --class nmtui -T 'Network Settings' -e nmtui", + "on-click-release": "$HOME/.config/waybar/scripts/network.sh", + "format-icons": [ + "󰤯 ", + "󰤟 ", + "󰤢 ", + "󰤥 ", + "󰤨 " + ] + }, +*/ + "clock#time": { + "interval": 1, + "format": "{:%I:%M %p} ", + "tooltip": false, + "on-click-release": "bash $HOME/.config/waybar/scripts/date.sh" + + }, + + "custom/cpu": { + "exec": "$HOME/.config/waybar/scripts/monitoring/cpu-temp.c", + "format": "{}", + "tooltip": false + }, + + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "󰆪 ", + "deactivated":"󰗥 " + } + }, + "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"] + }, + + "tray": { + "icon-size": 14, + "spacing": 10, + "show-passive-items": true + } + +} + +// vim:ft=jsonc diff --git a/configs/waybar_l/M1Pro/shvedes/style.css b/configs/waybar_l/M1Pro/shvedes/style.css new file mode 100644 index 0000000..3780b5a --- /dev/null +++ b/configs/waybar_l/M1Pro/shvedes/style.css @@ -0,0 +1,67 @@ +* { + border: none; + font-family: JetBrainsMono Nerd Font; + font-weight: bold; + font-size: 12px; + min-height: 0; + border-radius: 20; + padding-right: 4px; + padding-left: 4px; +} + +tooltip { + background: #282828; + border: 0px solid; + border-radius: 18px; +} + +window#waybar { + background: #282828; + color: #ebdbb2; +} + +#workspaces button { + padding: 0 0.6em; + color: #a89984; + background: #504945; + border-radius: 0px; + margin-right: 4px; + margin-left: 4px; + margin-top: 2px; + margin-bottom: 2px; +} + +#workspaces button.active { + color: #ebdbb2; + background: #665c54; +} + +#workspaces button.urgent { + color: #1d2021; + background: #fb4934; +} + +#workspaces button:hover { + background: #665c54; +} + +#disk, +#clock, +#memory, +/*#network,*/ +#workspaces, +#battery, +#idle_inhibitor, +#custom-cpu, +#custom-spotify, +#tray { + color: #d5c4a1; + background: #433e3c; + padding: 0 0.6em; + margin-right: 4px; + margin-left: 2px; + margin-top: 4px; + margin-bottom: 4px; + border-radius: 18px; +} +