@@ -4,8 +4,11 @@ iatest=$(expr index "$-" i)
44# ######################################################
55# SOURCED ALIASES AND SCRIPTS BY zachbrowne.me
66# ######################################################
7- if command -v fastfetch 2> /dev/null; then
8- fastfetch
7+ if command -v fastfetch & > /dev/null; then
8+ # Only run fastfetch if we're in an interactive shell
9+ if [[ $- == * i* ]]; then
10+ fastfetch
11+ fi
912fi
1013
1114# Source global definitions
@@ -62,11 +65,19 @@ if [[ $iatest -gt 0 ]]; then bind "set completion-ignore-case on"; fi
6265if [[ $iatest -gt 0 ]]; then bind " set show-all-if-ambiguous On" ; fi
6366
6467# Set the default editor
65- export EDITOR=nvim
66- export VISUAL=nvim
68+ if command -v nvim & > /dev/null; then
69+ export EDITOR=nvim
70+ export VISUAL=nvim
71+ alias vim=' nvim'
72+ alias vi=' nvim'
73+ alias svi=' sudo nvim'
74+ alias vis=' nvim "+set si"'
75+ else
76+ export EDITOR=vim
77+ export VISUAL=vim
78+ fi
6779alias spico=' sudo pico'
6880alias snano=' sudo nano'
69- alias vim=' nvim'
7081
7182# To have colors for ls and all grep commands such as grep, egrep and zgrep
7283export CLICOLOR=1
@@ -129,7 +140,11 @@ alias da='date "+%Y-%m-%d %A %T %Z"'
129140# aliases to modified commands
130141alias cp=' cp -i'
131142alias mv=' mv -i'
132- alias rm=' trash -v'
143+ if command -v trash & > /dev/null; then
144+ alias rm=' trash -v'
145+ else
146+ alias rm=' rm -i' # fallback to interactive remove
147+ fi
133148alias mkdir=' mkdir -p'
134149alias ps=' ps auxf'
135150alias less=' less -R'
@@ -415,11 +430,13 @@ distribution () {
415430
416431
417432DISTRIBUTION=$( distribution)
418- if [ " $DISTRIBUTION " = " redhat" ] || [ " $DISTRIBUTION " = " arch" ]; then
419- alias cat=' bat'
420- else
421- alias cat=' batcat'
422- fi
433+ if command -v bat & > /dev/null || command -v batcat & > /dev/null; then
434+ if [ " $DISTRIBUTION " = " redhat" ] || [ " $DISTRIBUTION " = " arch" ]; then
435+ alias cat=' bat'
436+ else
437+ alias cat=' batcat'
438+ fi
439+ fi
423440
424441# Show the current version of the operating system
425442ver () {
@@ -630,3 +647,8 @@ export PATH=$PATH:"$HOME/.local/bin:$HOME/.cargo/bin:/var/lib/flatpak/exports/bi
630647
631648eval " $( starship init bash) "
632649eval " $( zoxide init bash) "
650+
651+ # Auto-start DWM if we're on TTY1 and .xinitrc contains "exec dwm"
652+ if [[ " $( tty) " == " /dev/tty1" ]] && [ -f " $HOME /.xinitrc" ] && grep -q " ^exec dwm" " $HOME /.xinitrc" ; then
653+ startx
654+ fi
0 commit comments