shell -> bash: Reorder executions and imports to fix execution orders
This commit is contained in:
parent
f366c9b3ad
commit
892eee106f
3 changed files with 14 additions and 14 deletions
|
@ -1,5 +1,10 @@
|
||||||
#!/usr/bin/bash
|
#!/usr/bin/bash
|
||||||
|
|
||||||
|
# Start DE if on tty1
|
||||||
|
if [ "$(tty)" = /dev/tty1 ]; then
|
||||||
|
exec Hyprland
|
||||||
|
fi
|
||||||
|
|
||||||
# Start in tmux by default
|
# Start in tmux by default
|
||||||
[[ $TERM != "screen" ]] && [ -z "$TMUX" ] && exec tmux
|
[[ $TERM != "screen" ]] && [ -z "$TMUX" ] && exec tmux
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,3 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
[[ -f ~/.bashrc ]] && . ~/.bashrc
|
[[ -f ~/.bashrc ]] && . ~/.bashrc
|
||||||
|
|
||||||
# Start DE if on tty1
|
|
||||||
if [ "$(tty)" = /dev/tty1 ]; then
|
|
||||||
exec Hyprland
|
|
||||||
fi
|
|
||||||
|
|
|
@ -40,6 +40,15 @@ if [ -f "$CARGO_ENV_PATH" ]; then
|
||||||
. "$CARGO_ENV_PATH"
|
. "$CARGO_ENV_PATH"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
FLUTTER_PATH="/opt/flutter/bin"
|
||||||
|
if test -d "$FLUTTER_PATH"; then
|
||||||
|
export PATH="$FLUTTER_PATH:$PATH"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -f ~/.bash_exec ]; then
|
||||||
|
source ~/.bash_exec
|
||||||
|
fi
|
||||||
|
|
||||||
if command -v starship > /dev/null; then
|
if command -v starship > /dev/null; then
|
||||||
eval "$(starship init bash)"
|
eval "$(starship init bash)"
|
||||||
fi
|
fi
|
||||||
|
@ -47,12 +56,3 @@ fi
|
||||||
if command -v zoxide > /dev/null; then
|
if command -v zoxide > /dev/null; then
|
||||||
eval "$(zoxide init --cmd cd bash)"
|
eval "$(zoxide init --cmd cd bash)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f ~/.bash_exec ]; then
|
|
||||||
source ~/.bash_exec
|
|
||||||
fi
|
|
||||||
|
|
||||||
FLUTTER_PATH="/opt/flutter/bin"
|
|
||||||
if test -d "$FLUTTER_PATH"; then
|
|
||||||
export PATH="$FLUTTER_PATH:$PATH"
|
|
||||||
fi
|
|
||||||
|
|
Loading…
Reference in a new issue