bash: update environment

diff --git a/dot-bash_profile b/dot-bash_profile
index 20e5b3a7dc8d9e1bb8b4927c73fe3fbbda5558d5..cff41a634a9f47579a3eb7ad39e83458bcce0a11 100644 (file)
--- a/dot-bash_profile
+++ b/dot-bash_profile
@@ -5,21 +5,27 @@ export PATH="$PATH:$HOME/Applications:$HOME/go/bin:$HOME/.cargo/bin:/opt/android
 
 export EDITOR="kks edit"
 export VISUAL="kks edit"
+export KKS_DEFAULT_SESSION='default'
+export KKS_USE_GITDIR_SESSIONS=1
+
 export MAN_PAGER="sh -c 'col -bx | bat -l man -p'"
 export BAT_THEME="base16"
+export LESS='-F -i -J -M -R -W -x4 -X -z-4'
 
-export VDPAU_DRIVER=radeonsi
-export FZF_DEFAULT_OPTS='--multi --layout=reverse --preview-window=down:60% --color fg+:3,hl+:4'
+# export FZF_DEFAULT_OPTS='--multi --layout=reverse --preview-window=down:60% --color fg+:3,hl+:4'
+export FZF_DEFAULT_OPTS='--layout=reverse --border=rounded --multi'
+
+export XZ_OPT='--threads=16'
 export ZSTD_NBTHREADS="28"
+
+export VDPAU_DRIVER=radeonsi
 export GTK_USE_PORTAL=1
 
 # This file is sourced by bash for login shells.  The following line
 # runs your .bashrc and is recommended by the bash info pages.
-if [[ ! "$(grep -i suse /etc/os-release)" ]]; then
     if [[ -f ~/.bashrc ]] ; then
        . ~/.bashrc
     fi
-fi
 
 # autorun display-manager
 if { [ -z "$DISPLAY" ] || [ -z "$WAYLAND_DISPLAY" ]; } && [ "$XDG_VTNR" -eq "1" ]; then

diff --git a/dot-bashrc b/dot-bashrc
index 4505d59f68590031d3c5b2f969e6da1a76a2030b..914fdd3eedd09427a940f067bb14b6c9da72a119 100644 (file)
--- a/dot-bashrc
+++ b/dot-bashrc
@@ -6,14 +6,6 @@
 # that can't tolerate any output.  So make sure this doesn't display
 # anything or bad things will happen !
 
-export PATH="$PATH:$HOME/Applications:$HOME/go/bin:$HOME/.cargo/bin:/opt/android-sdk/platform-tools:$HOME/.local/bin"
-
-export KKS_DEFAULT_SESSION='default'
-export KKS_USE_GITDIR_SESSIONS=1
-export VDPAU_DRIVER='radeonsi'
-export FZF_DEFAULT_OPTS='--layout=reverse --border=rounded --multi'
-export XZ_OPT='--threads=16'
-export LESS='-F -i -J -M -R -W -x4 -X -z-4'
 
 alias df='/usr/bin/df -h --output=target,fstype,used,avail,pcent,source | sort -n'
 alias du='du -h'
@@ -34,7 +26,7 @@ alias  lf='lfrun'
 if [[ "$(grep -i suse /etc/os-release)" ]]; then
     . ~/.bash_profile
 fi
-test -s ~/.alias && . ~/.alias || true
+test -e ~/.alias && . ~/.alias || true
 
 case $(tty) in
     /dev/tty[0-9]*)
@@ -103,5 +95,5 @@ command -v starship > /dev/null 2>&1 && eval "$(starship init bash)"
 # apply base16 theme
 test -f ~/.local/bin/base16-flavours && ~/.local/bin/base16-flavours
 clear
-test -f /usr/bin/fastfetch && command fastfetch -c "$HOME/.config/fastfetch/config.jsonc"
+test -f /usr/bin/fastfetch && command fastfetch -c "$HOME/.config/fastfetch/default.jsonc"