From 6db5b89755a44b6eb1f2b2b0afdeb99f36f6a032 Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Wed, 21 Oct 2020 01:02:08 +0000 Subject: [PATCH] updated to check for file before enabling, removed libva --- all-shells/.commonshell | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/all-shells/.commonshell b/all-shells/.commonshell index a1a6a8c..20ffef7 100644 --- a/all-shells/.commonshell +++ b/all-shells/.commonshell @@ -1,19 +1,31 @@ #aliases -alias ls="ls --color=auto" +if [ -z "${OSTYPE##*darwin*}" ]; then + #Mac OSX specific versions + alias ls="ls -G" + [ -d /usr/local/opt/llvm/bin ] && PATH="$PATH:/usr/local/opt/llvm/bin" +else + #Linux + others as default + alias ls="ls --color=auto" + alias scoff="xset dpms force off" +fi alias l="ls -laF" -alias scoff="xset dpms force off" alias grep="grep --color=always" alias less='less -r' -alias stats="find . -type f -printf '%f\n' | sed -r -n 's/.+(\..*)$/\1/p' | sort | uniq -c" +function stats() { + find ${1:-'.'} -type f -print | sed -E -n 's/.+(\..*)$/\1/pi' | sort | uniq -c | sort -g +} -export EDITOR=/usr/bin/vim +alias pip-upgrade="python -m pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 python -m pip install -U" + +#export EDITOR="/usr/bin/emacsclient -nw -a /usr/bin/vim" +#alias ec=$EDITOR +[ -n "$(whereis vim)" ] && export EDITOR="/usr/bin/vim" #default wine prefix -export WINEPREFIX=/home/joel/.wine/Games/ -export STEAM_COMPAT_DATA_PATH=$HOME/proton - -export LIBVA_DRIVER_NAME=iHD +[ -n "$(whereis wine)" ] && export WINEPREFIX=$HOME/.wine/Games/ +[ -n "$(whereis steam)" ] && export STEAM_COMPAT_DATA_PATH=$HOME/proton # add to path export PATH=$PATH:~/.local/bin -PATH="$PATH:$(ruby -e 'puts Gem.user_dir')/bin" +[ -r /usr/bin/ruby ] && PATH="$PATH:$(ruby -e 'puts Gem.user_dir')/bin" +[ -d ~/.cargo ] && PATH="$PATH:$HOME/.cargo/bin" -- Gitblit v1.9.3