[zhs] Alias and LESS filter.

* add LESS file filter
* don't use grc if not installed
* fix aliases with sudo and watch
* source fzf (https://github.com/junegunn/fzf) if found

5 files changed, 23 insertions, 3 deletions

diff --git a/files/.lessfilter.sh b/files/.lessfilter.sh
new file mode 100755
index 0000000..86d6833
--- /dev/null
+++ b/files/.lessfilter.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+case $1 in
+    *.xml) if [ -x `which xmlstarlet 2>/dev/null` ]; then exec xmlstarlet fo "$1"; fi ;;
+    *.json) if [ -x `which jq 2>/dev/null` ]; then exec jq -C . "$1"; fi ;;
+    *.md) if [ -x `which pandoc 2>/dev/null` ]; then exec pandoc -t plain "$1"; fi ;;
+esac
+
+exit 1
diff --git a/files/.zsh/rc/S20_environment b/files/.zsh/rc/S20_environment
index 02cf5fe..ebabb5f 100644
--- a/files/.zsh/rc/S20_environment
+++ b/files/.zsh/rc/S20_environment
@@ -18,7 +18,9 @@ export MANWIDTH=80
 export EDITOR=vim
 export VISUAL=vim
 export LESS=FRSX
-if [ -f "/usr/share/source-highlight/src-hilite-lesspipe.sh" ] ; then
+if [ -f "$HOME/.lessfilter.sh" ] ; then
+    export LESSOPEN="| $HOME/.lessfilter.sh %s"
+elif [ -f "/usr/share/source-highlight/src-hilite-lesspipe.sh" ] ; then
     export LESSOPEN="| /usr/share/source-highlight/src-hilite-lesspipe.sh %s"
 elif [ -f "/usr/bin/src-hilite-lesspipe.sh" ] ; then
     export LESSOPEN="| /usr/bin/src-hilite-lesspipe.sh %s"
diff --git a/files/.zsh/rc/S50_aliases b/files/.zsh/rc/S50_aliases
index c498fd5..81c88e8 100644
--- a/files/.zsh/rc/S50_aliases
+++ b/files/.zsh/rc/S50_aliases
@@ -1,3 +1,7 @@
+# Fix aliases
+alias sudo='sudo '
+alias watch='watch '
+
 # Remove grml aliasses
 unalias ag
 
@@ -20,8 +24,10 @@ alias ls='ls --color=auto -h -F'
 alias rm='rm --interactive=once'
 alias mv='mv --interactive'
 
-alias ping='grc ping'
-alias dig='grc dig'
+if $(which grc >/dev/null) ; then
+    alias ping='grc ping'
+    alias dig='grc dig'
+fi
 
 alias display_off='xset dpms force off'
 
diff --git a/files/.zsh/rc/S90_fzf b/files/.zsh/rc/S90_fzf
new file mode 100644
index 0000000..67cb4e9
--- /dev/null
+++ b/files/.zsh/rc/S90_fzf
@@ -0,0 +1 @@
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
diff --git a/install.sh b/install.sh
index 366fc89..efa3ddf 100755
--- a/install.sh
+++ b/install.sh
@@ -50,8 +50,10 @@ after_install() {
     mkdir -p $HOME/tmp/vim-undo $HOME/tmp/vim-backup
     mkdir -p $HOME/.mutt/cache
     touch $HOME/.mutt/aliases
+    [ -f $HOME/.fzf.zsh ] || echo "No fzf."
     check_command ctags
     check_command ag
+    check_command grc
 }
 
 check_override() {