Compare commits
No commits in common. "0b9e9f0ca7d344e00fd30a9238c2bb9a7e1d6859" and "921453d8f83815257456126a62720664d7ff6b35" have entirely different histories.
0b9e9f0ca7
...
921453d8f8
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +0,0 @@
|
||||
nohup.out
|
||||
80
config.jsonc
80
config.jsonc
@ -1,18 +1,10 @@
|
||||
|
||||
{
|
||||
"layer": "top",
|
||||
"position": "top",
|
||||
"modules-left": [
|
||||
"hyprland/workspaces",
|
||||
"tray"
|
||||
],
|
||||
"modules-center": [
|
||||
"clock"
|
||||
],
|
||||
"modules-right": [
|
||||
"custom/temps",
|
||||
"pulseaudio",
|
||||
"pulseaudio#microphone"
|
||||
],
|
||||
"modules-left": ["hyprland/workspaces", "custom/weather","custom/wallpaper","hyprland/window"],
|
||||
"modules-center": ["clock"],
|
||||
"modules-right": ["network", "bluetooth", "temperature","custom/power_profile","custom/battery","backlight","pulseaudio","pulseaudio#microphone","tray","idle_inhibitor","cpu","memory","battery#bat2"],
|
||||
// "modules-left": [],
|
||||
"sway/mode": {
|
||||
"format": "<span style=\"italic\">{}</span>"
|
||||
@ -79,24 +71,18 @@
|
||||
"tooltip-format-disconnected": "MPD (disconnected)"
|
||||
},
|
||||
"hyprland/workspaces": {
|
||||
"format": "{icon}",
|
||||
"format-icons": {
|
||||
"1": "1",
|
||||
"2": "2",
|
||||
"3": "3",
|
||||
"4": "4",
|
||||
"5": "5",
|
||||
"default": "●"
|
||||
},
|
||||
"format": "{icon}",
|
||||
"format-icons": {
|
||||
"1": "1",
|
||||
"2": "2",
|
||||
"3": "3",
|
||||
"4": "4",
|
||||
"5": "5",
|
||||
"default": "●"
|
||||
},
|
||||
"persistent-workspaces": {
|
||||
"Virtual-1": [
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
4,
|
||||
5
|
||||
]
|
||||
},
|
||||
"Virtual-1": [1, 2, 3, 4, 5]
|
||||
},
|
||||
"on-click": "activate"
|
||||
},
|
||||
"idle_inhibitor": {
|
||||
@ -123,20 +109,16 @@
|
||||
"memory": {
|
||||
"format": "{}% "
|
||||
},
|
||||
"custom/temps": {
|
||||
"exec": "~/.config/waybar/scripts/temps.sh",
|
||||
"interval": 2,
|
||||
"return-type": "json",
|
||||
"format": "{}",
|
||||
"temperature": {
|
||||
"thermal-zone": 1,
|
||||
"critical-threshold": 80,
|
||||
"format": "{temperatureF}°F ",
|
||||
"format-critical": "{temperatureF}°F ",
|
||||
"tooltip": true
|
||||
},
|
||||
"backlight": {
|
||||
"format": "{icon} {percent}%",
|
||||
"format-icons": [
|
||||
"",
|
||||
"",
|
||||
""
|
||||
],
|
||||
"format-icons": ["", "", ""],
|
||||
"on-scroll-up": "brightnessctl set 5%+",
|
||||
"on-scroll-down": "brightnessctl set 5%-",
|
||||
"min-length": 6
|
||||
@ -154,19 +136,7 @@
|
||||
"format-charging": " {capacity}%",
|
||||
"format-plugged": " {capacity}%",
|
||||
"format-alt": "{time} {icon}",
|
||||
"format-icons": [
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
""
|
||||
],
|
||||
"format-icons": ["", "", "", "", "", "", "", "", "", "", ""],
|
||||
"tooltip": true,
|
||||
"tooltip-format": "{status} • {capacity}%\n{timeTo}\nHealth: {health}",
|
||||
"max-length": 15
|
||||
@ -206,11 +176,7 @@
|
||||
"phone": "",
|
||||
"portable": "",
|
||||
"car": "",
|
||||
"default": [
|
||||
"",
|
||||
"",
|
||||
""
|
||||
]
|
||||
"default": ["", "", ""]
|
||||
}
|
||||
},
|
||||
"pulseaudio#microphone": {
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Get CPU temp from k10temp (Tctl)
|
||||
cpu_temp=$(sensors k10temp-pci-00c3 2>/dev/null | grep 'Tctl:' | awk '{print $2}' | sed 's/+//;s/°C//')
|
||||
|
||||
# Get GPU temp from amdgpu
|
||||
gpu_temp=$(sensors amdgpu-pci-1600 2>/dev/null | grep 'edge:' | awk '{print $2}' | sed 's/+//;s/°C//')
|
||||
|
||||
# Get Coolant temp from Kraken
|
||||
coolant_temp=$(sensors kraken2023-hid-3-9 2>/dev/null | grep 'Coolant' | awk '{print $3}' | sed 's/+//;s/°C//')
|
||||
|
||||
# Round temps
|
||||
cpu_temp=$(printf "%.0f" "$cpu_temp" 2>/dev/null || echo "N/A")
|
||||
gpu_temp=$(printf "%.0f" "$gpu_temp" 2>/dev/null || echo "N/A")
|
||||
coolant_temp=$(printf "%.0f" "$coolant_temp" 2>/dev/null || echo "N/A")
|
||||
|
||||
# Output
|
||||
echo "{\"text\":\" ${cpu_temp}° ${gpu_temp}° ${coolant_temp}°\", \"tooltip\":\"CPU: ${cpu_temp}°C | GPU: ${gpu_temp}°C | Coolant: ${coolant_temp}°C\"}"
|
||||
160
style.css
160
style.css
@ -1,53 +1,39 @@
|
||||
* {
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
/* Increased border-radius by 2x */
|
||||
border-radius: 4px;
|
||||
/* `ttf-font-awesome` is required to be installed for icons */
|
||||
font-family: "JetBrainsMono Nerd Font";
|
||||
|
||||
/* adjust font-size value to your liking: */
|
||||
font-size: 18px;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
min-height: 0;
|
||||
min-width: 28px;
|
||||
/* Ensures consistent minimum width */
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
background-color: rgba(0, 0, 0, 0);
|
||||
background-color: rgba(0, 0, 0, 0.9);
|
||||
color: #ffffff;
|
||||
margin-top: 8px;
|
||||
/* Add top margin to prevent touching screen top */
|
||||
margin-bottom: 8px;
|
||||
/* Optional: Also add bottom margin for consistency */
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
padding: 4px 8px;
|
||||
/* Reduced vertical padding further */
|
||||
margin: 1px 2px;
|
||||
/* Reduced vertical margins further */
|
||||
padding: 2px 8px;
|
||||
margin: 0 2px;
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
color: rgba(255, 255, 255, 0.6);
|
||||
border-radius: 10px;
|
||||
/* Increased border-radius by 2x */
|
||||
border-radius: 6px;
|
||||
transition: all 0.3s ease;
|
||||
border: 1px solid transparent;
|
||||
min-height: 4px;
|
||||
/* Reduced height even more */
|
||||
font-size: 8px;
|
||||
/* Reduced even more */
|
||||
}
|
||||
|
||||
#workspaces button:hover {
|
||||
background-color: rgba(255, 255, 255, 0.2);
|
||||
color: rgba(0, 0, 0, 0.4);
|
||||
color: #000000;
|
||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
#workspaces button.active {
|
||||
background-color: rgba(255, 255, 255, 0.3);
|
||||
color: rgba(0, 0, 0, 0.4);
|
||||
color: #000000;
|
||||
border: 1px solid rgba(255, 255, 255, 0.5);
|
||||
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.4);
|
||||
}
|
||||
@ -60,13 +46,6 @@ window#waybar {
|
||||
|
||||
#mode {
|
||||
background-color: #64727d;
|
||||
padding: 6px 10px;
|
||||
/* Added consistent vertical padding */
|
||||
margin: 6px 3px;
|
||||
min-height: 28px;
|
||||
/* Ensures consistent minimum height */
|
||||
border-radius: 8px;
|
||||
/* Increased border-radius by 2x */
|
||||
}
|
||||
|
||||
#clock,
|
||||
@ -82,43 +61,25 @@ window#waybar {
|
||||
#mode,
|
||||
#idle_inhibitor,
|
||||
#mpd {
|
||||
padding: 6px 10px;
|
||||
/* Added consistent vertical padding for height consistency */
|
||||
padding: 0 10px;
|
||||
margin: 6px 3px;
|
||||
color: rgba(0, 0, 0, 0.4);
|
||||
min-height: 28px;
|
||||
/* Ensures consistent minimum height */
|
||||
border-radius: 8px;
|
||||
/* Increased border-radius by 2x */
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
#window {
|
||||
margin: 6px 4px;
|
||||
/* Added vertical margins to match other modules */
|
||||
padding: 6px 10px;
|
||||
/* Added consistent vertical padding */
|
||||
min-height: 28px;
|
||||
/* Ensures consistent minimum height */
|
||||
border-radius: 8px;
|
||||
/* Increased border-radius by 2x */
|
||||
margin: 0 4px;
|
||||
}
|
||||
|
||||
#workspaces {
|
||||
margin: 1px 3px;
|
||||
/* Reduced vertical margins */
|
||||
padding: 6px 8px 6px 8px;
|
||||
/* Reduced vertical padding to 0, kept horizontal padding */
|
||||
margin: 0 6px;
|
||||
padding: 2px 6px;
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
border-radius: 8px;
|
||||
/* Increased border-radius by 2x */
|
||||
min-height: 3px;
|
||||
/* Reduced height even more */
|
||||
}
|
||||
|
||||
/* If workspaces is the leftmost module, use smaller left margin */
|
||||
/* If workspaces is the leftmost module, omit left margin */
|
||||
.modules-left>widget:first-child>#workspaces {
|
||||
margin-left: 4px;
|
||||
/* Keep some margin from left screen edge */
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
/* If workspaces is the rightmost module, omit right margin */
|
||||
@ -127,18 +88,18 @@ window#waybar {
|
||||
}
|
||||
|
||||
#clock {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: white;
|
||||
}
|
||||
|
||||
#battery {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: white;
|
||||
}
|
||||
|
||||
#battery.charging {
|
||||
color: #ffffff;
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
}
|
||||
|
||||
#battery.critical:not(.charging) {
|
||||
@ -148,26 +109,26 @@ window#waybar {
|
||||
}
|
||||
|
||||
label:focus {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
}
|
||||
|
||||
#cpu {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#memory {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: white;
|
||||
}
|
||||
|
||||
#backlight {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: white;
|
||||
}
|
||||
|
||||
#network {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: white;
|
||||
}
|
||||
|
||||
@ -176,39 +137,33 @@ label:focus {
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#pulseaudio.muted {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#custom-media {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: #ffffff;
|
||||
padding: 6px 10px;
|
||||
/* Added consistent vertical padding */
|
||||
min-height: 28px;
|
||||
/* Ensures consistent minimum height */
|
||||
border-radius: 8px;
|
||||
/* Increased border-radius by 2x */
|
||||
min-width: 100px;
|
||||
}
|
||||
|
||||
#custom-media.custom-spotify {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#custom-media.custom-vlc {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#temperature {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
@ -217,25 +172,13 @@ label:focus {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#custom-temps {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
color: #ffffff;
|
||||
padding: 6px 10px;
|
||||
/* Added consistent vertical padding */
|
||||
margin: 6px 3px;
|
||||
min-height: 28px;
|
||||
/* Ensures consistent minimum height */
|
||||
border-radius: 8px;
|
||||
/* Increased border-radius by 2x */
|
||||
}
|
||||
|
||||
#tray {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#idle_inhibitor {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
@ -245,7 +188,7 @@ label:focus {
|
||||
}
|
||||
|
||||
#mpd {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
@ -255,27 +198,21 @@ label:focus {
|
||||
}
|
||||
|
||||
#mpd.stopped {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#mpd.paused {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#language {
|
||||
background: rgba(0, 0, 0, 0.4);
|
||||
background: #000000;
|
||||
color: #ffffff;
|
||||
padding: 6px 10px;
|
||||
/* Standardized vertical padding */
|
||||
padding: 0 5px;
|
||||
margin: 6px 3px;
|
||||
min-height: 28px;
|
||||
/* Ensures consistent minimum height */
|
||||
border-radius: 8px;
|
||||
/* Increased border-radius by 2x */
|
||||
min-width: 28px;
|
||||
/* Increased for consistency */
|
||||
min-width: 16px;
|
||||
}
|
||||
|
||||
#custom-weather,
|
||||
@ -285,54 +222,49 @@ label:focus {
|
||||
#bluetooth,
|
||||
#pulseaudio-microphone,
|
||||
#battery-bat2 {
|
||||
padding: 6px 10px;
|
||||
/* Added consistent vertical padding for height consistency */
|
||||
padding: 0 10px;
|
||||
margin: 6px 3px;
|
||||
color: #000000;
|
||||
min-height: 28px;
|
||||
/* Ensures consistent minimum height */
|
||||
border-radius: 8px;
|
||||
/* Increased border-radius by 2x */
|
||||
}
|
||||
|
||||
#custom-weather {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: white;
|
||||
}
|
||||
|
||||
#custom-wallpaper {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: white;
|
||||
}
|
||||
|
||||
#custom-power_profile {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: white;
|
||||
}
|
||||
|
||||
#bluetooth {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: white;
|
||||
}
|
||||
|
||||
#pulseaudio-microphone {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#pulseaudio-microphone.muted {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#battery-bat2 {
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
color: white;
|
||||
}
|
||||
|
||||
#battery-bat2.charging {
|
||||
color: #ffffff;
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
background-color: #000000;
|
||||
}
|
||||
|
||||
#battery-bat2.critical:not(.charging) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user