Screen Support - Servername in Title

.gitmodules

@@ -1,3 +1,12 @@
-[submodule "git-prompt"]
-	path = git-prompt
-	url = https://github.com/olivierverdier/zsh-git-prompt.git
+[submodule "zsh-completions"]
+	path = plugins/zsh-completions
+	url = https://github.com/argo1984/zsh-completions.git
+[submodule "zsh-git-prompt"]
+	path = plugins/zsh-git-prompt
+	url = https://github.com/argo1984/zsh-git-prompt.git
+[submodule "plugins/kube-ps1"]
+	path = plugins/kube-ps1
+	url = https://github.com/jonmosco/kube-ps1.git
+[submodule "themes/powerlevel10k"]
+	path = themes/powerlevel10k
+	url = https://github.com/romkatv/powerlevel10k.git

.zshrc.core

@@ -1,5 +1,5 @@
 ############### backspace fix ########
-stty erase 
+stty erase ""
 
 ############### colors ###############
 LS_COLORS=''
@@ -54,28 +54,27 @@ bindkey "\eOF" end-of-line
 bindkey "\e[4~" end-of-line
 bindkey "\e[F" end-of-line
 
-bindkey "\eOc" forward-word
-bindkey "\e[1;5C" forward-word
-bindkey "\eOC" forward-word
-bindkey "\eO5C" forward-word
-
-bindkey "\eOd" backward-word
-bindkey "\e[1;5D" backward-word
-bindkey "\eOD" backward-word
-bindkey "\eO5D" backward-word
+bindkey "^[[1;3C" forward-word  # [Alt-RightArrow] - move forward one word
+bindkey '[C' forward-word       # [Alt-RightArrow] - move forward one word MacOS
+bindkey "^[[1;3D" backward-word # [Alt-LeftArrow] - move backward one word
+bindkey '[D' backward-word      # [Alt-LeftArrow] - move backward one word MacOS
 
 bindkey "\e[3~" delete-char-or-list
 bindkey "" delete-char-or-list
 
 bindkey "OM" accept-line
 
 bindkey "^A" beginning-of-line
-bindkey "^B" backward-char
 bindkey "^D" delete-char-or-list
 bindkey "^E" end-of-line
-bindkey "^F" forward-char
 bindkey "^G" send-break
-bindkey "^H" backward-delete-char
+
+# [Backspace] - delete backward
+bindkey -M emacs '^?' backward-delete-char
+bindkey -M viins '^?' backward-delete-char
+bindkey -M vicmd '^?' backward-delete-char
+bindkey '^?' backward-delete-char
+
 bindkey "^I" expand-or-complete
 bindkey "^J" accept-line
 bindkey "^K" kill-line
@@ -100,21 +99,30 @@ alias rm='rm -i'
 alias mv='mv -i'
 alias cp='cp -i'
 
-alias ls='ls --color=yes -F'
+UNAMESTR=`uname`
+
+if [ $UNAMESTR = 'Darwin' ]
+then
+  alias ls='ls -F'
+  alias ps='ps auxw'
+else
+  alias ls='ls --color=yes -F'
+  alias ps='ps aufwx'
+fi
 alias l='ls -alh'
 alias ll='ls -lh'
 alias ..='cd ..'
-alias ...='cd ..; cd ..'
+alias ...='cd ../..'
+alias ....='cd ../../../
 alias cdd='cd -' # goto last dir cd'ed from
-alias ps='ps aufxw'
 alias z='vim ~/.zsh/.zshrc.core && source ~/.zshrc'
 alias vim='vim -o'
 
 # screen
-alias sls='screen -ls'
-alias sr='screen -dRR'
-alias ss='screen -S'
-alias sx='screen -x'
+# alias sls='screen -ls'
+# alias sr='screen -dRR'
+# alias ss='screen -S'
+# alias sx='screen -x'
 
 # git
 alias g='git status'
@@ -128,6 +136,7 @@ alias ga='git add'
 alias gaa='git add -A'
 alias gcm='git commit'
 alias gcma='git commit --amend'
