xsession: add startx argument, lupan-set-theme: use pkill, shell: try eza before exa

This commit is contained in:
2025-10-15 07:34:23 +02:00
parent e734764630
commit 19a7dd6dee
3 changed files with 7 additions and 4 deletions

View File

@@ -13,7 +13,10 @@ if alias r > /dev/null; then
unalias r
fi
if which exa > /dev/null; then
if which eza > /dev/null; then
alias ls='eza --icons'
alias tree='eza --tree --icons'
elif which exa > /dev/null; then
alias ls='exa --icons'
alias tree='exa --tree --icons'
fi

View File

@@ -36,7 +36,7 @@ if [ -z "$DISPLAY" -a -z "$WAYLAND_DISPLAY" -a "$(tty)" = /dev/tty1 ]; then
if which /usr/bin/sx > /dev/null; then
exec /usr/bin/sx ~/.xsession
elif which /usr/bin/startx > /dev/null; then
exec /usr/bin/startx
exec /usr/bin/startx ~/.xsession
elif which Hyprland > /dev/null && [ -d ~/.config/hypr ]; then
exec Hyprland
elif which river > /dev/null && [ -d ~/.config/river ]; then

View File

@@ -21,7 +21,7 @@ else
exit 1
fi
killall -USR1 dwm
pkill -USR1 '^dwm$'
XRES=$(readlink -e ~/.Xresources)
if [ -n "$XRES" ]; then
@@ -31,7 +31,7 @@ if [ -n "$XRES" ]; then
sed -i 's/^#define THEME_DARK/#undef THEME_DARK/' "$XRES"
fi
xrdb -merge "$XRES"
killall -USR1 st
pkill -USR1 '^st$'
fi
# Alacritty