Skip to content

Commit 266aa3f

Browse files
authored
chore: release automated changes from dev to master (#559)
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 Add keybind for game launcher (#597) (891b181) by ProfShiba * feat (hyde-ipc): Our very own IPC handler! (5c4221f) by kRHYME7 * fix(zsh): Use `.user.zsh` (f1446ab) by kRHYME7 * feat(hyde-config): A Go implementation of the parse.config.py (b6c7bb8) by kRHYME7 * chore Add missing modules to Starship config (#577) (12d113b) by prime-run * fix: [Bug]: Defer oh-my-zsh loading may not be the best option #578 (882fef0) by kRHYME7 * chore implement fzf-shell integration for `fish` (#575) (e750c97) by prime-run * fix(fastfetch): Correct random handler (3cb0434) by kRHYME7 * chore add best fzf aliases ever (#569) (503711a) by prime-run * fix(zsh): Explicit history integration (55721cb) by kRHYME7 * fixed the link color being same as normal text (#570) (ca3c158) by amit * fix: [Bug]: Game Launcher isn't showing anything #447 (96be51a) by kRHYME7 * chore style: discord dcol file changes (#566) (63a2949) by amit * chore refactor(zsh): cleanup zsh for incoing fzf features (abc1a7b) by prime-run * chore breaking(zsh): move ~/.hyde.zshrc to more consistent name `~/.user.zsh` (bb76750) by kRHYME7 * chore Merge branch 'master' of https://github.com/hyde-project/hyde into dev (1254f3f) by kRHYME7 * chore Merge branch 'master' into dev (73efd7c) by Khing --- Please review the changes carefully before merging.
2 parents 7118e94 + 2b126c1 commit 266aa3f

File tree

20 files changed

+898
-204
lines changed

20 files changed

+898
-204
lines changed

Configs/.config/fish/config.fish

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,22 @@ if type -q starship
88
set -gx STARSHIP_CONFIG $XDG_CONFIG_HOME/starship/starship.toml
99
end
1010

11+
12+
# fzf
13+
if type -q fzf
14+
fzf --fish | source
15+
end
16+
17+
18+
19+
20+
21+
22+
23+
# example integration with bat : <cltr+f>
24+
# bind -M insert \ce '$EDITOR $(fzf --preview="bat --color=always --plain {}")'
25+
26+
1127
set fish_pager_color_prefix cyan
1228
set fish_color_autosuggestion brblack
1329

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
function ffcd
2+
set initial_query
3+
set max_depth 7
4+
if set -q argv[1]
5+
set initial_query $argv[1]
6+
end
7+
8+
set fzf_options '--preview=ls -p {} | grep /' \
9+
'--preview-window=right:60%' \
10+
'--height' '80%' \
11+
'--layout=reverse' \
12+
'--preview-window' 'right:60%' \
13+
'--cycle'
14+
15+
if set -q initial_query
16+
set fzf_options $fzf_options "--query=$initial_query"
17+
end
18+
19+
20+
set selected_dir (find . -maxdepth $max_depth \( -name .git -o -name node_modules -o -name .venv -o -name target -o -name .cache \) -prune -o -type d -print 2>/dev/null | fzf $fzf_options)
21+
22+
if test -n "$selected_dir"; and test -d "$selected_dir"
23+
cd "$selected_dir"; or return 1
24+
else
25+
return 1
26+
end
27+
end
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
function ffe
2+
set initial_query
3+
if set -q argv[1]
4+
set initial_query $argv[1]
5+
end
6+
7+
set fzf_options '--height' '80%' \
8+
'--layout' 'reverse' \
9+
'--preview-window' 'right:60%' \
10+
'--cycle'
11+
12+
if set -q initial_query
13+
set fzf_options $fzf_options "--query=$initial_query"
14+
end
15+
16+
set max_depth 5
17+
18+
set selected_file (find . -maxdepth $max_depth -type f 2>/dev/null | fzf $fzf_options)
19+
20+
if test -n "$selected_file"; and test -f "$selected_file"
21+
nvim "$selected_file"
22+
else
23+
return 1
24+
end
25+
end
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
function ffec
2+
set grep_pattern ""
3+
if set -q argv[1]
4+
set grep_pattern $argv[1]
5+
end
6+
7+
set fzf_options '--height' '80%' \
8+
'--layout' 'reverse' \
9+
'--preview-window' 'right:60%' \
10+
'--cycle' \
11+
'--preview' 'bat --color always {}' \
12+
'--preview-window' 'right:60%'
13+
14+
set selected_file (grep -irl -- "$grep_pattern" ./ 2>/dev/null | fzf $fzf_options)
15+
16+
if test -n "$selected_file"
17+
nvim "$selected_file"
18+
else
19+
echo "No file selected or search returned no results."
20+
end
21+
end

Configs/.config/hyde/wallbash/always/discord.dcol

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@ ${XDG_CACHE_HOME}/hyde/wallbash/discord.css|${WALLBASH_SCRIPTS}/discord.sh
22
@import url('https://mwittrien.github.io/BetterDiscordAddons/Themes/DiscordRecolor/DiscordRecolor.css');
33

44
:root {
5-
--accentcolor: <wallbash_pry1_rgb>;
5+
--accentcolor: <wallbash_1xa6_rgb>;
66
--accentcolor2: <wallbash_pry2_rgb>;
7-
--linkcolor: <wallbash_txt2_rgb>;
7+
--linkcolor: <wallbash_1xa6_rgb>;
88
--mentioncolor: <wallbash_1xa5_rgb>;
99
--textbrightest: <wallbash_txt1_rgb>;
1010
--textbrighter: <wallbash_txt2_rgb>;
1111
--textbright: <wallbash_1xa9_rgb>;
1212
--textdark: <wallbash_3xa9_rgb>;
13-
--textdarker: <wallbash_txt3_rgb>;
14-
--textdarkest: <wallbash_txt4_rgb>;
13+
--textdarker: <wallbash_3xa5_rgb>;
14+
--textdarkest: <wallbash_3xa1_rgb>;
1515

1616
--backgroundaccent: <wallbash_1xa5_rgb>;
1717
--backgroundprimary: <wallbash_2xa1_rgb>;
1818
--backgroundsecondary: <wallbash_pry1_rgb>;
1919
--backgroundsecondaryalt: <wallbash_pry1_rgb>;
2020
--backgroundtertiary: <wallbash_pry1_rgb>;
2121
--backgroundfloating: <wallbash_2xa1_rgb>;;
22-
--settingsicons: 1;
22+
--settingsicons: 0;
2323
}
2424

2525
/* Any custom CSS below here */

Configs/.config/hypr/keybindings.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ $ut=Utilities
121121
$d=[$ut]
122122
binddl = $mainMod, K, $d toggle keyboard layout , exec, $scrPath/keyboardswitch.sh # switch keyboard layout
123123
bindd = $mainMod Alt, G, $d game mode , exec, $scrPath/gamemode.sh # disable hypr effects for gamemode
124+
bindd = $mainMod Shift, G, $d open game launcher , exec, $scrPath/gamelauncher.sh # run game launcher for steam and lutris
124125

125126
$d=[$ut|Screen Capture]
126127
bindd = $mainMod Shift, P, $d color picker, exec, hyprpicker -an # Pick color (Hex) >> clipboard#

0 commit comments

Comments
 (0)