104f181e65b2271b3a6931d6b4c5072b1883354c
- Author
- TheEdgeOfRage <git@theedgeofrage.com>
- Committer
- TheEdgeOfRage <git@theedgeofrage.com>
- Date
Message
Add second waybar and update hyprland config
Diff
This diff is truncated to protect this page.
1diff --git a/dot_config/hypr/hyprland.conf.tmpl b/dot_config/hypr/hyprland.conf.tmpl
2index 46bc22848800ae4be0c06fe82c82285c7e2ff8a6..3ec73febbdd2a8fd10e003c1516dabf301059319 100644
3--- a/dot_config/hypr/hyprland.conf.tmpl
4+++ b/dot_config/hypr/hyprland.conf.tmpl
5@@ -1,26 +1,23 @@
6 # vim: set ft=hyprlang:
7+
8+# See https://wiki.hyprland.org/Configuring/Keywords/
9+
10 # See https://wiki.hyprland.org/Configuring/Monitors/
11 {{ range $id, $settings := .hyprland.monitors }}monitor = {{ $id }}, {{ $settings }}
12 {{ end }}
13-
14-# See https://wiki.hyprland.org/Configuring/Keywords/
15-# Set programs that you use
16+# Refer to https://wiki.hyprland.org/Configuring/Variables/
17 $terminal = ghostty
18-$fileManager = dolphin
19-$menu = rofi -show drun
20+$menu = rofi -show drun -run-command "uwsm app -- {cmd}"
21 $animation_speed = 1.5
22
23-# Autostart necessary processes (like notifications daemons, status bars, etc.)
24-# Or execute your favorite apps at launch like this:
25-
26-# exec-once = $terminal
27-# exec-once = nm-applet &
28-# exec-once = waybar & hyprpaper & firefox
29-exec-once = waybar -c ~/.config/waybar/config.jsonc
30+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
31+exec-once = waybar -c ~/.config/waybar/config-top.jsonc
32+exec-once = waybar -c ~/.config/waybar/config-bottom.jsonc
33 exec-once = hyprpm reload -n
34
35-# LOOK AND FEEL
36-# Refer to https://wiki.hyprland.org/Configuring/Variables/
37+exec-once = uwsm app -- firefox.desktop
38+exec-once = uwsm app -- org.telegram.desktop.desktop
39+exec-once = uwsm app -- deezer-enhanced.desktop
40
41 # https://wiki.hyprland.org/Configuring/Variables/#general
42 general {
43@@ -72,8 +69,7 @@ plugin {
44 text_center = false
45 text_font = IosevkaTerm NFP
46 text_height = 14
47- # left padding
48- text_padding = 8
49+ text_padding = 6 # left padding
50
51 # active tab bar segment colors
52 col.active = rgba(504945ff)
53@@ -206,6 +202,8 @@ bind = $mod, h, hy3:movefocus, l
54 bind = $mod, i, hy3:movefocus, r
55 bind = $mod, e, hy3:movefocus, u
56 bind = $mod, n, hy3:movefocus, d
57+# binds hy3:focustab to lmb and still allows windows to receive clicks
58+bindn = , mouse:272, hy3:focustab, mouse
59
60 # Move bindings
61 bind = $mod SHIFT, h, hy3:movewindow, l
62diff --git a/dot_config/waybar/config-bottom.jsonc b/dot_config/waybar/config-bottom.jsonc
63new file mode 100644
64index 0000000000000000000000000000000000000000..77b7709181cb670715ff9f7c1f8bbb0e5ed728e7
65--- /dev/null
66+++ b/dot_config/waybar/config-bottom.jsonc
67@@ -0,0 +1,98 @@
68+{
69+ "layer": "top",
70+ "position": "bottom",
71+ "reload_style_on_change": true,
72+ "modules-right": [
73+ "custom/arrow_left_end",
74+ "network#tailscale",
75+ "custom/arrow_left",
76+ "network#wireguard",
77+ "custom/arrow_left_alt",
78+ "network",
79+ "custom/arrow_left",
80+ "temperature",
81+ "custom/arrow_left_alt",
82+ "cpu",
83+ "custom/arrow_left",
84+ "memory",
85+ "custom/arrow_left_alt",
86+ "tray"
87+ ],
88+ "cpu": {
89+ "interval": 5,
90+ "tooltip": false,
91+ "format": "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}",
92+ "format-alt": " {usage}% ({load})",
93+ "format-icons": [
94+ "<span color='#98971a'>▁</span>", // green
95+ "<span color='#689d6a'>▂</span>", // blue
96+ "<span color='#ebdbb2'>▃</span>", // white
97+ "<span color='#ebdbb2'>▄</span>", // white
98+ "<span color='#d79921'>▅</span>", // yellow
99+ "<span color='#d79921'>▆</span>", // yellow
100+ "<span color='#d65d0e'>▇</span>", // orange
101+ "<span color='#cc241d'>█</span>" // red
102+ ]
103+ },
104+ "memory": {
105+ "interval": 5,
106+ "format": " {used:0.1f}G/{total:0.1f}G",
107+ "states": {
108+ "warning": 70,
109+ "critical": 90
110+ },
111+ "tooltip": false
112+ },
113+ "temperature": {
114+ "critical-threshold": 90,
115+ "interval": 5,
116+ "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input",
117+ "format": "{icon} {temperatureC}°",
118+ "format-icons": [
119+ "",
120+ "",
121+ "",
122+ "",
123+ ""
124+ ],
125+ "tooltip": false
126+ },
127+ "tray": {
128+ "icon-size": 18
129+ //"spacing": 10
130+ },
131+ "network": {
132+ "interval": 1,
133+ "format-wifi": " {essid} ({signalStrength}%) {bandwidthDownBytes} {bandwidthUpBytes}",
134+ "format-ethernet": " {bandwidthDownBytes} {bandwidthUpBytes}",
135+ "format-disconnected": "",
136+ "format-alt": " {ipaddr}/{cidr}",
137+ "tooltip": false
138+ },
139+ "network#wireguard": {
140+ "interval": 5,
141+ "interface": "wg0",
142+ "format": " {ipaddr}/{cidr}",
143+ "format-disconnected": " wireguard",
144+ "tooltip": false
145+ },
146+ "network#tailscale": {
147+ "interval": 5,
148+ "interface": "tailscale0",
149+ "format": " {ipaddr}/{cidr}",
150+ "format-disconnected": " tailscale",
151+ "tooltip": false
152+ },
153+ "custom/arrow_left": {
154+ "format": "",
155+ "tooltip": false
156+ },
157+ "custom/arrow_left_alt": {
158+ "format": "",
159+ "tooltip": false
160+ },
161+ "custom/arrow_left_end": {
162+ "format": "",
163+ "tooltip": false
164+ }
165+}
166diff --git a/dot_config/waybar/config.jsonc b/dot_config/waybar/config-top.jsonc
167rename from dot_config/waybar/config.jsonc
168rename to dot_config/waybar/config-top.jsonc
169index e1eb3cda5a10fbc95d870eaa29f36aef9a542bf2..7ccd73813aed70d7ecf366e8a67d0040b2a6b020 100644
170--- a/dot_config/waybar/config.jsonc
171+++ b/dot_config/waybar/config-top.jsonc
172@@ -11,14 +11,6 @@
173 "custom/arrow_left",
174 "pulseaudio",
175 "custom/arrow_left_alt",
176- "network",
177- "custom/arrow_left",
178- "memory",
179- "custom/arrow_left_alt",
180- "cpu",
181- "custom/arrow_left",
182- "temperature",
183- "custom/arrow_left_alt",
184 "battery",
185 "custom/arrow_left",
186 "hyprland/language",
187@@ -27,109 +19,6 @@
188 "custom/arrow_left",
189 "clock#time"
190 ],
191- "mpris": {
192- "format": "{player_icon} {dynamic}",
193- "format-paused": "{status_icon} {dynamic}",
194- "player-icons": {
195- "default": ""
196- },
197- "status-icons": {
198- "paused": ""
199- },
200- "player": "Deezer"
201- },
202- "battery": {
203- "interval": 10,
204- "states": {
205- "warning": 30,
206- "critical": 10
207- },
208- "format-time": "{H}:{M:02}",
209- "format": "{icon} {capacity}% ({time})",
210- "format-charging": " {capacity}% ({time})",
211- "format-charging-full": " {capacity}%",
212- "format-full": "{icon} {capacity}%",
213- "format-alt": "{icon} {power}W",
214- "format-icons": [
215- "",
216- "",
217- "",
218- "",
219- ""
220- ],
221- "tooltip": false
222- },
223- "clock#time": {
224- "interval": 1,
225- "format": "{:%H:%M:%S}",
226- "tooltip": false
227- },
228- "clock#date": {
229- "interval": 20,
230- "format": "{:%a %Y-%m-%e}",
231- "tooltip": true,
232- "tooltip-format": "<tt><small>{calendar}</small></tt>",
233- "calendar": {
234- "mode": "month",
235- "mode-mon-col": 3,
236- "weeks-pos": "",
237- "on-scroll": 1,
238- "format": {
239- "months": "<span color='#ebdbb2'><b>{}</b></span>",
240- "days": "<span color='#ebdbb2'><b>{}</b></span>",
241- "weekdays": "<span color='#d79921'><b>{}</b></span>",
242- "today": "<span color='#cc241d'><b><u>{}</u></b></span>"
243- }
244- },
245- "actions": {
246- "on-click-right": "mode",
247- "on-click-middle": "shift_reset",
248- "on-scroll-up": "shift_up",
249- "on-scroll-down": "shift_down"
250- }
251- },
252- "cpu": {
253- "interval": 5,
254- "tooltip": false,
255- "format": " {usage}%",
256- "format-alt": " {load}",
257- "states": {
258- "warning": 70,
259- "critical": 90
260- }
261- },
262- "hyprland/language": {
263- "format": " {}",
264- "keyboard-name": "at-translated-set-2-keyboard",
265- "tooltip": false,
266- "on-click": "hyprctl switchxkblayout at-translated-set-2-keyboard next",
267- "format-en": "EN",
268- "format-sr(latinunicode)": "SR",
269- "format-sr": "SR",
270- "format-de": "DE"
271- },
272diff --git a/dot_config/waybar/style.css b/dot_config/waybar/style.css
273index a91cd0f62c9084a61277f5a4e28e21ed4d4d217d..831741c6410a12b31fe5ea608657ed99cf2664a1 100644
274--- a/dot_config/waybar/style.css
275+++ b/dot_config/waybar/style.css
276@@ -71,6 +71,26 @@
277 #mpris {
278 padding-left: 8pt;
279 padding-right: 8pt;
280+ color: @fg;
281+}
282+
283+#network,
284+#cpu,
285+#battery,
286+#privacy,
287+#clock.date,
288+#tray,
289+#mpris {
290+ background: @bg;
291+}
292+
293+#memory,
294+#temperature,
295+#language,
296+#clock.time,
297+#network.wireguard,
298+#pulseaudio {
299+ background: @bg_alt;
300 }
301
302 #memory.critical,
303@@ -84,7 +104,6 @@
304 animation-duration: 1s;
305 }
306
307-#network.disconnected,
308 #memory.warning,
309 #cpu.warning,
310 #temperature.warning,
311@@ -92,6 +111,10 @@
312 color: @yellow_bright;
313 }
314
315+#network.disconnected {
316+ color: @gray0;
317+}
318+
319 #workspaces button {
320 padding-left: 5pt;
321 padding-right: 4pt;
322@@ -135,48 +158,22 @@
323 border: 1pt solid @yellow_bright;
324 }
325
326-#network,
327-#cpu,
328-#battery,
329-#privacy,
330-#clock.date,
331-#mpris {
332- background: @bg;
333- color: @fg;
334-}
335-
336-#memory,
337-#temperature,
338-#language,
339-#clock.time,
340-#pulseaudio {
341- background: @bg_alt;
342- color: @fg;
343-}
344-
345-#tray {
346- background: @bg;
347-}
348-
349 #custom-arrow_left {
350 color: @bg_alt;
351 background: @bg;
352 }
353+
354 #custom-arrow_left_alt {
355 color: @bg;
356 background: @bg_alt;
357 }
358+
359 #custom-arrow_left_end {
360 color: @bg;
361 background: transparent;
362 }
363
364-#custom-arrow_right {
365+#custom-arrow_left_end_alt {
366 color: @bg_alt;
367- background: @bg;
368-}
369-
370-#custom-arrow_right_end {
371- color: @bg;
372 background: transparent;
373 }