diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf index 7a1af8a..16044b3 100644 --- a/hypr/.config/hypr/hyprland.conf +++ b/hypr/.config/hypr/hyprland.conf @@ -35,7 +35,7 @@ exec-once=wl-paste --type image --watch cliphist store exec-once=~/.config/hypr/hypridle_launch.sh exec-once=swww-daemon exec-once=hyprshade on vibrance -exec-once=waybar +exec-once=~/.config/hypr/waybar_launch.sh exec-once=~/.config/hypr/xdg-desktop-portal.sh exec-once=kanshi exec-once=wlsunset -l 45.424721 -L -75.695000 diff --git a/hypr/.config/hypr/keybinds.conf b/hypr/.config/hypr/keybinds.conf index f6b3634..fe072d9 100644 --- a/hypr/.config/hypr/keybinds.conf +++ b/hypr/.config/hypr/keybinds.conf @@ -118,7 +118,7 @@ bind = $mainMod, Escape, exec, wlogout # Session logout bind = CTRL ALT, P, exec, "$HOME/.config/hypr/scripts/Wlogout.sh" # Session logout # Waybar -bind = CTRL, Escape, exec, killall waybar || waybar # Toggle waybar +bind = CTRL, Escape, exec, killall waybar || ~/.config/hypr/waybar_launch.sh # Toggle waybar # Screenshot diff --git a/hypr/.config/hypr/waybar_launch.sh b/hypr/.config/hypr/waybar_launch.sh new file mode 100755 index 0000000..f2383d6 --- /dev/null +++ b/hypr/.config/hypr/waybar_launch.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +# Define the desired hostname to compare +EXPECTED_HOSTNAME="dell7770-linux" + +# Get the current hostname +CURRENT_HOSTNAME=$(hostname) + +# Check if the current hostname is not equal to the expected hostname +if [[ "$CURRENT_HOSTNAME" != "$EXPECTED_HOSTNAME" ]]; then + waybar & +# notify-send "$EXPECTED_HOSTNAME // $CURRENT_HOSTNAME" +# notify-send "hypridle launched!!" +else + waybar --config ~/.config/waybar/config-laptop.jsonc +fi diff --git a/hypr/.config/waybar/config-laptop.jsonc b/hypr/.config/waybar/config-laptop.jsonc new file mode 100644 index 0000000..546dd42 --- /dev/null +++ b/hypr/.config/waybar/config-laptop.jsonc @@ -0,0 +1,208 @@ +{ + "layer": "top", + "position": "top", + "mode": "dock", + "exclusive": true, + "passthrough": false, + "gtk-layer-shell": true, + "height": 40, + "modules-left": [ + "custom/launcher", + "custom/hostname", + "hyprland/workspaces" + ], + "modules-right": [ + "custom/updates", + "memory", + "cpu", + "network", + "backlight", + "battery", + "idle_inhibitor", + "wireplumber", + "hyprland/language", + "custom/notification", + "tray", + "clock" + ], + + "backlight": { + "device": "intel_backlight", + "format": "{icon} {percent}%", + "format-icons": ["󰃞", "󰃟", "󰃠"], + "on-scroll-up": "brightnessctl set 1%+", + "on-scroll-down": "brightnessctl set 1%-", + "min-length": 6 + }, + + "battery": { + "states": { + "good": 95, + "warning": 30, + "critical": 20 + }, + "format": "{icon} {capacity}%", + "format-charging": " {capacity}%", + "format-plugged": " {capacity}%", + "format-alt": "{time} {icon}", + "format-icons": ["󰂃", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"] + }, + "hyprland/language" :{ + // + "format": "{} ", + "format-en": "", + "format-fr": "󱌃" + }, + "custom/hostname" :{ + "format": "{}", + "return-type":"text", + "exec": "hostnamectl hostname" + }, + + "custom/updates": { + "format": "{} ", + "interval": 3600, + "exec": "checkupdates | wc -l", + "exec-if": "exit 0", + "on-click": "kitty --class update paru; pkill -SIGRTMIN+8 waybar", + "signal": 8 +// "format": "{} {icon}", +// "return-type": "json", +// "format-icons": { +// "has-updates": "󱍷", +// "updated": "󰂪", +// "updated": "󰂪", +// "interval": 3600, +// }, +// "exec-if": "which waybar-module-pacman-updates", +// "exec": "waybar-module-pacman-updates", +// "on-click": "kitty --class update paru" + }, + + "hyprland/workspaces": { + "disable-scroll": true, + "all-outputs": true, + "on-click": "activate", + }, + + "tray": { + "icon-size": 21, + "spacing": 10 + }, + + "clock": { + "format": " {:%H:%M}", + "format-alt": " {:%Y-%m-%d  %H:%M}", + "interval": 1, + "rotate": 0, + "tooltip-format": "{calendar}", + "calendar": { + "mode": "month", + "mode-mon-col": 3, + "on-scroll": 1, + "on-click-right": "mode", + "format": { + "months": "{}", + "weekdays": "{}", + "today": "{}", + "days": "{}" + } + } + }, + + "wireplumber": { + "format": "{icon} {volume} %", + "format-muted": " Mute", + "on-click": "$HOME/.config/hypr/scripts/Volume.sh --toggle", + "on-click-right": "pavucontrol -t 3", + "on-scroll-up": "$HOME/.config/hypr/scripts/Volume.sh --inc", + "on-scroll-down": "$HOME/.config/hypr/scripts/Volume.sh --dec", + "format-icons": [ + "", "", "󰕾", "" + ], + }, + + "memory": { + "states": { + "c": 90, // critical + "h": 60, // high + "m": 30 // medium + }, + "interval": 10, + "format": "󰾆 {used}GB", + "format-m": "󰾅 {used}GB", + "format-h": "󰓅 {used}GB", + "format-c": " {used}GB", + "format-alt": "󰾆 {percentage}%", + "max-length": 10, + "tooltip": true, + "tooltip-format": "󰾆 {percentage}%\n {used:0.1f}GB/{total:0.1f}GB" + }, + + "cpu": { + "interval": 1, + "format": "󰍛 {usage}%", + "format-alt": "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}", + "format-icons": [ + "▁", // green + "▂", // blue + "▃", // white + "▄", // white + "▅", // yellow + "▆", // yellow + "▇", // orange + "█" // red + ] + }, + + "idle_inhibitor" : { + "format": "{icon}", + "tooltip": true, + "format-icons":{ + "activated":"󰈈 ", + "deactivated":"󰈉 " + }, + "on-click-right":"hyprlock" + }, + + "network": { + "tooltip": true, + "format-wifi": " {essid}", + "format-ethernet": "󰈀 ", + "tooltip-format": "Network: {essid}\nSignal strength: {signaldBm}dBm ({signalStrength}%)\nFrequency: {frequency}MHz\nInterface: {ifname}\nIP: {ipaddr}/{cidr}\nGateway: {gwaddr}\nNetmask: {netmask}", + "format-linked": "󰈀 {ifname} (No IP)", + "format-disconnected": "󰖪 ", + "tooltip-format-disconnected": "Disconnected", + "format-alt": " {bandwidthDownBytes}  {bandwidthUpBytes}", + "interval": 2 + }, + + "custom/launcher": { + "format": " ", + "on-click": "exec nwg-drawer -c 7 -is 96 -spacing 24", + //"on-click": "~/.config/rofi/launchers/type-3/launcher.sh", + "tooltip": false + }, + + "custom/notification": { + "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": "swaync-client -t -sw", + "on-click-right": "swaync-client -d -sw", + "escape": true + } +} diff --git a/hypr/.config/waybar/config.jsonc b/hypr/.config/waybar/config.jsonc index cc0f974..a35df59 100644 --- a/hypr/.config/waybar/config.jsonc +++ b/hypr/.config/waybar/config.jsonc @@ -23,7 +23,7 @@ "tray", "clock" ], - + "hyprland/language" :{ // "format": "{} ", diff --git a/hypr/.config/waybar/style.css b/hypr/.config/waybar/style.css index 558891f..971f2ad 100644 --- a/hypr/.config/waybar/style.css +++ b/hypr/.config/waybar/style.css @@ -55,15 +55,28 @@ window#waybar { #custom-launcher, #custom-hostname, #custom-notification, +#backlight, #language { background: #1e1e2e; padding: 0px 10px; margin: 3px 0px; + margin-top: 5px; + /* border: 1px solid #181825; */ } /* #custom-launcher {} #memory {} +#backlight { + border-radius: 10px 0px 0px 10px; + + +#battery { + color:#a6adc8; + border-radius: 0px 10px 10px 0px; + margin-right: 10px; +} +} */ #custom-notification {