diff --git a/hypr/modules/theme.conf b/hypr/modules/theme.conf index 22a5c47..83bc901 100644 --- a/hypr/modules/theme.conf +++ b/hypr/modules/theme.conf @@ -13,7 +13,7 @@ general { # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors # col.active_border = rgba(cba6f7ee) rgba(f38ba8ee) 45deg - col.active_border = rgb($mauveAlpha) rgb($tealAlpha) 30deg + col.active_border = rgb($mauveAlpha) rgb($blueAlpha) 30deg col.inactive_border = rgb($surface2Alpha) # Set to true enable resizing windows by clicking and dragging on borders and gaps diff --git a/waybar/config.jsonc b/waybar/config.jsonc index d6eda52..f615569 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -6,20 +6,21 @@ "modules-left": [ "hyprland/workspaces" ], - "modules-center": [], + "modules-center": [ + "tray", + "clock" + ], "modules-right": [ // "custom/bluetooth-audio", // "custom/pixelbuds_pro", "custom/mem", "custom/cpu", "custom/gpu", - "network", - "custom/audio-output", - "wireplumber", - "tray", + // "network", "custom/gpu-screen-recorder", "custom/gamemode", - "clock" + "custom/audio-output", + "wireplumber", ], "hyprland/workspaces": { "format": "{icon}", diff --git a/waybar/scripts/cpu_info.sh b/waybar/scripts/cpu_info.sh index 942670f..e8a35b4 100755 --- a/waybar/scripts/cpu_info.sh +++ b/waybar/scripts/cpu_info.sh @@ -1,7 +1,7 @@ #!/bin/bash USAGE=$(mpstat 1 1 | awk '/Average:/ {print 100 - $12}') TEMP=$(cat /sys/class/hwmon/hwmon3/temp1_input) -TEXT="$(printf "%.1f" $(echo "$USAGE"))% TEMP: $(printf "%.1f" $(echo "scale=2; $TEMP"/1000 | bc -l))C" +TEXT="$(printf "%.1f" $(echo "$USAGE"))% $(printf "%.1f" $(echo "scale=2; $TEMP"/1000 | bc -l))C" CPU=$(lscpu | grep 'Model name' | awk -F': ' '{print $2}' | sed 's/^[ \t]*//') # TOOLTIP=$(ps -eo %cpu,comm --sort=-%cpu | head -n 6 | sed '1d' | awk '{output = output sprintf("%.1f%%\t%s\\n", $1, $2)} END {printf "%s", output}') # TOOLTIP=$(ps -eo %cpu,comm --sort=-%cpu | head -n 6 | sed '1d' | awk -v ncores=$(nproc) '{printf "%.1f%%\t%s\n", $1/ncores, $2}') diff --git a/waybar/scripts/gpu_info.sh b/waybar/scripts/gpu_info.sh index 7b23ff7..bf09791 100755 --- a/waybar/scripts/gpu_info.sh +++ b/waybar/scripts/gpu_info.sh @@ -6,7 +6,7 @@ EDGE_TEMP=$(cat /sys/class/drm/card1/device/hwmon/hwmon2/temp1_input) JUNC_TEMP=$(cat /sys/class/drm/card1/device/hwmon/hwmon2/temp2_input) MEM_TEMP=$(cat /sys/class/drm/card1/device/hwmon/hwmon2/temp3_input) GPU=$(/opt/rocm/bin/rocm-smi --showproductname | grep "Card Series" | awk -F':' '{print $3}' | xargs) -TEXT="$USAGE% $(printf "%.1f" $(echo "scale=2; $MEM_USED/1024/1024/1024" | bc -l))/$(printf "%.1f" $(echo "scale=2; $MEM_TOTAL/1024/1024/1024" | bc -l))GB TEMP: $(printf "%.1f" $(echo "scale=2; $EDGE_TEMP/1000" | bc -l))/$(printf "%.1f" $(echo "scale=2; $JUNC_TEMP/1000" | bc -l))/$(printf "%.1f" $(echo "scale=2; $MEM_TEMP/1000" | bc -l))C" +TEXT="$USAGE% $(printf "%.1f" $(echo "scale=2; $MEM_USED/1024/1024/1024" | bc -l))/$(printf "%.1f" $(echo "scale=2; $MEM_TOTAL/1024/1024/1024" | bc -l))GB $(printf "%.1f" $(echo "scale=2; $EDGE_TEMP/1000" | bc -l))/$(printf "%.1f" $(echo "scale=2; $MEM_TEMP/1000" | bc -l))C" RATIO=$(echo "$MEM_USED/ $MEM_TOTAL" | bc -l) CLASS="" diff --git a/waybar/scripts/memory.sh b/waybar/scripts/memory.sh index 6c3cb39..1d67d2f 100755 --- a/waybar/scripts/memory.sh +++ b/waybar/scripts/memory.sh @@ -15,4 +15,4 @@ else CLASS="normal" fi -printf '{"text": "MEM: %s/%sGB", "tooltip": "%s", "class": "%s"}' "$USED" "$TOTAL" "$TOOLTIP" "$CLASS" +printf '{"text": "%s/%sGB", "tooltip": "%s", "class": "%s"}' "$USED" "$TOTAL" "$TOOLTIP" "$CLASS"