Skip to content

Commit b5703a8

Browse files
authored
chore: release automated changes from dev to master (#606)
This is an automated PR to promote changes from `dev` to `master`. Please review and test before merging. ## For Testers See [TESTING.md](./TESTING.md) for complete testing instructions. ## Suggested Merge Schedule According to our release policy, this PR is expected to be merged on: **Friday** Testers are encouraged to test the changes before merging. Please note that this schedule may be adjusted based on the needs of the project. ## Commits to be merged: --- * chore breaking(input): Unset `# force_no_accel` (ca5f316) by kRHYME7 * fix [Bug]: Importing themes #614 (188890e) by kRHYME7 * fixup: manage `hyprsunset` through `hyprctl` to avoid color flickering (#613) (547afe0) by Ilya Bogdanov * fixup: improve launch of system monitor if it was closed without `sysmonlaunch.sh` (#616) (c319958) by Ilya Bogdanov * fixup: improve padding of `arch` glyph (#615) (cdfc615) by Ilya Bogdanov * chore Fixup rofi launch config (#611) (16c5ff0) by Ilya Bogdanov * chore refactor: use hyprlock provided `$LAYOUT` for detecting current keyboard layout (#609) (6acd79f) by Ilya Bogdanov * fix(zsh): zsh-autosuggestions won't work on first prompt when deferred (#605) (843855a) by Khing --- Please review the changes carefully before merging.
2 parents 6ebf68d + ca5f316 commit b5703a8

File tree

13 files changed

+50
-37
lines changed

13 files changed

+50
-37
lines changed

Configs/.config/hypr/hyprlock/Anurati.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ label {
122122
# Current Keyboard Layout
123123
label {
124124
monitor =
125-
text = cmd[update:1000] $KEYBOARD_LAYOUT
125+
text = $LAYOUT
126126
color = $wallbash_4xa9_rgba
127127
font_size = 20
128128
font_family = Inter Display Medium

Configs/.config/hypr/hyprlock/Arfan on Clouds.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ label {
132132
# Current Keyboard Layout
133133
label {
134134
monitor =
135-
text = cmd[update:1000] $KEYBOARD_LAYOUT
135+
text = $LAYOUT
136136
color = $wallbash_4xa9_rgba
137137
font_size = 20
138138
font_family = JetBrains Mono Nerd, SF Pro Display Bold

Configs/.config/hypr/hyprlock/IBM Plex.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ label {
102102
# Current Keyboard Layout
103103
label {
104104
monitor =
105-
text = cmd[update:1000] $KEYBOARD_LAYOUT
105+
text = $LAYOUT
106106
color = $wallbash_4xa9_rgba
107107
font_size = 20
108108
font_family = $fontFamily

Configs/.config/hypr/hyprlock/SF Pro.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ label {
151151
# Current Keyboard Layout
152152
label {
153153
monitor =
154-
text = cmd[update:1000] $KEYBOARD_LAYOUT
154+
text = $LAYOUT
155155
color = $wallbash_4xa9_rgba
156156
font_size = 20
157157
font_family = SF Pro Display Bold

Configs/.config/hypr/userprefs.conf

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,27 @@
99
# // █ █░▀█ █▀▀ █▄█ ░█░
1010

1111

12-
# input {
13-
# # See https://wiki.hyprland.org/Configuring/Variables/#input
14-
# kb_layout = us
15-
# follow_mouse = 1
16-
# sensitivity = 0
17-
# force_no_accel = 1
18-
# numlock_by_default = true
12+
# Uncomment to enable // change to a preferred value
13+
# 🔗 See https://wiki.hyprland.org/Configuring/Variables/#input
14+
input {
15+
# kb_layout = us
16+
# follow_mouse = 1
17+
# sensitivity = 0
18+
# force_no_accel = 0
19+
# accel_profile = flat
20+
# numlock_by_default = true
1921

20-
# touchpad {
21-
# # See https://wiki.hyprland.org/Configuring/Variables/#touchpad
22-
# natural_scroll = no
23-
# }
22+
# 🔗 See https://wiki.hyprland.org/Configuring/Variables/#touchpad
23+
touchpad {
24+
natural_scroll = no
25+
}
2426

25-
# }
27+
}
2628

2729

28-
# gestures {
29-
# # See https://wiki.hyprland.org/Configuring/Variables/#gestures
30+
31+
# 🔗 See https://wiki .hyprland.org/Configuring/Variables/#gestures
32+
gestures {
3033
# workspace_swipe = true
3134
# workspace_swipe_fingers = 3
32-
# }
33-
35+
}

Configs/.local/lib/hyde/glyph-picker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ main() {
7777
# create recent data file if it doesn't exist
7878
if [[ ! -f "${recent_data}" ]]; then
7979
mkdir -p "$(dirname "${recent_data}")"
80-
echo "Arch linux - I use Arch, BTW" >"${recent_data}"
80+
echo -e "\tArch linux - I use Arch, BTW" >"${recent_data}"
8181
fi
8282

8383
# read recent and main entries

Configs/.local/lib/hyde/hyprsunset.sh

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,20 +97,24 @@ esac
9797
# Send notification if enabled
9898
[ "$notify" = true ] && send_notification
9999

100-
# Fetch current running temperature
101-
current_running_temp=$(pgrep -a hyprsunset | grep -- '--temperature' | awk '{for(i=1;i<=NF;i++) if ($i ~ /--temperature/) print $(i+1)}')
100+
# Ensure that hyprsunset process is running
101+
if ! pgrep -x "hyprsunset" > /dev/null; then
102+
hyprsunset > /dev/null &
103+
fi
102104

103105
if [ "$action" = "read" ]; then
104-
if [ "$toggle_mode" -eq 1 ] && [ "$current_running_temp" != "$currentTemp" ]; then
105-
pkill -x hyprsunset
106-
hyprsunset --temperature "$currentTemp" >/dev/null &
106+
if [ "$toggle_mode" -eq 1 ]; then
107+
# Fetch current running temperature
108+
current_running_temp=$(hyprctl hyprsunset temperature)
109+
if [ "$current_running_temp" != "$currentTemp" ]; then
110+
hyprctl --quiet hyprsunset temperature "$currentTemp"
111+
fi
107112
fi
108113
else
109-
pkill -x hyprsunset
110114
if [ "$toggle_mode" -eq 0 ]; then
111-
hyprsunset -i >/dev/null &
115+
hyprctl --quiet hyprsunset identity
112116
else
113-
hyprsunset --temperature "$newTemp" >/dev/null &
117+
hyprctl --quiet hyprsunset temperature "$newTemp"
114118
fi
115119
fi
116120

Configs/.local/lib/hyde/sysmonlaunch.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,15 @@ pidFile="$HYDE_RUNTIME_DIR/sysmonlaunch.pid"
4848
if [ -f "$pidFile" ]; then
4949
while IFS= read -r line; do
5050
pid=$(awk -F ':::' '{print $1}' <<<"$line")
51-
cmd=$(awk -F ':::' '{print $2}' <<<"$line")
52-
pkill -P "$pid"
53-
pkg_installed flatpak && flatpak kill "$cmd" 2>/dev/null
51+
if [ -d "/proc/${pid}" ]; then
52+
cmd=$(awk -F ':::' '{print $2}' <<<"$line")
53+
pkill -P "$pid"
54+
pkg_installed flatpak && flatpak kill "$cmd" 2>/dev/null
55+
rm "$pidFile"
56+
exit 0
57+
fi
5458
done <"$pidFile"
5559
rm "$pidFile"
56-
exit 0
5760
fi
5861

5962
pkgChk=("io.missioncenter.MissionCenter" "htop" "btop" "top") # Array of commands to check

Configs/.local/share/hyde/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ scale = 8
4343
# glyph-picker.sh configuration
4444
scale = 8
4545

46-
[rofi.launcher]
46+
[rofi.launch]
4747
# rofilaunch.sh configuration
4848
# style = "10"
4949
scale = 5

Configs/.local/share/hyde/hyprland.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ animations {
196196

197197
input {
198198
# See https://wiki.hyprland.org/Configuring/Variables/#input
199-
force_no_accel = 1
199+
accel_profile = flat
200200
numlock_by_default = true
201201
}
202202

0 commit comments

Comments
 (0)