From 77fa036bc60262360da6b7d00e22cd825db5fd53 Mon Sep 17 00:00:00 2001
From: Fuad Saud <fuadfsaud@gmail.com>
Date: Wed, 13 Sep 2017 20:04:12 -0300
Subject: [PATCH] Add a buncha zsh aliases

---
 zsh/aliases.zsh |  7 ++++---
 zsh/fasd.zsh    | 13 +++++++++++++
 zsh/rc.zsh      |  3 ++-
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 zsh/fasd.zsh

diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 0301480..0a54a36 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -11,7 +11,6 @@ alias vhalt="vagrant halt"
 alias vssh="vagrant ssh"
 alias vup="vagrant up"
 alias vi="vim"
-alias v="vim"
 alias vplug="vim +PlugInstall +qall"
 alias yt="youtube-dl -t"
 
@@ -28,7 +27,8 @@ alias sd='fasd -sid'     # interactive directory selection
 alias sf='fasd -sif'     # interactive file selection
 alias z='fasd_cd -d'     # cd, same functionality as j in autojump
 alias zz='fasd_cd -d -i' # cd with interactive selection
-alias j='fasd_cd -d'
+alias j="fasd_jump"
+alias nv="fasd_edit"
 
 alias nude="nu utils docker-env"
 alias nusss="nu security scope show"
@@ -36,4 +36,5 @@ alias nussa="nu security scope add"
 alias nussf="nu security scope find"
 alias numq="nu mordor query so - --accept application/json | jq ."
 alias nuclone="nu projects clone"
-alias nuzag="nu inutils zagallo"
+alias zagallo="nu inutils zagallo"
+alias acq="$NU_HOME/playbook-acquisition/bin/console"
diff --git a/zsh/fasd.zsh b/zsh/fasd.zsh
new file mode 100644
index 0000000..3771857
--- /dev/null
+++ b/zsh/fasd.zsh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+function fasd_jump {
+  [ $# -gt 0 ] && fasd_cd -d "$*" && return
+  local dir
+  dir="$(fasd -Rdl "$1" | fzf -1 -0 --no-sort +m)" && cd "${dir}" || return 1
+}
+
+function fasd_edit {
+    [ $# -gt 0 ] && fasd -f -e ${EDITOR} "$*" && return
+    local file
+    file="$(fasd -Rfl "$1" | fzf -1 -0 --no-sort +m)" && ${EDITOR} "${file}" || return 1
+}
diff --git a/zsh/rc.zsh b/zsh/rc.zsh
index 6dc765b..d6d0689 100644
--- a/zsh/rc.zsh
+++ b/zsh/rc.zsh
@@ -18,9 +18,10 @@ unsetopt correct
 
 setopt interactivecomments
 
-source "${ZDOTDIR:-$HOME}/.zsh/aliases.zsh"
+source "${ZDOTDIR:-$HOME}/.zsh/fasd.zsh"
 source "${ZDOTDIR:-$HOME}/.zsh/fzf.zsh"
 source "${ZDOTDIR:-$HOME}/.zsh/colors.zsh"
+source "${ZDOTDIR:-$HOME}/.zsh/aliases.zsh"
 
 # source completions
 compctl -g "${HOME}/.teamocil/*(:t:r)" teamocil