From 77bcf98c5641412f640de937294ab94b0b0522ad Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Tue, 05 Oct 2021 02:45:37 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/Chizi123/dotfiles
---
all-shells/.commonshell | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/all-shells/.commonshell b/all-shells/.commonshell
index 6b70090..ab9ea20 100644
--- a/all-shells/.commonshell
+++ b/all-shells/.commonshell
@@ -1,7 +1,8 @@
#aliases
-if [[ "$OSTYPE" == "darwin"* ]]; then
+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"
@@ -10,20 +11,26 @@
alias l="ls -laF"
alias grep="grep --color=always"
alias less='less -r'
-alias stats="find . -type f -print | sed -E -n 's/.+(\..*)$/\1/p' | sort | uniq -c | sort -g"
+function stats() {
+ find ${1:-'.'} -type f -print | sed -E -n 's/.+(\..*)$/\1/pi' | sort | uniq -c | sort -g
+}
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
-export EDITOR="/usr/bin/vim"
+alias ec="/usr/bin/emacsclient -nw -a /usr/bin/vim"
+[ -n "$(whereis vim)" ] && export EDITOR="/usr/bin/vim"
#default wine prefix
-export WINEPREFIX=$HOME/.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
[ -r /usr/bin/ruby ] && PATH="$PATH:$(ruby -e 'puts Gem.user_dir')/bin"
+[ -d ~/.cargo ] && PATH="$PATH:$HOME/.cargo/bin"
+
+# Update dotfiles
+(git -C ~/.dotfiles pull &) &>/dev/null
+[ -d ~/.emacs.d ] && (git -C ~/.emacs.d pull &) &>/dev/null
--
Gitblit v1.9.3