ZacharyZhang-NY/omarchycn
3
4
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Merge branch 'dev' into rc

Browse Source
This commit is contained in:
David Heinemeier Hansson
2026-03-08 15:16:29 +01:00
parent c900478aba 462575c880
commit e4acb3e8a9
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
default/bash/fns/worktrees
+2 -2
View File
@@ -17,7 +17,7 @@ ga() {
# Remove worktree and branch from within active worktree directory. # Remove worktree and branch from within active worktree directory.
gd() { gd() {
if gum confirm "Remove worktree and branch?"; then if gum confirm "Remove worktree and branch?"; then
local cwd base branch root local cwd base branch root worktree
cwd="$(pwd)" cwd="$(pwd)"
worktree="$(basename "$cwd")" worktree="$(basename "$cwd")"
@@ -29,7 +29,7 @@ gd() {
# Protect against accidentally nuking a non-worktree directory # Protect against accidentally nuking a non-worktree directory
if [[ "$root" != "$worktree" ]]; then if [[ "$root" != "$worktree" ]]; then
cd "../$root" cd "../$root"
git worktree remove "$worktree" --force git worktree remove "$cwd" --force || return 1
git branch -D "$branch" git branch -D "$branch"
fi fi
fi fi
default/hypr/apps/jetbrains.conf
+1 -1
View File
@@ -14,7 +14,7 @@ windowrule {
windowrule { windowrule {
name = jetbrains-popup name = jetbrains-popup
match:class = ^(jetbrains-.*) match:class = ^(jetbrains-.*)
match:title = ^()$ match:title = ^(| )$
match:float = 1 match:float = 1
tag = +jetbrains tag = +jetbrains
center = on center = on
install/config/hardware/intel.sh
+1 -1
View File
@@ -2,7 +2,7 @@
# Check if we have an Intel GPU at all # Check if we have an Intel GPU at all
if INTEL_GPU=$(lspci | grep -iE 'vga|3d|display' | grep -i 'intel'); then if INTEL_GPU=$(lspci | grep -iE 'vga|3d|display' | grep -i 'intel'); then
# HD Graphics / Iris / Xe / Arc use intel-media-driver # HD Graphics / Iris / Xe / Arc use intel-media-driver
if [[ ${INTEL_GPU,,} =~ "hd graphics"|"xe"|"iris"|"arc" ]]; then if [[ ${INTEL_GPU,,} =~ (hd\ graphics|xe|iris|arc) ]]; then
omarchy-pkg-add intel-media-driver omarchy-pkg-add intel-media-driver
elif [[ ${INTEL_GPU,,} =~ "gma" ]]; then elif [[ ${INTEL_GPU,,} =~ "gma" ]]; then
# Older generations from 2008 to ~2014-2017 use libva-intel-driver # Older generations from 2008 to ~2014-2017 use libva-intel-driver
migrations/1772907198.sh
+1 -1
View File
@@ -4,7 +4,7 @@ if [[ -f ~/.config/tmux/tmux.conf ]]; then
if ! grep -q "set -gw automatic-rename on" ~/.config/tmux/tmux.conf; then if ! grep -q "set -gw automatic-rename on" ~/.config/tmux/tmux.conf; then
sed -i '/set -g window-status-separator ""/a\ sed -i '/set -g window-status-separator ""/a\
set -gw automatic-rename on\ set -gw automatic-rename on\
set -gw automatic-rename-format '\''#{b:pane_current_path}'\'' \ set -gw automatic-rename-format '\''#{b:pane_current_path}'\''\
' ~/.config/tmux/tmux.conf ' ~/.config/tmux/tmux.conf
omarchy-restart-tmux omarchy-restart-tmux
fi fi