From 013ee40d4ee7b6d014649c263ab6828261cb4e62 Mon Sep 17 00:00:00 2001
From: Anton Bobov <abobov@gmail.com>
Date: Tue, 16 Mar 2021 20:45:14 +0500
Subject: Updates.

---
 files/.gitconfig            |  1 +
 files/.zsh/rc/S50_aliases   |  3 ++-
 files/.zsh/rc/S50_functions | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3