chore(bashrc): reorganize config and adapt ls for macOS

[dotfiles.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 166fbb8..e697659 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -5,28 +5,34 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 

-alias ls='ls --color=auto'
-alias ll='ls --color=auto -lhrt'
+export PATH=${HOME}/.local/opt/node/bin:${PATH}
+export PATH=${HOME}/.local/bin:${PATH}
+export PATH=${HOME}/tool:${PATH}
+
+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
 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 TERM=xterm-256color
 
 ulimit -c unlimited
 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

-[ -f ~/.fzf.bash ] && source ~/.fzf.bash
+
+#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 {}'"
 
 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
+[ -f ${HOME}/.cargo/env ] && . ${HOME}/.cargo/env

 
 if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
   exec startx
 
 if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
   exec startx