aboutsummaryrefslogtreecommitdiffstats
path: root/bash
diff options
context:
space:
mode:
Diffstat (limited to 'bash')
-rw-r--r--bash/.bashrc6
1 files changed, 3 insertions, 3 deletions
diff --git a/bash/.bashrc b/bash/.bashrc
index 0684e75..364d243 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -153,7 +153,7 @@ if [ -x /opt/homebrew/bin/pyenv ]; then
153 eval "$(pyenv init --path)" 153 eval "$(pyenv init --path)"
154 eval "$(pyenv init -)" 154 eval "$(pyenv init -)"
155fi 155fi
156if [ -x /usr/local/bin/pyenv ]; then 156if [[ -x /usr/local/bin/pyenv || -x $HOME/bin/pyenv ]]; then
157 # FreeBSD, probably linux 157 # FreeBSD, probably linux
158 eval "$(pyenv init -)" 158 eval "$(pyenv init -)"
159fi 159fi
@@ -181,7 +181,7 @@ fi
181[[ $PS1 && -f /usr/local/share/bash-completion/bash_completion.sh ]] && \ 181[[ $PS1 && -f /usr/local/share/bash-completion/bash_completion.sh ]] && \
182 source /usr/local/share/bash-completion/bash_completion.sh 182 source /usr/local/share/bash-completion/bash_completion.sh
183 183
184if [[ $OS_NAME == "FreeBSD" ]]; then 184if [[ $OS_NAME == "FreeBSD" || $OS_NAME == "OpenBSD" ]]; then
185 export XDG_RUNTIME_DIR=/var/run/user/`id -u` 185 export XDG_RUNTIME_DIR=/var/run/user/`id -u`
186fi 186fi
187####### 187#######
@@ -234,7 +234,7 @@ export HISTCONTROL="ignoredups"
234export HISTIGNORE="ls:cd" 234export HISTIGNORE="ls:cd"
235 235
236# Aliases 236# Aliases
237alias ls='ls --color' 237#alias ls='ls --color'
238#alias fixfileperm='find /music -type f -exec chmod 0644 {} \;' 238#alias fixfileperm='find /music -type f -exec chmod 0644 {} \;'
239#alias cleanremotebranches='git branch --merged | grep -v "\*" | xargs -n 1 git branch -d; git branch -r --merged master | grep -iv "master" | sed "s/origin\///" | xargs -n 1 git push --delete origin' 239#alias cleanremotebranches='git branch --merged | grep -v "\*" | xargs -n 1 git branch -d; git branch -r --merged master | grep -iv "master" | sed "s/origin\///" | xargs -n 1 git push --delete origin'
240alias ducks='du -cks * |sort -rn |head -11' 240alias ducks='du -cks * |sort -rn |head -11'