X-Git-Url: https://git.xinqibao.xyz/dotfiles.git/blobdiff_plain/2229f738d010282857424ec9194596690fe338e9..754f05fab08d7734f656cd7b67a119699ce9e6b9:/.bashrc?ds=inline

diff --git a/.bashrc b/.bashrc
index 9a17f51..e697659 100644
--- a/.bashrc
+++ b/.bashrc
@@ -9,29 +9,30 @@ export PATH=${HOME}/.local/opt/node/bin:${PATH}
 export PATH=${HOME}/.local/bin:${PATH}
 export PATH=${HOME}/tool:${PATH}
 
-alias ls='ls --color=auto'
-alias ll='ls --color=auto -lhrt'
+alias ls='ls --color=auto -G'
+alias ll='ls --color=auto -G -lhrt'
 alias vim='nvim'
 alias vimdiff='nvim -d'
 
 export EDITOR=nvim
 export BROWSER=firefox
-export TERM=xterm-256color
+
 export PS1="[\[\e[36;1m\]\u@\h \[\e[32;1m\]\w\[\e[m\]]\[\e[33m\](\$(git branch 2>/dev/null | grep '^*' | colrm 1 2))\n\[\e[m\]~~~>\$ "
+export TERM=xterm-256color
+
+ulimit -c unlimited
+
+#export proxy_url=http://localhost:1080
+#export http_proxy=$proxy_url
+#export https_proxy=$proxy_url
+#export HTTP_PROXY=$proxy_url
+#export HTTPS_PROXY=$proxy_url
 
 # Set up fzf key bindings and fuzzy completion
 eval "$(fzf --bash)"
 export FZF_CTRL_T_OPTS="--preview 'bat --style=numbers --color=always --line-range :500 {}'"
 
-ulimit -c unlimited
-
-<<COMMENT
-export proxy_url=http://localhost:1080
-export http_proxy=$proxy_url
-export https_proxy=$proxy_url
-export HTTP_PROXY=$proxy_url
-export HTTPS_PROXY=$proxy_url
-COMMENT
+[ -f ${HOME}/.cargo/env ] && . ${HOME}/.cargo/env
 
 if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
   exec startx