shell misc

shell/.profile

@@ -16,35 +16,29 @@ fi
 
 ### AAA ##########################################
 
-[ -f ~/.bash_aliases ] && source ~/.bash_aliases
-[ -f ~/.profile.extra ] && source ~/.profile.extra
-
-export LITE_SCALE=1 # workaround https://github.com/lite-xl/lite-xl/issues/1173
-
 export JAVA_HOME="/usr/bin/"
-export PATH="/opt/nvim/bin:$PATH"
-export PATH="$HOME/.local/bin/:$PATH"
-export PATH="$HOME/.local/share/JetBrains/Toolbox/scripts:$PATH"
-export PATH="$(composer config -g home)/vendor/bin:$PATH"
+export PATH="$PATH:/opt/nvim/bin/"
+export PATH="$PATH:$HOME/.local/bin/"
+export PATH="$PATH:$HOME/.local/share/JetBrains/Toolbox/scripts/"
+
+if hash composer >/dev/null; then
+    composer_home=$(composer config -g home 2>/dev/null)
+    export PATH="$PATH:$composer_home/vendor/bin"
+fi
 
 # phpbrew
 # export PHPBREW_SET_PROMPT=1
 # export PHPBREW_RC_ENABLE=1
-# [ -f ~/.phpbrew/bashrc ] && source ~/.phpbrew/bashrc
+# [ -f $HOME/.phpbrew/bashrc ] && source $HOME/.phpbrew/bashrc
 
 # golang
-export PATH="/usr/local/go/bin:$PATH"
+export PATH="$PATH:/usr/local/go/bin"
 export GOPATH="$HOME/.go"
 
 # rust cargo
-[ -f ~/.cargo/env ] && source ~/.cargo/env
+[ -f "$HOME/.cargo/env" ] && source "$HOME/.cargo/env"
 
 # nvm
-# export NVM_DIR="$HOME/.nvm"
-# [ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"  # This loads nvm
-# [ -s "$NVM_DIR/bash_completion" ] && source "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-
-# neovim
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
@@ -55,3 +49,5 @@ export NVM_DIR="$HOME/.nvm"
 # The next line enables shell command completion for yc.
 [ -f "$HOME/yandex-cloud/completion.zsh.inc" ] && source "$HOME/yandex-cloud/completion.zsh.inc"
 
+# misc
+[[ -f $HOME/.profile.extra ]] && source $HOME/.profile.extra