Merge branch 'master' of https://github.com./Matir/skel

dotfiles/aliases

@@ -40,4 +40,4 @@ alias drop_caches="echo 3 | sudo /usr/bin/tee /proc/sys/vm/drop_caches"
 alias gettemp='printf "%02.2f\n" "$(cat /sys/class/thermal/thermal_zone0/temp)e-3"'
 
 # get git working directory
-alias gitroot="git rev-parse --git-toplevel"
+alias gitroot="git rev-parse --show-toplevel"

dotfiles/vimrc

@@ -29,6 +29,20 @@ imap <S-Tab> <Esc><<A
 set number
 set ruler
 
+" Setup viminfo for recording positions, etc.
+set viminfo='10,\"100,:20,%,n~/.viminfo
+" Jump back when editing a file
+function! ResCur()
+  if line("'\"") <= line("$")
+    normal! g`"
+    return 1
+  endif
+endfunction
+augroup resCur
+  autocmd!
+  autocmd BufWinEnter * call ResCur()
+augroup END
+
 " File options
 set encoding=utf-8
 " Syntax highlighting, look and feel

dotfiles/zshrc.d/lesshighlight.zsh

@@ -0,0 +1,8 @@
+test -f /usr/share/source-highlight/src-hilite-lesspipe.sh && \
+  function srcless {
+    if [ $# -ne 1 ] ; then
+      echo "$0 <what>" > /dev/stderr
+      return 1
+    fi
+    /usr/share/source-highlight/src-hilite-lesspipe.sh $1 | less -R
+  }

packages.cli

@@ -37,6 +37,7 @@ radare2
 scapy
 scdaemon
 socat
+source-highlight
 sqlite3
 ufw
 zsh-syntax-highlighting