Compare commits

..

2 commits

Author SHA1 Message Date
GaspardCulis
892eee106f
shell -> bash: Reorder executions and imports to fix execution orders 2024-06-01 03:35:15 +02:00
GaspardCulis
f366c9b3ad
Revert "bash -> (bashrc + profile): Fixed tmux exec overriding Hyprland"
This reverts commit e5e82abfa8.
2024-06-01 03:32:15 +02:00
3 changed files with 19 additions and 15 deletions

View file

@ -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

View file

@ -1,8 +1,5 @@
export PATH="$HOME/.local/bin:$PATH" #
# ~/.bash_profile
# Start DE if on tty1 #
if [ "$(tty)" = /dev/tty1 ]; then
exec Hyprland
fi
[[ -f ~/.bashrc ]] && . ~/.bashrc [[ -f ~/.bashrc ]] && . ~/.bashrc

View file

@ -21,6 +21,8 @@ fi
bind '"\e[A":history-search-backward' bind '"\e[A":history-search-backward'
bind '"\e[B":history-search-forward' bind '"\e[B":history-search-forward'
export PATH="$HOME/.local/bin:$PATH"
export EDITOR="hx" export EDITOR="hx"
export HISTFILESIZE= export HISTFILESIZE=
@ -38,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
@ -45,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