From 9122889375eb45fb54de4824f2ef6e81012d1cd8 Mon Sep 17 00:00:00 2001
From: umgbhalla <umg.bhalla88@gmail.com>
Date: Sat, 4 Jun 2022 19:58:32 +0530
Subject: [PATCH] feat(zsh): new zsh config structure and better utilised
 zcompile

---
 base/zsh/.config/zsh/.zcompdump     | 399 ++++++++++++++++------------
 base/zsh/.config/zsh/.zshrc         |  24 +-
 base/zsh/.config/zsh/aliases.zsh    |   2 -
 base/zsh/.config/zsh/completion.zsh |  63 +++--
 base/zsh/.config/zsh/git.zsh        |   2 +
 base/zsh/.config/zsh/keys.zsh       |  15 ++
 base/zsh/.config/zsh/kubctl.zsh     | 196 +++++++++++++-
 base/zsh/.config/zsh/opts.zsh       |   4 +-
 base/zsh/.config/zsh/profile.zsh    |   2 +-
 base/zsh/.config/zsh/prompt.zsh     |   3 +-
 10 files changed, 500 insertions(+), 210 deletions(-)

diff --git a/base/zsh/.config/zsh/.zcompdump b/base/zsh/.config/zsh/.zcompdump
index b2dd0925..ac7d996a 100644
--- a/base/zsh/.config/zsh/.zcompdump
+++ b/base/zsh/.config/zsh/.zcompdump
@@ -1,4 +1,4 @@
-#files: 813	version: 5.8.1
+#files: 845	version: 5.9
 
 _comps=(
 '-' '_precommand'
@@ -51,8 +51,10 @@ _comps=(
 'appletviewer' '_java'
 'apropos' '_man'
 'apvlv' '_pdf'
+'arduino-ctags' '_ctags'
 'arecord' '_alsa-utils'
 'arena' '_webbrowser'
+'_arguments' '__arguments'
 'arp' '_arp'
 'arping' '_arping'
 '-array-value-' '_value'
@@ -77,6 +79,7 @@ _comps=(
 'base32' '_base64'
 'base64' '_base64'
 'basename' '_basename'
+'basenc' '_basenc'
 'bash' '_bash'
 'bat' '_bat'
 'batch' '_at'
@@ -134,6 +137,11 @@ _comps=(
 'cabal' '_cabal'
 'cal' '_cal'
 'calendar' '_calendar'
+'calibre' '_calibre'
+'calibredb' '_calibre'
+'calibre-debug' '_calibre'
+'calibre-server' '_calibre'
+'calibre-smtp' '_calibre'
 'cargo' '_cargo'
 'cat' '_cat'
 'catchsegv' '_precommand'
@@ -158,6 +166,7 @@ _comps=(
 'chkconfig' '_chkconfig'
 'chkstow' '_stow'
 'chmod' '_chmod'
+'choom' '_choom'
 'chown' '_chown'
 'chpass' '_chsh'
 'chroot' '_chroot'
@@ -206,12 +215,17 @@ _comps=(
 'cpupower' '_cpupower'
 'createdb' '_postgresql'
 'createuser' '_postgresql'
+'crictl' '_crictl'
 'crontab' '_crontab'
 'crsh' '_cssh'
 'cryptsetup' '_cryptsetup'
 'cscope' '_cscope'
 'csh' '_sh'
+'csplit' '_csplit'
 'cssh' '_cssh'
+'ctags' '_ctags'
+'ctags-exuberant' '_ctags'
+'ctags-universal' '_ctags'
 'curl' '_curl'
 'cut' '_cut'
 'cvs' '_cvs'
@@ -263,6 +277,7 @@ _comps=(
 'dos2unix' '_dos2unix'
 'downgrade' '_downgrade'
 'drill' '_drill'
+'dropbox' '_dropbox'
 'dropdb' '_postgresql'
 'dropuser' '_postgresql'
 'dsh' '_dsh'
@@ -280,6 +295,11 @@ _comps=(
 'dwb' '_webbrowser'
 'e2label' '_e2label'
 'eatmydata' '_precommand'
+'ebook-convert' '_calibre'
+'ebook-edit' '_calibre'
+'ebook-meta' '_calibre'
+'ebook-polish' '_calibre'
+'ebook-viewer' '_calibre'
 'ecasound' '_ecasound'
 'echotc' '_echotc'
 'echoti' '_echoti'
@@ -308,6 +328,7 @@ _comps=(
 'eview' '_vim'
 'evim' '_vim'
 'evince' '_evince'
+'ex' '_vi'
 'exa' '_exa'
 'exec' '_exec'
 'expand' '_unexpand'
@@ -322,6 +343,7 @@ _comps=(
 'fc-match' '_xft_fonts'
 'fd' '_fd'
 'feh' '_feh'
+'fetch-ebook-metadata' '_calibre'
 'fetchmail' '_fetchmail'
 'ffmpeg' '_ffmpeg'
 'fg' '_jobs_fg'
@@ -571,10 +593,13 @@ _comps=(
 'hd' '_hexdump'
 'head' '_head'
 'heat' '_openstack'
+'_helm' '_helm'
+'helm' '_helm'
 'help' '_sccs'
 'herbstclient' '_herbstclient'
 'hexdump' '_hexdump'
 'hilite' '_precommand'
+'histed' '_zed'
 'history' '_fc'
 'host' '_host'
 'hostname' '_hostname'
@@ -655,6 +680,7 @@ _comps=(
 'ksh' '_sh'
 'ksh88' '_sh'
 'ksh93' '_sh'
+'kubectl' '_kubectl'
 'kvno' '_kvno'
 'last' '_last'
 'lastb' '_last'
@@ -685,6 +711,7 @@ _comps=(
 'localedef' '_localedef'
 'locate' '_locate'
 'log' '_nothing'
+'logger' '_logger'
 'loginctl' '_loginctl'
 'logname' '_nothing'
 'look' '_look'
@@ -697,12 +724,15 @@ _comps=(
 'lpr' '_lp'
 'lprm' '_lp'
 'lpstat' '_lp'
+'lrf2lrs' '_calibre'
+'lrfviewer' '_calibre'
 'ls' '_ls'
 'lsattr' '_lsattr'
 'lsblk' '_lsblk'
 'lsdiff' '_patchutils'
 'lsinitcpio' '_mkinitcpio'
 'lsmod' '_modutils'
+'lsns' '_lsns'
 'lsof' '_lsof'
 'lsusb' '_lsusb'
 'ltrace' '_ltrace'
@@ -729,6 +759,8 @@ _comps=(
 'manage.py' '_django'
 'manila' '_openstack'
 'mark' '_mh'
+'mat' '_mat'
+'mat2' '_mat2'
 '-math-' '_math'
 'matlab' '_matlab'
 'mattrib' '_mtools'
@@ -830,6 +862,8 @@ _comps=(
 'nedit' '_nedit'
 'nedit-nc' '_nedit'
 'netcat' '_netcat'
+'netctl' '_netctl'
+'netctl-auto' '_netctl'
 'netrik' '_webbrowser'
 'netscape' '_netscape'
 'netstat' '_netstat'
@@ -854,6 +888,7 @@ _comps=(
 'nova' '_openstack'
 'npm' '_npm'
 'ns' '_hosts'
+'nsenter' '_nsenter'
 'nslookup' '_nslookup'
 'ntalk' '_other_accounts'
 'numfmt' '_numfmt'
@@ -867,13 +902,18 @@ _comps=(
 'oi' '_oi'
 'oksh' '_sh'
 'okular' '_okular'
+'oomctl' '_oomctl'
 'openstack' '_openstack'
 'opera' '_webbrowser'
 'opera-next' '_webbrowser'
 'opkg' '_opkg'
+'opusdec' '_opustools'
+'opusenc' '_opustools'
+'opusinfo' '_opustools'
 'p4' '_perforce'
 'p4d' '_perforce'
 'pacat' '_pulseaudio'
+'pacignore' '_pacignore'
 'pack' '_pack'
 'packf' '_mh'
 'pacman' '_pacman'
@@ -895,6 +935,7 @@ _comps=(
 'patch' '_patch'
 'pax' '_pax'
 'pcat' '_pack'
+'pcp-htop' '_htop'
 'pcred' '_pids'
 'pdf2dsc' '_pdf'
 'pdf2ps' '_pdf'
@@ -911,6 +952,7 @@ _comps=(
 'pdftops' '_pdf'
 'pdftotext' '_pdf'
 'pdksh' '_sh'
+'perf' '_perf'
 'perl' '_perl'
 'perldoc' '_perldoc'
 'pfiles' '_pids'
@@ -956,6 +998,7 @@ _comps=(
 'podgrep' '_perl_modules'
 'podpath' '_perl_modules'
 'podtoc' '_perl_modules'
+'poetry' '_poetry'
 'poff' '_pon'
 'policytool' '_java'
 'polybar' '_polybar'
@@ -970,6 +1013,7 @@ _comps=(
 'powerpill' '_powerpill'
 'powerpill-key' '_powerpill'
 'powerpill.static' '_powerpill'
+'pr' '_pr'
 'prev' '_mh'
 'print' '_print'
 'printenv' '_printenv'
@@ -1003,6 +1047,7 @@ _comps=(
 'pstops' '_psutils'
 'pstotgif' '_pspdf'
 'pswrap' '_postscript'
+'ptx' '_ptx'
 'pulseaudio' '_pulseaudio'
 'pump' '_pump'
 'pushd' '_cd'
@@ -1019,6 +1064,7 @@ _comps=(
 'ranlib' '_ranlib'
 'rar' '_rar'
 'rc' '_sh'
+'_rclone' '_rclone'
 'rclone' '_rclone'
 'rcp' '_rlogin'
 'rcs' '_rcs'
@@ -1053,6 +1099,7 @@ _comps=(
 'restart' '_initctl'
 'retawq' '_webbrowser'
 'rg' '_rg'
+'rgrep' '_grep'
 'rgview' '_vim'
 'rgvim' '_vim'
 'ri' '_ri'
@@ -1113,6 +1160,7 @@ _comps=(
 'setfacl.exe' '_setfacl'
 'setfattr' '_attr'
 'setopt' '_setopt'
+'setpriv' '_setpriv'
 'setsid' '_setsid'
 'setxkbmap' '_setxkbmap'
 'sftp' '_ssh'
@@ -1198,6 +1246,7 @@ _comps=(
 'svnadmin' '_subversion'
 'svnadmin-static' '_subversion'
 'svnlite' '_subversion'
+'svnliteadmin' '_subversion'
 'swaks' '_swaks'
 'swanctl' '_swanctl'
 'swift' '_swift'
@@ -1275,6 +1324,7 @@ _comps=(
 'trial' '_twisted'
 'trove' '_openstack'
 'true' '_nothing'
+'truncate' '_truncate'
 'truss' '_truss'
 'tryaffix' '_ispell'
 'tty' '_tty'
@@ -1316,6 +1366,7 @@ _comps=(
 'unrar' '_rar'
 'unset' '_vars'
 'unsetopt' '_setopt'
+'unshare' '_unshare'
 'unwrapdiff' '_patchutils'
 'unxz' '_xz'
 'unzip' '_zip'
@@ -1336,6 +1387,7 @@ _comps=(
 '-value-,ADB_TRACE,-default-' '_adb'
 '-value-,ANDROID_LOG_TAGS,-default-' '_adb'
 '-value-,ANDROID_SERIAL,-default-' '_adb'
+'-value-,ANSIBLE_INVENTORY_ENABLED,-default-' '_ansible'
 '-value-,ANSIBLE_STDOUT_CALLBACK,-default-' '_ansible'
 '-value-,ANT_ARGS,-default-' '_ant'
 '-value-,CFLAGS,-default-' '_gcc'
@@ -1384,7 +1436,10 @@ _comps=(
 '-value-,XZ_OPT,-default-' '_xz'
 '-vared-' '_in_vared'
 'vared' '_vared'
-'vcsh' '_vcsh'
+'vcs_info_hookadd' '_vcs_info'
+'vcs_info_hookdel' '_vcs_info'
+'vi' '_vi'
+'view' '_vi'
 'vim' '_vim'
 'vimdiff' '_vim'
 'virsh' '_libvirt'
@@ -1418,6 +1473,7 @@ _comps=(
 'whoami' '_nothing'
 'whois' '_whois'
 'whom' '_mh'
+'wifi-menu' '_netctl'
 'wiggle' '_wiggle'
 'wipefs' '_wipefs'
 'wodim' '_cdrecord'
@@ -1439,6 +1495,7 @@ _comps=(
 'xfontsel' '_x_utils'
 'xfreerdp' '_rdesktop'
 'xhost' '_x_utils'
+'xinput' '_xinput'
 'xkill' '_x_utils'
 'xli' '_xloadimage'
 'xloadimage' '_xloadimage'
@@ -1492,7 +1549,6 @@ _comps=(
 'ypxfr' '_yp'
 'ytalk' '_other_accounts'
 'yt-dlp' '_yt-dlp'
-'z' '__zoxide_z_complete'
 'zargs' '_zargs'
 'zathura' '_zathura'
 'zcalc' '_zcalc'
@@ -1500,6 +1556,7 @@ _comps=(
 'zcat' '_zcat'
 'zcompile' '_zcompile'
 'zcp' '_zmv'
+'zdb' '_zfs'
 'zdelattr' '_zattr'
 'zdump' '_zdump'
 'zeal' '_zeal'
@@ -1529,9 +1586,8 @@ _comps=(
 'zone' '_hosts'
 'zoxide' '_zoxide'
 'zparseopts' '_zparseopts'
-'zpool' '_zpool'
+'zpool' '_zfs'
 'zpty' '_zpty'
-'zscroll' '_zscroll'
 'zsetattr' '_zattr'
 'zsh' '_zsh'
 'zsh-mime-handler' '_zsh-mime-handler'
@@ -1581,6 +1637,7 @@ _services=(
 'slogin' 'ssh'
 'svnadmin-static' 'svnadmin'
 'svnlite' 'svn'
+'svnliteadmin' 'svnadmin'
 'tunes2pod.pl' 'tunes2pod'
 'unlzma' 'unxz'
 'xelatex' 'latex'
@@ -1595,6 +1652,7 @@ _patcomps=(
 )
 
 _postpatcomps=(
+'_*' '_compadd'
 'c++-*' '_gcc'
 'g++-*' '_gcc'
 'gcc-*' '_gcc'
@@ -1602,6 +1660,7 @@ _postpatcomps=(
 'lua[0-9.-]##' '_lua'
 '(p[bgpn]m*|*top[bgpn]m)' '_pbm'
 'php[0-9.-]' '_php'
+'pip[0-9.]#' '_pip'
 'pydoc[0-9.]#' '_pydoc'
 'python[0-9.]#' '_python'
 'qemu(|-system-*)' '_qemu'
@@ -1654,169 +1713,175 @@ bindkey '^[,' _history-complete-newer
 bindkey '^[/' _history-complete-older
 bindkey '^[~' _bash_complete-word
 
-autoload -Uz _kitty _alacritty _bat _bluetoothctl _bootctl \
-            _bspc _busctl _bwrap _cargo _code \
-            _coredumpctl _curl _deno _docker _downgrade \
-            _exa _fd _gh _googler _hostnamectl \
-            _hyperfine _journalctl _just _kernel-install _kitty \
-            _libinput _localectl _loginctl _machinectl _meson \
-            _minikube _miniserve _mkinitcpio _mpv _networkctl \
-            _ninja _oi _pacman _paru _playerctl \
-            _polybar _polybar_msg _powerpill _pulseaudio _resolvectl \
-            _rg _rustup _scrcpy _sd_hosts_or_user_at_host _sd_machines \
-            _sd_outputmodes _sd_unit_files _solana _systemctl _systemd \
-            _systemd-analyze _systemd-delta _systemd-inhibit _systemd-nspawn _systemd-path \
-            _systemd-run _systemd-tmpfiles _timedatectl _tldr _udevadm \
-            _xwallpaper _yay _yt-dlp _zathura _zoxide \
-            _cdr _all_labels _all_matches _alternative _approximate \
-            _arg_compile _arguments _bash_completions _cache_invalid _call_function \
-            _combination _complete _complete_debug _complete_help _complete_help_generic \
-            _complete_tag _comp_locale _correct _correct_filename _correct_word \
-            _describe _description _dispatch _expand _expand_alias \
-            _expand_word _extensions _external_pwds _generic _guard \
-            _history _history_complete_word _ignored _list _main_complete \
-            _match _menu _message _most_recent_file _multi_parts \
-            _next_label _next_tags _normal _nothing _oldlist \
-            _pick_variant _prefix _read_comp _regex_arguments _regex_words \
-            _requested _retrieve_cache _sep_parts _sequence _set_command \
-            _setup _store_cache _sub_commands _tags _user_expand \
-            _values _wanted _acpi _acpitool _alsa-utils \
-            _analyseplugin _brctl _btrfs _chattr _chcon \
-            _chrt _cpupower _cryptsetup _dkms _e2label \
-            _ethtool _findmnt _free _fuse_arguments _fusermount \
-            _fuse_values _gpasswd _htop _iconvconfig _ionice \
-            _ipset _iptables _iwconfig _kpartx _losetup \
-            _lsattr _lsblk _lsusb _ltrace _mdadm \
-            _mii-tool _modutils _mondo _networkmanager _opkg \
-            _pidof _pmap _qdbus _schedtool _selinux_contexts \
-            _selinux_roles _selinux_types _selinux_users _setsid _slabtop \
-            _ss _sshfs _strace _sysstat _tload \
-            _tpb _tracepath _tune2fs _uml _valgrind \
-            _vserver _wakeup_capable_devices _wipefs _wpa_cli _a2ps \
-            _aap _abcde _absolute_command_paths _ack _adb \
-            _ansible _ant _antiword _apachectl _apm \
-            _arch_archives _arch_namespace _arp _arping _asciidoctor \
-            _asciinema _at _attr _augeas _avahi \
-            _awk _base64 _basename _bash _baudrates \
-            _baz _beep _bibtex _bind_addresses _bison \
-            _bittorrent _bogofilter _bpf_filters _bpython _bzip2 \
-            _bzr _cabal _cal _calendar _canonical_paths \
-            _cat _ccal _cdcd _cdrdao _cdrecord \
-            _chkconfig _chmod _chown _chroot _chsh \
-            _cksum _clay _cmdambivalent _cmdstring _cmp \
-            _column _comm _composer _compress _configure \
-            _cowsay _cp _cpio _cplay _crontab \
-            _cscope _cssh _ctags_tags _curl _cut \
-            _cvs _darcs _date _date_formats _dates \
-            _dbus _dconf _dd _devtodo _df \
-            _dhclient _dict _dict_words _diff _diff3 \
-            _diff_options _diffstat _dig _directories _dir_list \
-            _django _dmesg _dmidecode _dns_types _doas \
-            _domains _dos2unix _drill _dsh _dtruss \
-            _du _dvi _ecasound _ed _elfdump \
-            _elinks _email_addresses _enscript _entr _env \
-            _espeak _etags _fakeroot _feh _fetchmail \
-            _ffmpeg _figlet _file_modes _files _file_systems \
-            _find _find_net_interfaces _finger _flac _flex \
-            _fmt _fold _fortune _fsh _fuser \
-            _gcc _gcore _gdb _gem _genisoimage \
-            _getconf _getent _getfacl _getmail _getopt \
-            _ghostscript _git _global _global_tags _gnu_generic \
-            _gnupod _gnutls _go _gpg _gphoto2 \
-            _gprof _gradle _graphicsmagick _grep _groff \
-            _groups _growisofs _gsettings _guilt _gzip \
-            _have_glob_qual _head _hexdump _host _hostname \
-            _hosts _iconv _id _ifconfig _iftop \
-            _imagemagick _initctl _init_d _install _iostat \
-            _ip _ipsec _irssi _ispell _java \
-            _java_class _joe _join _jq _killall \
-            _knock _kvno _last _ldconfig _ldd \
-            _ld_debug _less _lha _libvirt _links \
-            _list_files _lldb _ln _loadkeys _locale \
-            _localedef _locales _locate _look _lp \
-            _ls _lsof _lua _luarocks _lynx \
-            _lz4 _lzop _mail _mailboxes _make \
-            _man _md5sum _mencal _mh _mime_types \
-            _mkdir _mkfifo _mknod _mktemp _module \
-            _monotone _moosic _mosh _mount _mpc \
-            _mt _mtools _mtr _mutt _mv \
-            _my_accounts _myrepos _mysqldiff _mysql_utils _ncftp \
-            _netcat _net_interfaces _netstat _newsgroups _nginx \
-            _ngrep _nice _nkf _nl _nm \
-            _nmap _npm _nslookup _numfmt _objdump \
-            _object_files _od _openstack _other_accounts _pack \
-            _pandoc _paste _patch _patchutils _path_commands \
-            _path_files _pax _pbm _pdf _perforce \
-            _perl _perl_basepods _perldoc _perl_modules _pgrep \
+autoload -Uz _alacritty _bat _bluetoothctl _bootctl _bspc \
+            _busctl _bwrap _calibre _cargo _code \
+            _coredumpctl _crictl _curl _deno _docker \
+            _downgrade _exa _fd _gh _googler \
+            _helm _hostnamectl _hyperfine _journalctl _just \
+            _kernel-install _kitty _kubectl _libinput _localectl \
+            _loginctl _machinectl _meson _minikube _miniserve \
+            _mkinitcpio _mpv _netctl _networkctl _ninja \
+            _oi _oomctl _pacignore _pacman _paru \
+            _playerctl _poetry _polybar _polybar_msg _powerpill \
+            _pulseaudio _rclone _resolvectl _rg _rustup \
+            _scrcpy _sd_hosts_or_user_at_host _sd_machines _sd_outputmodes _sd_unit_files \
+            _solana _systemctl _systemd _systemd-analyze _systemd-delta \
+            _systemd-inhibit _systemd-nspawn _systemd-path _systemd-run _systemd-tmpfiles \
+            _timedatectl _tldr _udevadm _xwallpaper _yay \
+            _yt-dlp _zathura _zoxide _cdr _all_labels \
+            _all_matches _alternative _approximate _arg_compile _arguments \
+            _bash_completions _cache_invalid _call_function _combination _complete \
+            _complete_debug _complete_help _complete_help_generic _complete_tag _comp_locale \
+            _correct _correct_filename _correct_word _describe _description \
+            _dispatch _expand _expand_alias _expand_word _extensions \
+            _external_pwds _generic _guard _history _history_complete_word \
+            _ignored _list _main_complete _match _menu \
+            _message _most_recent_file _multi_parts _next_label _next_tags \
+            _normal _nothing _numbers _oldlist _pick_variant \
+            _prefix _read_comp _regex_arguments _regex_words _requested \
+            _retrieve_cache _sep_parts _sequence _set_command _setup \
+            _store_cache _sub_commands _tags _user_expand _values \
+            _wanted _acpi _acpitool _alsa-utils _analyseplugin \
+            _basenc _brctl _btrfs _capabilities _chattr \
+            _chcon _choom _chrt _cpupower _cryptsetup \
+            _dkms _e2label _ethtool _findmnt _free \
+            _fuse_arguments _fusermount _fuse_values _gpasswd _htop \
+            _iconvconfig _ionice _ipset _iptables _iwconfig \
+            _kpartx _losetup _lsattr _lsblk _lsns \
+            _lsusb _ltrace _mat _mat2 _mdadm \
+            _mii-tool _modutils _mondo _networkmanager _nsenter \
+            _opkg _perf _pidof _pmap _qdbus \
+            _schedtool _selinux_contexts _selinux_roles _selinux_types _selinux_users \
+            _setpriv _setsid _slabtop _ss _sshfs \
+            _strace _sysstat _tload _tpb _tracepath \
+            _tune2fs _uml _unshare _valgrind _vserver \
+            _wakeup_capable_devices _wipefs _wpa_cli _a2ps _aap \
+            _abcde _absolute_command_paths _ack _adb _ansible \
+            _ant _antiword _apachectl _apm _arch_archives \
+            _arch_namespace _arp _arping _asciidoctor _asciinema \
+            _at _attr _augeas _avahi _awk \
+            _base64 _basename _bash _baudrates _baz \
+            _beep _bibtex _bind_addresses _bison _bittorrent \
+            _bogofilter _bpf_filters _bpython _bzip2 _bzr \
+            _cabal _cal _calendar _canonical_paths _cat \
+            _ccal _cdcd _cdrdao _cdrecord _chkconfig \
+            _chmod _chown _chroot _chsh _cksum \
+            _clay _cmdambivalent _cmdstring _cmp _column \
+            _comm _composer _compress _configure _cowsay \
+            _cp _cpio _cplay _crontab _cscope \
+            _csplit _cssh _ctags _ctags_tags _curl \
+            _cut _cvs _darcs _date _date_formats \
+            _dates _dbus _dconf _dd _devtodo \
+            _df _dhclient _dict _dict_words _diff \
+            _diff3 _diff_options _diffstat _dig _directories \
+            _dir_list _django _dmesg _dmidecode _dns_types \
+            _doas _domains _dos2unix _drill _dropbox \
+            _dsh _dtruss _du _dvi _ecasound \
+            _ed _elfdump _elinks _email_addresses _enscript \
+            _entr _env _espeak _etags _fakeroot \
+            _feh _fetchmail _ffmpeg _figlet _file_modes \
+            _files _file_systems _find _find_net_interfaces _finger \
+            _flac _flex _fmt _fold _fortune \
+            _fsh _fuser _gcc _gcore _gdb \
+            _gem _genisoimage _getconf _getent _getfacl \
+            _getmail _getopt _ghostscript _git _global \
+            _global_tags _gnu_generic _gnupod _gnutls _go \
+            _gpg _gphoto2 _gprof _gradle _graphicsmagick \
+            _grep _groff _groups _growisofs _gsettings \
+            _guilt _gzip _have_glob_qual _head _hexdump \
+            _host _hostname _hosts _iconv _id \
+            _ifconfig _iftop _imagemagick _initctl _init_d \
+            _install _iostat _ip _ipsec _irssi \
+            _ispell _java _java_class _joe _join \
+            _jq _killall _knock _kvno _last \
+            _ldconfig _ldd _ld_debug _less _lha \
+            _libvirt _links _list_files _lldb _ln \
+            _loadkeys _locale _localedef _locales _locate \
+            _logger _look _lp _ls _lsof \
+            _lua _luarocks _lynx _lz4 _lzop \
+            _mail _mailboxes _make _man _md5sum \
+            _mencal _mh _mime_types _mkdir _mkfifo \
+            _mknod _mktemp _module _monotone _moosic \
+            _mosh _mount _mpc _mt _mtools \
+            _mtr _mutt _mv _my_accounts _myrepos \
+            _mysqldiff _mysql_utils _ncftp _netcat _net_interfaces \
+            _netstat _newsgroups _nginx _ngrep _nice \
+            _nkf _nl _nm _nmap _npm \
+            _nslookup _numfmt _objdump _object_files _od \
+            _openstack _opustools _other_accounts _pack _pandoc \
+            _paste _patch _patchutils _path_commands _path_files \
+            _pax _pbm _pdf _perforce _perl \
+            _perl_basepods _perldoc _perl_modules _pgids _pgrep \
             _php _picocom _pids _pine _ping \
-            _pkgadd _pkg-config _pkginfo _pkg_instance _pkgrm \
-            _pon _ports _postfix _postgresql _postscript \
-            _printenv _printers _process_names _prove _ps \
-            _pspdf _psutils _pump _pv _pwgen \
-            _pydoc _python _python_modules _qemu _quilt \
-            _rake _ranlib _rar _rclone _rcs \
-            _readelf _readlink _remote_files _renice _ri \
-            _rlogin _rm _rmdir _route _rrdtool \
-            _rsync _rubber _ruby _runit _samba \
-            _sccs _scons _screen _script _seafile \
-            _sed _seq _service _services _setfacl \
-            _sh _shasum _showmount _shred _shuf \
-            _shutdown _signals _sisu _slrn _smartmontools \
-            _socket _sort _spamassassin _split _sqlite \
-            _sqsh _ssh _ssh_hosts _stat _stdbuf \
-            _stgit _stow _strings _strip _stty \
-            _su _subversion _sudo _surfraw _swaks \
-            _swanctl _swift _sys_calls _sysctl _tac \
-            _tail _tar _tar_archive _tardy _tcpdump \
-            _tcptraceroute _tee _telnet _terminals _tex \
-            _texi _texinfo _tidy _tiff _tilde_files \
-            _timeout _time_zone _tin _tla _tmux \
-            _todo.sh _toilet _top _topgit _totd \
-            _touch _tput _tr _transmission _tree \
-            _truss _tty _ttys _twidge _twisted \
-            _umountable _unace _uname _unexpand _uniq \
-            _unison _units _uptime _urls _user_admin \
-            _user_at_host _users _users_on _vcsh _vim \
-            _visudo _vmstat _vorbis _vpnc _w \
-            _w3m _watch _wc _webbrowser _wget \
-            _whereis _who _whois _wiggle _xargs \
-            _xmlsoft _xmlstarlet _xmms2 _xxd _xz \
-            _yafc _yodl _yp _zcat _zdump \
-            _zfs _zfs_dataset _zfs_keysource_props _zfs_pool _zip \
-            _zpool _zsh _acroread _code _dcop \
-            _eog _evince _geany _gnome-gv _gqview \
-            _gv _herbstclient _kdeconnect _kfmclient _matlab \
-            _mozilla _mplayer _mupdf _nautilus _nedit \
-            _netscape _okular _pdftk _qiv _rdesktop \
-            _setxkbmap _sublimetext _urxvt _vnc _x_arguments \
-            _xauth _xautolock _x_borderwidth _xclip _x_color \
-            _x_colormapid _x_cursor _x_display _xdvi _x_extension \
-            _xfig _x_font _xft_fonts _x_geometry _x_keysym \
-            _xloadimage _x_locale _x_modifier _xmodmap _x_name \
-            _xournal _xpdf _xrandr _x_resource _xscreensaver \
-            _x_selection_timeout _xset _xt_arguments _xterm _x_title \
-            _xt_session_id _x_utils _xv _x_visual _x_window \
-            _xwit _zeal _add-zle-hook-widget _add-zsh-hook _alias \
-            _aliases _arrays _assign _autocd _bindkey \
-            _brace_parameter _builtin _cd _command _command_names \
-            _compadd _compdef _completers _condition _default \
-            _delimiters _directory_stack _dirs _disable _dynamic_directory_name \
-            _echotc _echoti _emulate _enable _equal \
-            _exec _fc _file_descriptors _first _functions \
-            _globflags _globqual_delims _globquals _hash _history_modifiers \
-            _in_vared _jobs _jobs_bg _jobs_builtin _jobs_fg \
-            _kill _limit _limits _math _math_params \
-            _mere _module_math_func _options _options_set _options_unset \
-            _parameter _parameters _precommand _print _prompt \
-            _ps1234 _read _redirect _run-help _sched \
-            _set _setopt _source _strftime _subscript \
-            _suffix_alias_files _tcpsys _tilde _trap _ttyctl \
-            _typeset _ulimit _unhash _user_math_func _value \
-            _vared _vars _wait _which _widgets \
-            _zargs _zattr _zcalc _zcalc_line _zcompile \
-            _zed _zftp _zle _zmodload _zmv \
-            _zparseopts _zpty _zsh-mime-handler _zsocket _zstyle \
-            _ztodo
+            _pip _pkgadd _pkg-config _pkginfo _pkg_instance \
+            _pkgrm _pon _ports _postfix _postgresql \
+            _postscript _pr _printenv _printers _process_names \
+            _prove _ps _pspdf _psutils _ptx \
+            _pump _pv _pwgen _pydoc _python \
+            _python_modules _qemu _quilt _rake _ranlib \
+            _rar _rclone _rcs _readelf _readlink \
+            _remote_files _renice _ri _rlogin _rm \
+            _rmdir _route _rrdtool _rsync _rubber \
+            _ruby _runit _samba _sccs _scons \
+            _screen _script _seafile _sed _seq \
+            _service _services _setfacl _sh _shasum \
+            _showmount _shred _shuf _shutdown _signals \
+            _sisu _slrn _smartmontools _socket _sort \
+            _spamassassin _split _sqlite _sqsh _ssh \
+            _ssh_hosts _stat _stdbuf _stgit _stow \
+            _strings _strip _stty _su _subversion \
+            _sudo _surfraw _swaks _swanctl _swift \
+            _sys_calls _sysctl _tac _tail _tar \
+            _tar_archive _tardy _tcpdump _tcptraceroute _tee \
+            _telnet _terminals _tex _texi _texinfo \
+            _tidy _tiff _tilde_files _timeout _time_zone \
+            _tin _tla _tmux _todo.sh _toilet \
+            _top _topgit _totd _touch _tput \
+            _tr _transmission _tree _truncate _truss \
+            _tty _ttys _twidge _twisted _umountable \
+            _unace _uname _unexpand _uniq _unison \
+            _units _uptime _urls _user_admin _user_at_host \
+            _users _users_on _vi _vim _visudo \
+            _vmstat _vorbis _vpnc _w _w3m \
+            _watch _wc _webbrowser _wget _whereis \
+            _who _whois _wiggle _xargs _xmlsoft \
+            _xmlstarlet _xmms2 _xxd _xz _yafc \
+            _yodl _yp _zcat _zdump _zfs \
+            _zfs_dataset _zfs_pool _zip _zsh _acroread \
+            _code _dcop _eog _evince _geany \
+            _gnome-gv _gqview _gv _herbstclient _kdeconnect \
+            _kfmclient _matlab _mozilla _mplayer _mupdf \
+            _nautilus _nedit _netscape _okular _pdftk \
+            _qiv _rdesktop _setxkbmap _sublimetext _urxvt \
+            _vnc _x_arguments _xauth _xautolock _x_borderwidth \
+            _xclip _x_color _x_colormapid _x_cursor _x_display \
+            _xdvi _x_extension _xfig _x_font _xft_fonts \
+            _x_geometry _xinput _x_keysym _xloadimage _x_locale \
+            _x_modifier _xmodmap _x_name _xournal _xpdf \
+            _xrandr _x_resource _xscreensaver _x_selection_timeout _xset \
+            _xt_arguments _xterm _x_title _xt_session_id _x_utils \
+            _xv _x_visual _x_window _xwit _zeal \
+            _add-zle-hook-widget _add-zsh-hook _alias _aliases __arguments \
+            _arrays _assign _autocd _bindkey _brace_parameter \
+            _builtin _cd _command _command_names _compadd \
+            _compdef _completers _condition _default _delimiters \
+            _directory_stack _dirs _disable _dynamic_directory_name _echotc \
+            _echoti _emulate _enable _equal _exec \
+            _fc _file_descriptors _first _functions _globflags \
+            _globqual_delims _globquals _hash _history_modifiers _in_vared \
+            _jobs _jobs_bg _jobs_builtin _jobs_fg _kill \
+            _limit _limits _math _math_params _mere \
+            _module_math_func _options _options_set _options_unset _parameter \
+            _parameters _precommand _print _prompt _ps1234 \
+            _read _redirect _run-help _sched _set \
+            _setopt _source _strftime _subscript _suffix_alias_files \
+            _tcpsys _tilde _trap _ttyctl _typeset \
+            _ulimit _unhash _user_math_func _value _vared \
+            _vars _vcs_info _vcs_info_hooks _wait _which \
+            _widgets _zargs _zattr _zcalc _zcalc_line \
+            _zcompile _zed _zftp _zle _zmodload \
+            _zmv _zparseopts _zpty _zsh-mime-handler _zsocket \
+            _zstyle _ztodo
 autoload -Uz +X _call_program
 
 typeset -gUa _comp_assocs
diff --git a/base/zsh/.config/zsh/.zshrc b/base/zsh/.config/zsh/.zshrc
index 6774d215..7cb3031c 100644
--- a/base/zsh/.config/zsh/.zshrc
+++ b/base/zsh/.config/zsh/.zshrc
@@ -1,4 +1,4 @@
-#lib/shared/services                                      ██
+#
 #                                     ░██
 #                       ██████  ██████░██      ██████  █████
 #                      ░░░░██  ██░░░░ ░██████ ░░██░░█ ██░░░██
@@ -28,24 +28,16 @@ sie() {
 alias na='nvim ~/.config/zsh/aliases.zsh'
 
 foreach file (
+  completion.zsh
+  opts.zsh
   prompt.zsh
   plugins.zsh
-  keys.zsh
-  completion.zsh
   git.zsh
   aliases.zsh
   funcs.zsh
   colors.zsh
   zoxide.zsh
-  aws.zsh
-  opts.zsh
-  # android.zsh
-  # tmux.zsh
-  # conda.zsh
-  kubctl.zsh
-  # terraform.zsh
-  # fly.zsh
-  docker.zsh
+  keys.zsh
 ) {
   sie $ZDOTDIR/$file
 }
@@ -56,10 +48,10 @@ sie $HOME/.cargo/env
 # Performance Warning
 END=$(date +%s.%N)
 ZSHRC_PERF=$(printf %.2f $(echo "$END - $START" | bc))
-# if (( $ZSHRC_PERF > 0.09)); then
-#   echo "\033[0;31mperformance warning!"
-#   echo ".zshrc startup time" $ZSHRC_PERF "seconds\e[0m"
-# fi
+if (( $ZSHRC_PERF > 0.09)); then
+  echo "\033[0;31mperformance warning!"
+  echo ".zshrc startup time" $ZSHRC_PERF "seconds\e[0m"
+fi
 
 # yearprog
 # upwr
diff --git a/base/zsh/.config/zsh/aliases.zsh b/base/zsh/.config/zsh/aliases.zsh
index d564af34..89c65839 100644
--- a/base/zsh/.config/zsh/aliases.zsh
+++ b/base/zsh/.config/zsh/aliases.zsh
@@ -18,11 +18,9 @@ alias cd='z '
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 # mini funcs
 alias dicc="cat /usr/share/dict/cracklib-small | fzf-tmux -l 20% --multi --reverse | tr -d '\n' | xcopy"
-alias glg="git log --graph --abbrev-commit --decorate --format=format:'%C(bold green)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold yellow)(%ar)%C(reset)%C(auto)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all"
 alias lol=" figlet -c -f ~/.local/share/fonts/figlet-fonts/3d.flf "
 alias logi="sudo systemctl restart logid.service"
 alias neo='neofetch --backend kitty --source Downloads/figma/Slice\ 1\ \(4\).png'
-alias gdiff='git diff --name-only --diff-filter=d | xargs bat --diff'
 alias srt='du -sh ./* | sort -h | bat'
 alias siz='du -sh '
 alias ttystat='echo $(tty) $TERM ${COLUMNS}x$LINES'
diff --git a/base/zsh/.config/zsh/completion.zsh b/base/zsh/.config/zsh/completion.zsh
index 02eb8923..972191d6 100644
--- a/base/zsh/.config/zsh/completion.zsh
+++ b/base/zsh/.config/zsh/completion.zsh
@@ -6,10 +6,14 @@ foreach function (
   compinit
   promptinit
   surround
+  add-zsh-hook 
+  vcs_info
+  url-quote-magic # originally referenced in ./opts.zsh
+  tetriscurses
   ) {
   autoload -Uz $function
 }
-
+compinit
 # Define module to load them on execution.
 foreach module (
   complete
@@ -26,23 +30,23 @@ foreach module (
 }
 
 # Initialize the completion system with a cache time of 24 hours.
-mkdir -p $HOME/.local/share/zsh
-typeset -g zcompdump="$HOME/.local/share/zsh/zcompdump"
-typeset -g comp_files=($zcompdump(Nm-24))
-
-if (( $#comp_files )) {
-  compinit -i -C -d $zcompdump
-
-} else {
-compinit -i -d $zcompdump
-{
-    # Compile the completion dump to increase startup speed.
-    if [[ "$zcompdump" -nt "${zcompdump}.zwc" || ! -s "${zcompdump}.zwc" ]]; then
-      zcompile "$zcompdump"
-    fi
-  } &!
-}
-
+# mkdir -p $HOME/.local/share/zsh
+# typeset -g zcompdump="$HOME/.local/share/zsh/zcompdump"
+# typeset -g comp_files=($zcompdump(Nm-24))
+#
+# if (( $#comp_files )) {
+#   compinit -i -C -d $zcompdump
+#
+# } else {
+# compinit -i -d $zcompdump
+# {
+#     # Compile the completion dump to increase startup speed.
+#     if [[ "$zcompdump" -nt "${zcompdump}.zwc" || ! -s "${zcompdump}.zwc" ]]; then
+#       zcompile "$zcompdump"
+#     fi
+#   } &!
+# }
+#
 
 # Enable completion caching, use rehash to clear
 
@@ -72,3 +76,26 @@ _fzf_compgen_dir() {
 
 unset zcompdump
 unset comp_files
+
+foreach file (
+  # aws.zsh
+  # android.zsh
+  # tmux.zsh
+  # conda.zsh
+  kubctl.zsh
+  # terraform.zsh
+  # fly.zsh
+  docker.zsh
+) {
+  sie $ZDOTDIR/$file
+}
+
+{ setopt extendedglob
+  for zcompdump in $ZDOTDIR/.zcompdump(#qN.mh+24); do
+    if [[ -s "$zcompdump" && (! -s "${zcompdump}.zwc" || "$zcompdump" -nt "${zcompdump}.zwc") ]]; then
+      zcompile "$zcompdump"
+    fi
+  done
+  unsetopt extendedglob
+} &!
+compinit -C
diff --git a/base/zsh/.config/zsh/git.zsh b/base/zsh/.config/zsh/git.zsh
index a980a5bc..6d26d694 100644
--- a/base/zsh/.config/zsh/git.zsh
+++ b/base/zsh/.config/zsh/git.zsh
@@ -96,4 +96,6 @@ alias grc='git rebase --continue'
 alias grm='git rebase master'
 alias gs='git status -s'
 alias gst='git status'
+alias glg="git log --graph --abbrev-commit --decorate --format=format:'%C(bold green)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold yellow)(%ar)%C(reset)%C(auto)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all"
+alias gdiff='git diff --name-only --diff-filter=d | xargs bat --diff'
 
diff --git a/base/zsh/.config/zsh/keys.zsh b/base/zsh/.config/zsh/keys.zsh
index 7da1bcda..82423e16 100644
--- a/base/zsh/.config/zsh/keys.zsh
+++ b/base/zsh/.config/zsh/keys.zsh
@@ -51,3 +51,18 @@ for m in visual viopp; do
     bindkey -M $m $c select-bracketed
   done
 done
+
+
+
+
+fancy-ctrl-z () {
+  if [[ $#BUFFER -eq 0 ]]; then
+    BUFFER="fg"
+    zle accept-line
+  else
+    zle push-input
+    zle clear-screen
+  fi
+}
+zle -N fancy-ctrl-z
+bindkey '^Z' fancy-ctrl-z
diff --git a/base/zsh/.config/zsh/kubctl.zsh b/base/zsh/.config/zsh/kubctl.zsh
index 1b5a6bcf..6582cb9a 100644
--- a/base/zsh/.config/zsh/kubctl.zsh
+++ b/base/zsh/.config/zsh/kubctl.zsh
@@ -339,6 +339,198 @@ alias kgd='kubectl get deployment'
 alias kge='kubectl get events'
 alias kgpvc='kubectl get pvc'
 
-if (( $+commands[kubectl] )); then
-  source <(kubectl completion zsh)
+# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+#compdef kubectl
+compdef _kubectl kubectl
+
+# Copyright 2016 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#compdef _kubectl kubectl
+
+# zsh completion for kubectl                              -*- shell-script -*-
+
+__kubectl_debug()
+{
+    local file="$BASH_COMP_DEBUG_FILE"
+    if [[ -n ${file} ]]; then
+        echo "$*" >> "${file}"
+    fi
+}
+
+_kubectl()
+{
+    local shellCompDirectiveError=1
+    local shellCompDirectiveNoSpace=2
+    local shellCompDirectiveNoFileComp=4
+    local shellCompDirectiveFilterFileExt=8
+    local shellCompDirectiveFilterDirs=16
+
+    local lastParam lastChar flagPrefix requestComp out directive comp lastComp noSpace
+    local -a completions
+
+    __kubectl_debug "\n========= starting completion logic =========="
+    __kubectl_debug "CURRENT: ${CURRENT}, words[*]: ${words[*]}"
+
+    # The user could have moved the cursor backwards on the command-line.
+    # We need to trigger completion from the $CURRENT location, so we need
+    # to truncate the command-line ($words) up to the $CURRENT location.
+    # (We cannot use $CURSOR as its value does not work when a command is an alias.)
+    words=("${=words[1,CURRENT]}")
+    __kubectl_debug "Truncated words[*]: ${words[*]},"
+
+    lastParam=${words[-1]}
+    lastChar=${lastParam[-1]}
+    __kubectl_debug "lastParam: ${lastParam}, lastChar: ${lastChar}"
+
+    # For zsh, when completing a flag with an = (e.g., kubectl -n=<TAB>)
+    # completions must be prefixed with the flag
+    setopt local_options BASH_REMATCH
+    if [[ "${lastParam}" =~ '-.*=' ]]; then
+        # We are dealing with a flag with an =
+        flagPrefix="-P ${BASH_REMATCH}"
+    fi
+
+    # Prepare the command to obtain completions
+    requestComp="${words[1]} __complete ${words[2,-1]}"
+    if [ "${lastChar}" = "" ]; then
+        # If the last parameter is complete (there is a space following it)
+        # We add an extra empty parameter so we can indicate this to the go completion code.
+        __kubectl_debug "Adding extra empty parameter"
+        requestComp="${requestComp} \"\""
+    fi
+
+    __kubectl_debug "About to call: eval ${requestComp}"
+
+    # Use eval to handle any environment variables and such
+    out=$(eval ${requestComp} 2>/dev/null)
+    __kubectl_debug "completion output: ${out}"
+
+    # Extract the directive integer following a : from the last line
+    local lastLine
+    while IFS='\n' read -r line; do
+        lastLine=${line}
+    done < <(printf "%s\n" "${out[@]}")
+    __kubectl_debug "last line: ${lastLine}"
+
+    if [ "${lastLine[1]}" = : ]; then
+        directive=${lastLine[2,-1]}
+        # Remove the directive including the : and the newline
+        local suffix
+        (( suffix=${#lastLine}+2))
+        out=${out[1,-$suffix]}
+    else
+        # There is no directive specified.  Leave $out as is.
+        __kubectl_debug "No directive found.  Setting do default"
+        directive=0
+    fi
+
+    __kubectl_debug "directive: ${directive}"
+    __kubectl_debug "completions: ${out}"
+    __kubectl_debug "flagPrefix: ${flagPrefix}"
+
+    if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then
+        __kubectl_debug "Completion received error. Ignoring completions."
+        return
+    fi
+
+    while IFS='\n' read -r comp; do
+        if [ -n "$comp" ]; then
+            # If requested, completions are returned with a description.
+            # The description is preceded by a TAB character.
+            # For zsh's _describe, we need to use a : instead of a TAB.
+            # We first need to escape any : as part of the completion itself.
+            comp=${comp//:/\\:}
+
+            local tab=$(printf '\t')
+            comp=${comp//$tab/:}
+
+            __kubectl_debug "Adding completion: ${comp}"
+            completions+=${comp}
+            lastComp=$comp
+        fi
+    done < <(printf "%s\n" "${out[@]}")
+
+    if [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ]; then
+        __kubectl_debug "Activating nospace."
+        noSpace="-S ''"
+    fi
+
+    if [ $((directive & shellCompDirectiveFilterFileExt)) -ne 0 ]; then
+        # File extension filtering
+        local filteringCmd
+        filteringCmd='_files'
+        for filter in ${completions[@]}; do
+            if [ ${filter[1]} != '*' ]; then
+                # zsh requires a glob pattern to do file filtering
+                filter="\*.$filter"
+            fi
+            filteringCmd+=" -g $filter"
+        done
+        filteringCmd+=" ${flagPrefix}"
+
+        __kubectl_debug "File filtering command: $filteringCmd"
+        _arguments '*:filename:'"$filteringCmd"
+    elif [ $((directive & shellCompDirectiveFilterDirs)) -ne 0 ]; then
+        # File completion for directories only
+        local subdir
+        subdir="${completions[1]}"
+        if [ -n "$subdir" ]; then
+            __kubectl_debug "Listing directories in $subdir"
+            pushd "${subdir}" >/dev/null 2>&1
+        else
+            __kubectl_debug "Listing directories in ."
+        fi
+
+        local result
+        _arguments '*:dirname:_files -/'" ${flagPrefix}"
+        result=$?
+        if [ -n "$subdir" ]; then
+            popd >/dev/null 2>&1
+        fi
+        return $result
+    else
+        __kubectl_debug "Calling _describe"
+        if eval _describe "completions" completions $flagPrefix $noSpace; then
+            __kubectl_debug "_describe found some completions"
+
+            # Return the success of having called _describe
+            return 0
+        else
+            __kubectl_debug "_describe did not find completions."
+            __kubectl_debug "Checking if we should do file completion."
+            if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then
+                __kubectl_debug "deactivating file completion"
+
+                # We must return an error code here to let zsh know that there were no
+                # completions found by _describe; this is what will trigger other
+                # matching algorithms to attempt to find completions.
+                # For example zsh can match letters in the middle of words.
+                return 1
+            else
+                # Perform file completion
+                __kubectl_debug "Activating file completion"
+
+                # We must return the result of this command, so it must be the
+                # last command, or else we must store its result to return it.
+                _arguments '*:filename:_files'" ${flagPrefix}"
+            fi
+        fi
+    fi
+}
+
+# don't run the completion function when being source-ed or eval-ed
+if [ "$funcstack[1]" = "_kubectl" ]; then
+    _kubectl
 fi
+# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git a/base/zsh/.config/zsh/opts.zsh b/base/zsh/.config/zsh/opts.zsh
index a1aa2634..b7442677 100644
--- a/base/zsh/.config/zsh/opts.zsh
+++ b/base/zsh/.config/zsh/opts.zsh
@@ -41,14 +41,12 @@ unopts=(
   flowcontrol 
   bg_nice 
   nomatch
-  prompt_sp
+  # prompt_sp
   global_rcs
 )
 unsetopt $unopts
 
-autoload -Uz url-quote-magic
 zle -N self-insert url-quote-magic
 unset zle_bracketed_paste
-# autoload -Uz tetriscurses
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
diff --git a/base/zsh/.config/zsh/profile.zsh b/base/zsh/.config/zsh/profile.zsh
index 209e8eb1..aa01d724 100644
--- a/base/zsh/.config/zsh/profile.zsh
+++ b/base/zsh/.config/zsh/profile.zsh
@@ -205,7 +205,7 @@ export XTERM_SHELL=/usr/bin/zsh
 # 10ms for key sequences
 export KEYTIMEOUT=1
 # suppress no newline % symbol marker
-# export PROMPT_EOL_MARK=''
+export PROMPT_EOL_MARK=''
 export ZSH_AUTOSUGGEST_MANUAL_REBIND=1  # make prompt faster
 export DISABLE_MAGIC_FUNCTIONS=true     # make pasting into terminal faster
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git a/base/zsh/.config/zsh/prompt.zsh b/base/zsh/.config/zsh/prompt.zsh
index 59bf6550..981d0238 100644
--- a/base/zsh/.config/zsh/prompt.zsh
+++ b/base/zsh/.config/zsh/prompt.zsh
@@ -1,4 +1,5 @@
-autoload -Uz add-zsh-hook vcs_info # Enable substitution in the prompt.
+
+# autoload -Uz add-zsh-hook vcs_info # Enable substitution in the prompt. already done in ./completion.zsh
 local mark='*'
 local curdir="%~"
 local hostname="%M"