Improve zsh config

bin/git-co

@@ -10,6 +10,4 @@ source "$DOTFILES_PATH/scripts/core/_main.sh"
 ##? Usage:
 ##?    git-co <thing>
 
-docs::eval "$@"
-
 git checkout $thing

bin/git-discard

@@ -10,8 +10,6 @@ source "$DOTFILES_PATH/scripts/core/_main.sh"
 ##? Usage:
 ##?    git-discard
 
-docs::eval "$@"
-
 git add -A
 git reset --hard >/dev/null 2>&1
 echo 'All changes has been discarded!'

bin/git-undo

@@ -10,6 +10,4 @@ source "$DOTFILES_PATH/scripts/core/_main.sh"
 ##? Usage:
 ##?    git-undo
 
-docs::eval "$@"
-
 git reset HEAD~1 --mixed

dotfiles_template/shell/_aliases/git.sh → dotfiles_template/shell/aliases.sh

@@ -1,3 +1,13 @@
+# Enable aliases to be sudo’ed
+alias sudo='sudo '
+
+alias ..="cd .."
+alias ...="cd ../.."
+alias ll="ls -l"
+alias la="ls -la"
+alias ~="cd ~"
+
+# Git
 alias gaa="git add -A"
 alias gc="dot git commit"
 alias gca="git add --all && git commit --amend --no-edit"
@@ -10,3 +20,9 @@ alias gpsf="git push --force"
 alias gpl="git pull --rebase --autostash"
 alias gb="git branch"
 alias gl="dot git pretty-log"
+
+# Utils
+alias k='kill -9'
+alias i.='(idea $PWD &>/dev/null &)'
+alias c.='(code $PWD &>/dev/null &)'
+alias o.='open .'

dotfiles_template/shell/functions.sh

@@ -0,0 +1,37 @@
+function cdd() {
+  cd "$(ls -d -- */ | fzf)" || echo "Invalid directory"
+}
+
+function j() {
+  fname=$(declare -f -F _z)
+
+  [ -n "$fname" ] || source "$DOTFILES_PATH/modules/z/z.sh"
+
+  _z "$1"
+}
+
+function recent_dirs() {
+  # This script depends on pushd. It works better with autopush enabled in ZSH
+  escaped_home=$(echo $HOME | sed 's/\//\\\//g')
+  selected=$(dirs -p | sort -u | fzf)
+
+  cd "$(echo "$selected" | sed "s/\~/$escaped_home/")" || echo "Invalid directory"
+}
+
+reverse-search() {
+  local selected num
+  setopt localoptions noglobsubst noposixbuiltins pipefail HIST_FIND_NO_DUPS 2> /dev/null
+
+  selected=( $(fc -rl 1 |
+    FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} $FZF_DEFAULT_OPTS -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort $FZF_CTRL_R_OPTS --query=${(qqq)LBUFFER} +m" fzf) )
+  local ret=$?
+  if [ -n "$selected" ]; then
+    num=$selected[1]
+    if [ -n "$num" ]; then
+      zle vi-fetch-history -n $num
+    fi
+  fi
+  zle redisplay
+  typeset -f zle-line-init >/dev/null && zle zle-line-init
+  return $ret
+}

dotfiles_template/shell/init.sh

@@ -1,9 +1,5 @@
 # This is a useful file to have the same aliases/functions in bash and zsh
 
-# Enable aliases to be sudo’ed
-alias sudo='sudo '
-
-# Register custom aliases and functions
-for aliasToSource in "$DOTFILES_PATH/shell/_aliases/"*; do source "$aliasToSource"; done
-for exportToSource in "$DOTFILES_PATH/shell/_exports/"*; do source "$exportToSource"; done
-for functionToSource in "$DOTFILES_PATH/shell/_functions/"*; do source "$functionToSource"; done
+source "$DOTFILES_PATH/shell/aliases.sh"
+source "$DOTFILES_PATH/shell/exports.sh"
+source "$DOTFILES_PATH/shell/functions.sh"

dotfiles_template/shell/zsh/.zimrc

@@ -7,6 +7,4 @@ zmodule zsh-users/zsh-autosuggestions
 zmodule zsh-users/zsh-syntax-highlighting
 zmodule zimfw/completion
 
-ztermtitle='%~'
-
 zhighlighters=(main brackets)

dotfiles_template/shell/zsh/.zshrc

@@ -20,4 +20,5 @@ fpath=("$DOTLY_PATH/shell/zsh/themes" "$DOTLY_PATH/shell/zsh/completions" $fpath
 autoload -Uz promptinit && promptinit
 prompt codelytv
 
+source "$DOTFILES_PATH/shell/zsh/key-bindings.zsh"
 source "$DOTLY_PATH/shell/zsh/bindings/reverse_search.zsh"

dotfiles_template/shell/zsh/key-bindings.zsh

@@ -0,0 +1 @@
+# All bindings can be found https://www.zsh.org/mla/users/2014/msg00266.html

scripts/mac/apply_defaults

@@ -7,6 +7,5 @@ source "$DOTLY_PATH/scripts/core/_main.sh"
 ##?
 ##? Usage:
 ##?   apply_defaults
-docs::eval "$@"
 
 sh "$DOTLY_PATH/scripts/mac/utils/defaults.sh"

scripts/shell/zsh

@@ -10,7 +10,6 @@ source "$DOTLY_PATH/scripts/core/_main.sh"
 ##?   zsh test_performance
 ##?   zsh reload_completions
 ##?   zsh clean_cache
-docs::eval "$@"
 
 case $1 in
 "optimize")