Diff
1diff --git a/dot_config/waybar/config-bottom.jsonc b/dot_config/waybar/config-bottom.jsonc
2index 77b7709181cb670715ff9f7c1f8bbb0e5ed728e7..4d73f27fb565e76f3d90c7f705a99c8bde9f4104 100644
3--- a/dot_config/waybar/config-bottom.jsonc
4+++ b/dot_config/waybar/config-bottom.jsonc
5@@ -19,18 +19,18 @@
6 "tray"
7 ],
8 "cpu": {
9- "interval": 5,
10+ "interval": 1,
11 "tooltip": false,
12 "format": "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}",
13 "format-alt": " {usage}% ({load})",
14 "format-icons": [
15 "<span color='#98971a'>▁</span>", // green
16- "<span color='#689d6a'>▂</span>", // blue
17- "<span color='#ebdbb2'>▃</span>", // white
18- "<span color='#ebdbb2'>▄</span>", // white
19- "<span color='#d79921'>▅</span>", // yellow
20- "<span color='#d79921'>▆</span>", // yellow
21- "<span color='#d65d0e'>▇</span>", // orange
22+ "<span color='#98971a'>▂</span>", // green
23+ "<span color='#d79921'>▃</span>", // yellow
24+ "<span color='#d79921'>▄</span>", // yellow
25+ "<span color='#d65d0e'>▅</span>", // orange
26+ "<span color='#d65d0e'>▆</span>", // orange
27+ "<span color='#cc241d'>▇</span>", // red
28 "<span color='#cc241d'>█</span>" // red
29 ]
30 },
31@@ -45,7 +45,7 @@
32 },
33 "temperature": {
34 "critical-threshold": 90,
35- "interval": 5,
36+ "interval": 1,
37 "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input",
38 "format": "{icon} {temperatureC}°",
39 "format-icons": [
40diff --git a/dot_config/waybar/config-top.jsonc b/dot_config/waybar/config-top.jsonc
41index 7ccd73813aed70d7ecf366e8a67d0040b2a6b020..e4fca14c8d5856936c08e419fcf274d849f0e495 100644
42--- a/dot_config/waybar/config-top.jsonc
43+++ b/dot_config/waybar/config-top.jsonc
44@@ -9,9 +9,9 @@
45 "custom/arrow_left_end",
46 "mpris",
47 "custom/arrow_left",
48- "pulseaudio",
49+ "pulseaudio#mic",
50 "custom/arrow_left_alt",
51- "battery",
52+ "pulseaudio",
53 "custom/arrow_left",
54 "hyprland/language",
55 "custom/arrow_left_alt",
56@@ -55,7 +55,7 @@
57 "class<gamescope>": "",
58 "class<ghb>": "",
59 "class<com.mitchellh.ghostty>": "",
60- "class<gimp-2.10>": "",
61+ "class<Gimp>": "",
62 "class<gparted>": "",
63 "class<gsmartcontrol>": "",
64 "class<hoppscotch-app>": "",
65@@ -108,8 +108,15 @@
66 }
67 },
68 "mpris": {
69+ "interval": 1,
70 "format": "{player_icon} {dynamic}",
71 "format-paused": "{status_icon} {dynamic}",
72+ "dynamic-order": [
73+ "artist",
74+ "title",
75+ "position",
76+ "length"
77+ ],
78 "player-icons": {
79 "default": ""
80 },
81@@ -196,8 +203,18 @@
82 ]
83 },
84 "scroll-step": 2,
85- "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
86- "tooltip": false
87+ "tooltip": true,
88+ "tooltip-format": "{desc}",
89+ "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle"
90+ },
91+ "pulseaudio#mic": {
92+ "format": "{format_source}",
93+ "format-source": " {volume}%",
94+ "format-source-muted": "",
95+ "tooltip": false,
96+ "on-click": "pactl set-source-mute @DEFAULT_SOURCE@ toggle",
97+ "on-scroll-up": "pactl set-source-volume @DEFAULT_SOURCE@ +2%",
98+ "on-scroll-down": "pactl set-source-volume @DEFAULT_SOURCE@ -2%"
99 },
100 "custom/arrow_left": {
101 "format": "",
102diff --git a/dot_config/waybar/style.css b/dot_config/waybar/style.css
103index 831741c6410a12b31fe5ea608657ed99cf2664a1..b4f25d4e88cc9e89ccef7948f711be98e4aa9449 100644
104--- a/dot_config/waybar/style.css
105+++ b/dot_config/waybar/style.css
106@@ -14,8 +14,8 @@
107 @define-color gray0 #928374;
108 @define-color gray1 #a89984;
109
110-@define-color fg #fbf1c7;
111-@define-color fg1 #ebdbb2;
112+@define-color fg #ebdbb2;
113+@define-color fg1 #fbf1c7;
114 @define-color fg2 #d5c4a1;
115 @define-color fg3 #bdae93;
116 @define-color fg4 #a89984;
117@@ -80,7 +80,8 @@
118 #privacy,
119 #clock.date,
120 #tray,
121-#mpris {
122+#mpris,
123+#pulseaudio {
124 background: @bg;
125 }
126
127@@ -89,7 +90,7 @@
128 #language,
129 #clock.time,
130 #network.wireguard,
131-#pulseaudio {
132+#pulseaudio.mic {
133 background: @bg_alt;
134 }
135
136diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
137index b0c5a4d294d3a39b67cb4fd17d2b9a8ffd8384cf..7a02dbcf20337fe3c5e9be1a3f2f6a76159004b3 100644
138--- a/dot_zshrc.tmpl
139+++ b/dot_zshrc.tmpl
140@@ -103,7 +103,7 @@ eval "$(zoxide init zsh)"
141
142 if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ] && [[ $(tty) = /dev/tty1 ]]; then
143 # hyprland on tty1
144- exec uwsm start hyprland.desktop
145+ exec uwsm start -S hyprland.desktop
146 elif [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ] && [[ $(tty) = /dev/tty1 ]] && uwsm check may-start; then
147 # sway on tty2
148 source ~/.config/uwsm/env