feat(waybar): two configs for desktop and laptop

This commit is contained in:
2026-08-07 00:03:57 +02:00
parent c186f01cb5
commit cc215acf4d
7 changed files with 341 additions and 221 deletions

View File

@@ -4,7 +4,7 @@
"include": [
"~/.config/waybar/modules.jsonc"
],
"height": 40,
"height": 40,
"margin-left": 3,
"margin-right": 3,
"margin-top": 3,

19
waybar/config_laptop.json Normal file
View File

@@ -0,0 +1,19 @@
{
"layer": "top",
"position": "top",
"include": [
"~/.config/waybar/modules.jsonc"
],
"height": 20,
"margin-left": 3,
"margin-right": 3,
"margin-top": 3,
"margin-bottom": 3,
"modules-left": ["custom/junkyard", "hyprland/workspaces"],
"modules-center": ["clock"],
"modules-right": ["tray", "custom/notification", "pulseaudio", "bluetooth", "backlight", "network", "battery", "group/group-power" ],
"tray": {
"icon-size": 16,
"spacing": 10
},
}

View File

@@ -20,39 +20,39 @@
// "timezone": "America/New_York",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format": "{:%a, %d %b, %R}",
"on-click": ""
"on-click": ""
},
"pulseaudio": {
// "scroll-step": 1, // %, can be a float
//"reverse-scrolling": 1,
"format": "{icon} {volume}% {format_source}",
"format-bluetooth": "{icon}  {volume}% {format_source}",
"format-bluetooth-muted": "{icon} {format_source}",
"format-muted": " {format_source}",
"format-bluetooth": "{icon} {volume}% {format_source}",
"format-bluetooth-muted": "{icon} {format_source}",
"format-muted": "󰝟 {volume}% {format_source}",
"format-source": " {volume}%",
"format-source-muted": "",
"format-icons": {
"headphone": "󰋋",
"hands-free": "",
"hands-free": "󱡒",
"headset": "󰋎",
"phone": "",
"portable": "",
"portable": "󰓃",
"car": "",
"default": ["󰸈", "󰕿", "󰖀", "󰕾"]
},
"on-click": "~/.config/rofi/applets/bin/volume.sh",
"on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
"on-click-right": "uwsm app pavucontrol"
},
"bluetooth": {
"format": "",
"format-disabled": "",
"format-connected": " {num_connections}",
"tooltip-format-enumerate-connected": "{device_alias}",
"tooltip-format-connected": "{device_enumerate}",
"on-click": "uwsm app blueman-manager"
},
"bluetooth": {
"format": "",
"format-disabled": "",
"format-connected": " {num_connections}",
"tooltip-format-enumerate-connected": "{device_alias}",
"tooltip-format-connected": "{device_enumerate}",
"on-click": "uwsm app blueman-manager"
},
"temperature": {
// "thermal-zone": 2,
@@ -66,6 +66,7 @@
"tray": {
"icon-size": 13,
"show-passive-items": true,
"spacing": 00
},
@@ -73,14 +74,14 @@
"tooltip": false,
"format": "{icon}",
"format-icons": {
"notification": "<span foreground='red'><sup></sup></span>",
"none": "",
"dnd-notification": "<span foreground='red'><sup></sup></span>",
"dnd-none": "",
"inhibited-notification": "<span foreground='red'><sup></sup></span>",
"inhibited-none": "",
"dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
"dnd-inhibited-none": ""
"notification": "<span foreground='red'><sup></sup></span>",
"none": "",
"dnd-notification": "<span foreground='red'><sup></sup></span>",
"dnd-none": "",
"inhibited-notification": "<span foreground='red'><sup></sup></span>",
"inhibited-none": "",
"dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
"dnd-inhibited-none": ""
},
"return-type": "json",
"exec-if": "which swaync-client",
@@ -91,94 +92,99 @@
"escape": true
},
"cpu": {
"interval": 1,
"format": " {usage:02d}%{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}",
"format-icons": [
"<span color='#a6da95'>▁</span>", // green
"<span color='#8aadf4'>▂</span>", // blue
"<span color='#8aadf4'>▃</span>", // white
"<span color='#8aadf4'>▄</span>", // white
"<span color='#8aadf4'>▅</span>", // yellow
"<span color='#eed49f'>▆</span>", // yellow
"<span color='#f5a97f'>▇</span>", // orange
"<span color='#ed8796'>█</span>" // red
]
},
"cpu": {
"interval": 1,
"format": " {usage:02d}%{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}",
"format-icons": [
"<span color='#a6da95'>▁</span>", // green
"<span color='#8aadf4'>▂</span>", // blue
"<span color='#8aadf4'>▃</span>", // white
"<span color='#8aadf4'>▄</span>", // white
"<span color='#8aadf4'>▅</span>", // yellow
"<span color='#eed49f'>▆</span>", // yellow
"<span color='#f5a97f'>▇</span>", // orange
"<span color='#ed8796'>█</span>" // red
]
},
"memory": {
"interval": 5,
"format": "󰍛 {percentage}%"
},
"memory": {
"interval": 5,
"format": "󰍛 {percentage}%"
},
"group/group-power": {
"orientation": "inherit",
"drawer": {
"transition-duration": 500,
"children-class": "not-power",
"transition-left-to-right": true
},
"modules": [
"custom/power", // First element is the "group leader" and won't ever be hidden
"custom/reboot",
"custom/quit",
"custom/suspend",
"custom/lock"
]
},
"custom/quit": {
"format": " 󰗼 ",
"group/group-power": {
"orientation": "inherit",
"drawer": {
"transition-duration": 500,
"children-class": "not-power",
"transition-left-to-right": true
},
"modules": [
"custom/power", // First element is the "group leader" and won't ever be hidden
"custom/reboot",
"custom/quit",
"custom/suspend",
"custom/lock"
]
},
"custom/quit": {
"format": " 󰗼 ",
"tooltip": false,
"on-click": "uwsm stop"
},
"custom/lock": {
"format": " 󰍁 ",
"tooltip": false,
"on-click": "loginctl lock-session"
},
"custom/suspend": {
"format": " 󰒲 ",
"tooltip": false,
"on-click": "uwsm stop"
},
"custom/lock": {
"format": " 󰍁 ",
"tooltip": false,
"on-click": "loginctl lock-session"
},
"custom/suspend": {
"format": " 󰒲 ",
"tooltip": false,
"on-click": "systemctl suspend"
},
"custom/reboot": {
"format": " 󰜉 ",
"tooltip": false,
"on-click": "systemctl reboot"
},
"custom/power": {
"format": "  ",
"tooltip": false,
"on-click": "systemctl poweroff"
},
"on-click": "systemctl suspend"
},
"custom/reboot": {
"format": " 󰜉 ",
"tooltip": false,
"on-click": "systemctl reboot"
},
"custom/power": {
"format": " ",
"tooltip": false,
"on-click": "systemctl poweroff"
},
"battery": {
"states": {
"warning": 20,
"critical": 5
},
"format": "{capacity}% {icon}",
"format-charging": "{capacity}% 󰂄",
"format-plugged": "{capacity}% 󰚥",
"format-alt": "{time} {icon}",
"format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂁", "󰁹"],
"on-click": "~/.config/rofi/applets/bin/powermenu.sh"
},
"battery#bat0": {
"bat": "BAT0"
},
"battery": {
"states": {
"warning": 20,
"critical": 5
},
"format": "{icon}{capacity}%",
"format-charging": "{capacity}% 󰂄",
"format-plugged": "{capacity}% 󰚥",
// "format-alt": "{time} {icon}",
"format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂁", "󰁹"],
"on-click": "~/.config/rofi/applets/bin/ppd.sh"
},
"battery#bat0": {
"bat": "BAT0"
},
"network": {
"format-wifi": "{icon}",
"format-ethernet": "󰈀",
"format-linked": "󰤩",
"format-disconnected": "󰤮",
"tooltip-format": "{ifname}",
"tooltip-format-wifi": "{essid} {signaldBm}dBm | Downlink: {bandwidthDownBits}, Uplink: {bandwidthUpBits}",
"tooltip-format-ethernet": "{essid} | Downlink: {bandwidthDownBits}, Uplink: {bandwidthUpBits} | IP: {ipaddr} GW:{gwaddr}",
"tooltip-format-disconnected": "Disconnected",
"format-icons": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"],
"on-click": "~/.config/rofi/applets/bin/rofi-wifi-menu.sh",
"on-click-right": "nm-connection-editor"
}
"backlight": {
"format": "{icon} {percent}%",
"format-icons": ["󰃞", "󰃟", "󰃠"]
},
"network": {
"format-wifi": "{icon}",
"format-ethernet": "󰈀",
"format-linked": "󰤩",
"format-disconnected": "󰤮",
"tooltip-format": "{ifname}",
"tooltip-format-wifi": "{essid} {signaldBm}dBm | Downlink: {bandwidthDownBits}, Uplink: {bandwidthUpBits}",
"tooltip-format-ethernet": "{essid} | Downlink: {bandwidthDownBits}, Uplink: {bandwidthUpBits} | IP: {ipaddr} GW:{gwaddr}",
"tooltip-format-disconnected": "Disconnected",
"format-icons": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"],
"on-click": "~/.config/rofi/applets/bin/rofi-wifi-menu.sh",
"on-click-right": "nm-connection-editor"
}
}

