X-Git-Url: https://git.xinqibao.xyz/dotfiles.git/blobdiff_plain/9fd073273405b8309f3fa57184f6cde479ca48b9..37c72c84b198107618b6642e73a3b2574d5dcd07:/.bashrc?ds=sidebyside

diff --git a/.bashrc b/.bashrc
index acfaf50..166fbb8 100644
--- a/.bashrc
+++ b/.bashrc
@@ -7,14 +7,27 @@
 
 alias ls='ls --color=auto'
 alias ll='ls --color=auto -lhrt'
+alias vim='nvim'
+alias vimdiff='nvim -d'
 
+export EDITOR=nvim
+export BROWSER=firefox
+export PATH=$HOME/tool:$PATH
 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 EDITOR=vim
-
 export TERM=xterm-256color
 
 ulimit -c unlimited
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
 export FZF_CTRL_T_OPTS="--preview 'bat --style=numbers --color=always --line-range :500 {}'"
 
+<<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
+
+if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
+  exec startx
+fi