+alias gclb="git remote prune origin && git branch -vv | grep 'origin/.*: gone]' | awk '{print \$1}' | xargs git branch -d"
 alias gd='git diff --color'
 alias gdc='git diff --color --cached'
 alias gdw='git diff -w'
@@ -143,6 +152,12 @@ alias grs='git rebase --skip'
 alias grom='git rebase origin/master'
 alias gsu='git submodule update'
 
+alias devopsrepo='cd ~/xempusgit/plat/devops'
+alias managerrepo='cd ~/xempusgit/xbm/manager'
+
+# alias ^H='stty erase ^H'
+# alias ^?='stty errase ^?'
+
 ############### functions #############
 
 # git
@@ -154,6 +169,9 @@ function gri() {
   fi
 }
 
+#zsh-completions
+fpath=(plugins/zsh-completions/src $fpath)
+
 ############### modules ###############
 autoload colors zsh/terminfo
 if [[ "$terminfo[colors]" -ge 8 ]]; then
@@ -294,13 +312,58 @@ compctl -g "*(-/) .*(-/)" cd rmdir
 
 
 ############### git prompt ###########
-source ~/.zsh/git-prompt/zshrc.sh
+source ~/.zsh/plugins/zsh-git-prompt/zshrc.sh
+
+if command -v kubectl > /dev/null; then
+  ############ kubectl completion ######
+  source <(kubectl completion zsh)
+fi
+
+########### powerlevel 10k ###########
+source ~/.zsh/themes/powerlevel10k/powerlevel10k.zsh-theme
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f ~/.zsh/.p10k.zsh ]] || source ~/.zsh/.p10k.zsh
+
+######## terraform completion #######
+if command -v terraform > /dev/null; then
+  complete -o nospace -C $(which terraform) terraform
+fi
 
 ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg_bold[red]%}✖"
 ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg_bold[blue]%}✚"
 
 setopt promptsubst
 setopt promptpercent
+if [ "$EUID" -ne 0 ]
+then
+PROMPT='
+%{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%M%{$reset_color%}: %{$fg_bold[green]%}%~%{$reset_color%} $(git_super_status) 
+> '
+else
 PROMPT='
-%{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%m%{$reset_color%}: %{$fg_bold[green]%}%~%{$reset_color%} $(git_super_status)
+%{$fg[red]%}%n%{$reset_color%}@%{$fg[yellow]%}%M%{$reset_color%}: %{$fg_bold[green]%}%~%{$reset_color%} $(git_super_status) 
 > '
+fi
+
+if [[ ${TERM} == "screen-bce" || ${TERM} == "screen" ]]; then
+  precmd () { print -Pn "\033k\033\134\033k%m[%1d]\033\134" }
+  preexec () { print -Pn "\033k\033\134\033k%m[$1]\033\134" }
+else
+  precmd () { print -Pn "\e]0;%n@%m: %~\a" }
+  preexec () { print -Pn "\e]0;%n@%m: $1\a" }
+fi
+
+h=()
+if [[ -r ~/.ssh/config ]]; then
+  h=($h ${${${(@M)${(f)"$(cat ~/.ssh/config)"}:#Host *}#Host }:#*[*?]*})
+fi
+if [[ -r ~/.ssh/known_hosts ]]; then
+  h=($h ${${${(f)"$(cat ~/.ssh/known_hosts{,2} || true)"}%%\ *}%%,*}) 2>/dev/null
+fi
+if [[ -r /etc/hosts ]]; then
+  h=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}}
+fi
+if [[ $#h -gt 0 ]]; then
+  zstyle ':completion:*:ssh:*' hosts $h
+  zstyle ':completion:*:slogin:*' hosts $h
+fi

README.md

@@ -6,8 +6,8 @@ Zsh 4.3+ Config directory
  1. Backup your ~/.zsh/ directory in case u have such
  2. Clone the repository under your `~/` directory:
 
-         cd ~ && git clone git://github.com/naglik/zshconfig .zsh --recursive
+         cd ~ && git clone git://github.com/argo1984/zshconfig .zsh --recursive
 
  3. Source the config files in your `.zshrc`
 
-         source ~/.zsh/.zshrc.core
+         cd ~ && echo "source ~/.zsh/.zshrc.core" > .zshrc