X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/f49ed199817269fbfd6806c3c702190d66200516..dffaced336ebd944972a3bd0be6a5ab21905eff4:/.zsh/zshrc/30_aliases?ds=inline

diff --git a/.zsh/zshrc/30_aliases b/.zsh/zshrc/30_aliases
index 1f5f0a0..fd8dd24 100644
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -45,7 +45,7 @@ alias lart='ls -lart'
 # List only directories and symbolic links that point to directories
 alias lsd='ll -d *(-/DN)'
 
-alias lscontext=l
+alias lscontext=ls
 cd () { __CHPWD_RUN_FIRST=lscontext && builtin cd "$@" && unset __CHPWD_RUN_FIRST }
 #_cd_l() { ll }
 #chpwd_functions+=_cd_l
@@ -74,6 +74,12 @@ doc() { cd /usr/share/doc/$1 }
 compdef '_files -W /usr/share/doc -/' doc
 
 alias giti='git init && git add . && git commit -minitial\ checkin && git tag orig'
+gbs() {
+  local branch; branch="$(git symbolic-ref -q HEAD)"; branch="${branch##*/}"
+  git config branch.${branch}.remote ${1:-origin}
+  git config branch.${branch}.merge refs/heads/${branch}
+  git config branch.${branch}.rebase true
+}
 
 if whence mtail >/dev/null; then
   alias t=mtail
@@ -122,7 +128,9 @@ alias d2b='baseconv 10 2'
 alias d2h='baseconv 10 16'
 alias h2d='baseconv 16 10'
 alias d2o='baseconv 10 8'
-alias o2d='baseconv 8 10'
+alias d2o='baseconv 10 8'
+alias h2b='baseconv 16 2'
+alias b2h='baseconv 2 16'
 
 alias sendmail=/usr/sbin/sendmail
 
@@ -135,16 +143,16 @@ _LANGUAGES[de]=deu
 _LANGUAGES[es]=spa
 _LANGUAGES[fr]=fra
 _LANGUAGES[it]=ita
-_LANGUAGES[lt]=lat
+_LANGUAGES[tn]=lat
 for l0 in ${(k)_LANGUAGES}; do
   for l1 in ${(k)_LANGUAGES}; do
-    eval "_${l0}-${l1}() { _d -d fd-${_LANGUAGES[$l0]}-${_LANGUAGES[$l1]} \$* }"
-    eval "${l0}-${l1}() { d -d fd-${_LANGUAGES[$l0]}-${_LANGUAGES[$l1]} \$* }"
+    eval "function _${l0}-${l1}() { _d -d fd-${_LANGUAGES[$l0]}-${_LANGUAGES[$l1]} \$* }"
+    eval "function ${l0}-${l1}() { d -d fd-${_LANGUAGES[$l0]}-${_LANGUAGES[$l1]} \$* }"
   done
 done
 unset '_LANGUAGES[en]'
 for l in ${(k)_LANGUAGES}; do
-  eval "${l}() { (_${l}-en \$*; _en-${l} \$*) | more }"
+  eval "function ${l}() { (_${l}-en \$*; _en-${l} \$*) | more }"
 done
 unset _LANGUAGES