aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/.gitconfig1
-rw-r--r--files/.zsh/rc/S50_aliases3
-rw-r--r--files/.zsh/rc/S50_functions17
3 files changed, 20 insertions, 1 deletions
diff --git a/files/.gitconfig b/files/.gitconfig
index f988f09..00c311a 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -34,6 +34,7 @@
quotepath = false
[log]
decorate = short
+ mailmap = true
[alias]
aa = add --all
amend = commit --amend
diff --git a/files/.zsh/rc/S50_aliases b/files/.zsh/rc/S50_aliases
index 8daf78d..a65be75 100644
--- a/files/.zsh/rc/S50_aliases
+++ b/files/.zsh/rc/S50_aliases
@@ -66,7 +66,6 @@ else
fi
alias bc='bc -lq'
-alias calc='noglob bc -l <<<'
alias c=' clear'
check_com g || alias g='git'
@@ -83,6 +82,8 @@ alias man='LANG=C man'
alias sc=systemctl
alias jf="journalctl --unit"
+alias lsblk="lsblk -o NAME,SIZE,UUID,FSTYPE,MOUNTPOINT,LABEL,MODEL"
+
# }}}
# Network and web {{{
diff --git a/files/.zsh/rc/S50_functions b/files/.zsh/rc/S50_functions
index dd2441f..cc7b912 100644
--- a/files/.zsh/rc/S50_functions
+++ b/files/.zsh/rc/S50_functions
@@ -55,6 +55,23 @@ st() {
}
compdef st=ssh
+calc() {
+ echo "scale=3;$@" | bc -l
+}
+alias calc="noglob calc"
+
+# Take from @garybernhardt
+activate_virtualenv() {
+ for name in venv env ; do
+ for up in . ../.. ../../.. ; do
+ if [ -f $up/$name/bin/activate ] ; then
+ . $up/$name/bin/activate
+ return
+ fi
+ done
+ done
+}
+
transfer() {
curl --progress-bar --upload-file "$1" https://transfer.sh/$(basename "$1") | tee /dev/null;
echo