From 796272896e4f53b074a63b0dd59ac132a5e15643 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Fri, 16 Oct 2020 07:00:18 +0000
Subject: [PATCH] inlined function
---
all-shells/.commonshell | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/all-shells/.commonshell b/all-shells/.commonshell
index 60db69e..3dc16ab 100644
--- a/all-shells/.commonshell
+++ b/all-shells/.commonshell
@@ -1,15 +1,22 @@
#aliases
-alias ls="ls --color=auto"
+if [ -z "${OSTYPE##*darwin*}" ]; then
+ #Mac OSX specific versions
+ alias ls="ls -G"
+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}
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/emacsclient -nw -a /usr/bin/vim"
+#alias ec=$EDITOR
+export EDITOR="/usr/bin/vim"
#default wine prefix
export WINEPREFIX=$HOME/.wine/Games/
@@ -20,3 +27,4 @@
# 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"
--
Gitblit v1.9.3