View File

@@ -1,158 +1,154 @@
@import 'macchiato.css';
* {
font-family: "Roboto";
font-size: 16px;
min-width: 15px;
font-family: "Roboto";
font-size: 16px;
min-width: 15px;
}
window#waybar {
background-color: transparent;
background-color: transparent;
}
window#waybar.hidden {
opacity: 0.5;
opacity: 0.5;
}
button {
box-shadow: inset 0 -3px transparent;
border: none;
border-radius: 10px;
color: @text;
box-shadow: inset 0 -3px transparent;
border: none;
border-radius: 10px;
color: @text;
}
#workspaces {
background-color: @base; /* Change this to any gray color you want */
border-radius: 0px 10px 10px 0px; /* Adjust as needed */
padding: 3px 10px;
color: @text;
}
#workspaces button.active {
background-color: @blue;
border: 1px solid @blue;
border-radius: 10px;
color: @base;
background-color: @blue;
/* border: 1px solid @blue; */
border-radius: 10px;
color: @base;
}
#workspaces button:hover {
background: @crust;
color: @text;
border-radius: 10px;
}
#workspaces button.urgent {
background-color: @red;
border: 1px solid @red;
border-radius: 10px;
color: @base;
background-color: @red;
border: 1px solid @red;
border-radius: 10px;
color: @base;
}
#clock,
#battery{
background-color: @base; /* Change this to any gray color you want */
border-radius: 10px; /* Adjust as needed */
padding: 3px 10px;
color: @text;
#clock {
background-color: @base; /* Change this to any gray color you want */
border-radius: 10px; /* Adjust as needed */
padding: 3px 10px;
color: @text;
}
#mpd {
padding: 0 10px;
color: @subtext1;
padding: 0 10px;
color: @subtext1;
}
#tray {
background-color: @base; /* Change this to any gray color you want */
border-radius: 10px 0px 0px 10px; /* Adjust as needed */
padding: 3px 10px;
color: @text;
background-color: @base; /* Change this to any gray color you want */
border-radius: 10px 0px 0px 10px; /* Adjust as needed */
padding: 3px 10px;
color: @text;
}
#custom-notification,
#pulseaudio,
#network,
#memory,
#backlight,
#bluetooth {
background-color: @base; /* Change this to any gray color you want */
border-radius: 0px; /* Adjust as needed */
padding: 3px 7px;
color: @text;
margin: 0px;
background-color: @base; /* Change this to any gray color you want */
border-radius: 0px; /* Adjust as needed */
padding: 3px 3px;
color: @text;
margin: 0px;
}
#cpu {
background-color: @base; /* Change this to any gray color you want */
border-radius: 0px 10px 10px 0px; /* Adjust as needed */
padding: 3px 10px;
color: @text;
min-width: 80px;
#pulseaudio {
min-width: 110px
}
#backlight {
background-color: @base; /* Change this to any gray color you want */
border-radius: 0px 10px 10px 0px; /* Adjust as needed */
padding: 3px 10px;
color: @text;
}
#custom-junkyard {
background-color: @base; /* Change this to any gray color you want */
border-radius: 10px 0px 0px 10px; /* Adjust as needed */
padding: 3px 10px;
color: @text;
}
#workspaces {
background-color: @base; /* Change this to any gray color you want */
border-radius: 0px 10px 10px 0px; /* Adjust as needed */
padding: 3px 10px;
color: @text;
}
#clock {
background-color: @base; /* Change this to any gray color you want */
border-radius: 10px;
padding: 3px 10px;
color: @text;
}
#group-power {
background-color: @base;
border-radius: 10px;
padding: 3px 5px;
margin-left: 3px;
color: @text;
min-width: 60px
}
#cpu,
#battery {
background-color: @base; /* Change this to any gray color you want */
color: @text;
margin-left: 7px;
background-color: @base; /* Change this to any gray color you want */
border-radius: 0px 10px 10px 0px; /* Adjust as needed */
padding: 3px 10px;
color: @text;
}
#battery.charging, #battery.plugged {
color: @base;
background-color: @teal;
border-radius: 10px;
padding: 3px 10px;
}
@keyframes blink {
to {
background-color: @subtext1;
color: @crust;
}
#battery.charging,
#battery.plugged {
color: @base;
background-color: @teal;
}
#battery.critical:not(.charging) {
background-color: @red;
color: @subtext1;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
border-radius: 10px;
padding: 3px 10px;
background-color: @red;
color: @subtext1;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
#custom-junkyard {
background-color: @base; /* Change this to any gray color you want */
border-radius: 10px 0px 0px 10px; /* Adjust as needed */
padding: 3px 10px;
color: @text;
}
#clock {
background-color: @base; /* Change this to any gray color you want */
border-radius: 10px;
padding: 3px 10px;
color: @text;
}
#group-power {
background-color: @base;
border-radius: 10px;
padding: 3px 5px;
margin-left: 3px;
color: @text;
}
@keyframes blink {
to {
background-color: @subtext1;
color: @crust;
}
}
label:focus {
background-color: @crust;
background-color: @crust;
}
#tray > .passive {
-gtk-icon-effect: dim;
-gtk-icon-effect: dim;
}
#tray > .needs-attention {
-gtk-icon-effect: highlight;
background-color: @red;
-gtk-icon-effect: highlight;
background-color: @red;
}