7 files changed, 28 insertions, 8 deletions
diff --git a/.zsh/colored-man-pages.zsh b/vim/.vim/.vim/.zsh/colored-man-pages.zsh
index 6854d97..6854d97 100644
--- a/.zsh/colored-man-pages.zsh
+++ b/vim/.vim/.vim/.zsh/colored-man-pages.zsh
diff --git a/.zsh/functions/chpwd_update_git_vars b/vim/.vim/.vim/.zsh/functions/chpwd_update_git_vars
index 2cc7ffa..2cc7ffa 100644
--- a/.zsh/functions/chpwd_update_git_vars
+++ b/vim/.vim/.vim/.zsh/functions/chpwd_update_git_vars
diff --git a/.zsh/functions/precmd_update_git_vars b/vim/.vim/.vim/.zsh/functions/precmd_update_git_vars
index 7fa32df..7fa32df 100644
--- a/.zsh/functions/precmd_update_git_vars
+++ b/vim/.vim/.vim/.zsh/functions/precmd_update_git_vars
diff --git a/.zsh/functions/preexec_update_git_vars b/vim/.vim/.vim/.zsh/functions/preexec_update_git_vars
index 998de21..998de21 100644
--- a/.zsh/functions/preexec_update_git_vars
+++ b/vim/.vim/.vim/.zsh/functions/preexec_update_git_vars
diff --git a/.zsh/functions/prompt_git_info b/vim/.vim/.vim/.zsh/functions/prompt_git_info
index d492ac8..d492ac8 100644
--- a/.zsh/functions/prompt_git_info
+++ b/vim/.vim/.vim/.zsh/functions/prompt_git_info
diff --git a/.zsh/functions/update_current_git_vars b/vim/.vim/.vim/.zsh/functions/update_current_git_vars
index 716d984..716d984 100644
--- a/.zsh/functions/update_current_git_vars
+++ b/vim/.vim/.vim/.zsh/functions/update_current_git_vars
diff --git a/.zshrc b/vim/.vim/.vim/.zshrc
index 14d832f..1a8c909 100644
--- a/.zshrc
+++ b/vim/.vim/.vim/.zshrc
@@ -23,9 +23,9 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH
 
 #█▓▒░ preferred editor for local and remote sessions
 if [[ -n $SSH_CONNECTION ]]; then
-	export EDITOR='nano'
+	export EDITOR='vi'
 else
-	export EDITOR='sublime_text'
+	export EDITOR='vim'
 fi
 
 #█▓▒░ aliases
@@ -39,12 +39,10 @@ alias matrix="cmatrix -b -s"
 alias pipes="bash ~/code/fun/pipes"
 alias pipesx="bash ~/code/fun/pipesx"
 alias rain="bash ~/code/fun/rain.sh"
-alias sai="sudo apt-get install"
-alias screenfetch="~/code/fun/screenfetch"
 alias invert="xcalib -i -a"
 alias mixer="alsamixer"
-alias disks="palimpsest"
-alias photoshop="playonlinux --run photoshop_portable"
+alias xdefaults="xrdb -merge ~/.Xdefaults"
+alias sublime="subl"
 alias tempwatch="while :; do sensors|while read x; do printf '% .23s\n' "$x"; done; sleep 1 && clear; done;"
 alias term='urxvtc -hold -e ' #used for awesomewm run menu
 alias fixcursor='xsetroot -cursor_name left_ptr'
@@ -105,15 +103,37 @@ setopt HIST_EXPIRE_DUPS_FIRST
 setopt EXTENDED_HISTORY
 setopt SHARE_HISTORY
 
+#█▓▒░ keybindings
+typeset -A key
+key[Home]=${terminfo[khome]}
+key[End]=${terminfo[kend]}
+key[Insert]=${terminfo[kich1]}
+key[Delete]=${terminfo[kdch1]}
+key[Up]=${terminfo[kcuu1]}
+key[Down]=${terminfo[kcud1]}
+key[Left]=${terminfo[kcub1]}
+key[Right]=${terminfo[kcuf1]}
+key[PageUp]=${terminfo[kpp]}
+key[PageDown]=${terminfo[knp]}
+
+# setup key accordingly
+[[ -n "${key[Home]}"    ]]  && bindkey  "${key[Home]}"    beginning-of-line
+[[ -n "${key[End]}"     ]]  && bindkey  "${key[End]}"     end-of-line
+[[ -n "${key[Insert]}"  ]]  && bindkey  "${key[Insert]}"  overwrite-mode
+[[ -n "${key[Delete]}"  ]]  && bindkey  "${key[Delete]}"  delete-char
+[[ -n "${key[Up]}"      ]]  && bindkey  "${key[Up]}"      up-line-or-history
+[[ -n "${key[Down]}"    ]]  && bindkey  "${key[Down]}"    down-line-or-history
+[[ -n "${key[Left]}"    ]]  && bindkey  "${key[Left]}"    backward-char
+[[ -n "${key[Right]}"   ]]  && bindkey  "${key[Right]}"   forward-char
+
 #█▓▒░ custom prompts
 
 #█▓▒░dual line
 PROMPT="%F{cyan}┌[%F{white}%n@%M%F{cyan}]─[%F{red}%~%F{cyan}]
 %F{cyan}└─ %F{white}"
-#RPROMPT="%F{cyan}[%F{white}%n@%M%F{cyan}]"
 
 #█▓▒░ ninja
-PROMPT="%F{white}        ▟▙    %F{red}%~%F{white}
+PROMPT="%F{white}        ▟▙    %F{red}%~%F $(prompt_git_info) {white}
 ▟▒%F{blue}░░░░░░░%F{white}▜▙▜████████████████████████████████▛
 ▜▒%F{blue}░░░░░░░%F{white}▟▛▟▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▛
         ▜▛