From aa3a1e02374a69b317850e575c175fba73989da2 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Fri, 27 Sep 2019 16:51:26 -0700
Subject: [PATCH] Remove prezto entirely.

---
 .gitmodules                   |   4 -
 dotfiles/zprezto              |   1 -
 dotfiles/zprezto_custom/.keep |   0
 dotfiles/zpreztorc            | 217 ----------------------------------
 dotfiles/zshrc                |  24 ++--
 5 files changed, 14 insertions(+), 232 deletions(-)
 delete mode 160000 dotfiles/zprezto
 delete mode 100644 dotfiles/zprezto_custom/.keep
 delete mode 100644 dotfiles/zpreztorc

diff --git a/.gitmodules b/.gitmodules
index a58d471..2cb2045 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,10 +22,6 @@
 	path = dotfiles/vim/pack/matir/start/vim-go
 	url = https://github.com/fatih/vim-go.git
 	fetchRecurseSubmodules = true
-[submodule "dotfiles/zprezto"]
-	path = dotfiles/zprezto
-	url = https://github.com/sorin-ionescu/prezto.git
-	fetchRecurseSubmodules = true
 [submodule "dotfiles/tmux/tmux-logging"]
 	path = dotfiles/tmux/tmux-logging
 	url = https://github.com/tmux-plugins/tmux-logging.git
diff --git a/dotfiles/zprezto b/dotfiles/zprezto
deleted file mode 160000
index 9507a0e..0000000
--- a/dotfiles/zprezto
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9507a0e881ae71528c9a4182e53c62f2896c8d31
diff --git a/dotfiles/zprezto_custom/.keep b/dotfiles/zprezto_custom/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/dotfiles/zpreztorc b/dotfiles/zpreztorc
deleted file mode 100644
index 71e6c68..0000000
--- a/dotfiles/zpreztorc
+++ /dev/null
@@ -1,217 +0,0 @@
-#
-# Sets Prezto options.
-#
-# Authors:
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-
-#
-# General
-#
-
-# Set case-sensitivity for completion, history lookup, etc.
-# zstyle ':prezto:*:*' case-sensitive 'yes'
-
-# Color output (auto set to 'no' on dumb terminals).
-zstyle ':prezto:*:*' color 'yes'
-
-# Add additional directories to load prezto modules from
-zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto_custom
-
-# Set the Zsh modules to load (man zshmodules).
-# zstyle ':prezto:load' zmodule 'attr' 'stat'
-
-# Set the Zsh functions to load (man zshcontrib).
-# zstyle ':prezto:load' zfunction 'zargs' 'zmv'
-
-# Set the Prezto modules to load (browse modules).
-# The order matters.
-zstyle ':prezto:load' pmodule \
-  'environment' \
-  'syntax-highlighting'
-
-#
-# Autosuggestions
-#
-
-# Set the query found color.
-# zstyle ':prezto:module:autosuggestions:color' found ''
-
-#
-# Completions
-#
-# No groups of completions.
-zstyle ':completion:*' format ''
-
-# Set the entries to ignore in static */etc/hosts* for host completion.
-# zstyle ':prezto:module:completion:*:hosts' etc-host-ignores \
-#   '0.0.0.0' '127.0.0.1'
-
-#
-# Editor
-#
-
-# Set the key mapping style to 'emacs' or 'vi'.
-zstyle ':prezto:module:editor' key-bindings 'vi'
-
-# Auto convert .... to ../..
-# zstyle ':prezto:module:editor' dot-expansion 'yes'
-
-#
-# Git
-#
-
-# Ignore submodules when they are 'dirty', 'untracked', 'all', or 'none'.
-# zstyle ':prezto:module:git:status:ignore' submodules 'all'
-
-# Don't set up aliases I never use
-zstyle ':prezto:module:git:alias' skip 'yes'
-
-#
-# GNU Utility
-#
-
-# Set the command prefix on non-GNU systems.
-zstyle ':prezto:module:gnu-utility' prefix 'g'
-
-#
-# History Substring Search
-#
-
-# Set the query found color.
-# zstyle ':prezto:module:history-substring-search:color' found ''
-
-# Set the query not found color.
-# zstyle ':prezto:module:history-substring-search:color' not-found ''
-
-# Set the search globbing flags.
-# zstyle ':prezto:module:history-substring-search' globbing-flags ''
-
-#
-# OS X
-#
-
-# Set the keyword used by `mand` to open man pages in Dash.app
-# zstyle ':prezto:module:osx:man' dash-keyword 'manpages'
-
-#
-# Pacman
-#
-
-# Set the Pacman frontend.
-# zstyle ':prezto:module:pacman' frontend 'yaourt'
-
-#
-# Prompt
-#
-
-# Set the prompt theme to load.
-# Setting it to 'random' loads a random theme.
-# Auto set to 'off' on dumb terminals.
-zstyle ':prezto:module:prompt' theme 'matir'
-
-# Set the working directory prompt display length.
-# By default, it is set to 'short'. Set it to 'long' (without '~' expansion)
-# for longer or 'full' (with '~' expansion) for even longer prompt display.
-# zstyle ':prezto:module:prompt' pwd-length 'short'
-
-# Set the prompt to display the return code along with an indicator for non-zero
-# return codes. This is not supported by all prompts.
-# zstyle ':prezto:module:prompt' show-return-val 'yes'
-
-#
-# Ruby
-#
-
-# Auto switch the Ruby version on directory change.
-# zstyle ':prezto:module:ruby:chruby' auto-switch 'yes'
-
-#
-# Python
-#
-
-# Auto switch the Python virtualenv on directory change.
-# zstyle ':prezto:module:python:virtualenv' auto-switch 'yes'
-
-# Automatically initialize virtualenvwrapper if pre-requisites are met.
-#zstyle ':prezto:module:python:virtualenv' initialize 'yes'
-
-#
-# Screen
-#
-
-# Auto start a session when Zsh is launched in a local terminal.
-# zstyle ':prezto:module:screen:auto-start' local 'yes'
-
-# Auto start a session when Zsh is launched in a SSH connection.
-# zstyle ':prezto:module:screen:auto-start' remote 'yes'
-
-#
-# SSH
-#
-
-# Set the SSH identities to load into the agent.
-# zstyle ':prezto:module:ssh:load' identities 'id_rsa' 'id_rsa2' 'id_github'
-
-#
-# Syntax Highlighting
-#
-
-# Set syntax highlighters.
-# By default, only the main highlighter is enabled.
-zstyle ':prezto:module:syntax-highlighting' highlighters \
-  'main' \
-  'brackets' \
-  'pattern' \
-  'line'
-
-# Set syntax highlighting styles.
-# zstyle ':prezto:module:syntax-highlighting' styles \
-#   'builtin' 'bg=blue' \
-#   'command' 'bg=blue' \
-#   'function' 'bg=blue'
-#
-# Set syntax pattern styles.
-# zstyle ':prezto:module:syntax-highlighting' pattern \
-#   'rm*-rf*' 'fg=white,bold,bg=red'
-
-#
-# Terminal
-#
-
-# Auto set the tab and window titles.
-zstyle ':prezto:module:terminal' auto-title 'yes'
-
-# Set the window title format.
-zstyle ':prezto:module:terminal:window-title' format '%n@%m: %s'
-
-# Set the tab title format.
-zstyle ':prezto:module:terminal:tab-title' format '%m: %s'
-
-# Set the terminal multiplexer title format.
-zstyle ':prezto:module:terminal:multiplexer-title' format '%s'
-
-#
-# Tmux
-#
-
-# Auto start a session when Zsh is launched in a local terminal.
-# zstyle ':prezto:module:tmux:auto-start' local 'no'
-
-# Auto start a session when Zsh is launched in a SSH connection.
-# zstyle ':prezto:module:tmux:auto-start' remote 'no'
-
-# Integrate with iTerm2.
-# zstyle ':prezto:module:tmux:iterm' integrate 'yes'
-
-# Set the default session name:
-# zstyle ':prezto:module:tmux:session' name 'YOUR DEFAULT SESSION NAME'
-
-#
-# Utility
-#
-
-# Enabled safe options. This aliases cp, ln, mv and rm so that they prompt
-# before deleting or overwriting files. Set to 'no' to disable this safer
-# behavior.
-zstyle ':prezto:module:utility' safe-ops 'no'
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 30b3b86..9fd3042 100755
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -22,14 +22,27 @@ setopt \
   histlexwords \
   histsavenodups \
   histverify \
+  interactivecomments \
+  longlistjobs \
   multios \
   nohup \
   nomatch \
+  notify \
   pushdignoredups \
   pushdsilent \
   pushdtohome \
+  rcquotes \
   sharehistory
-unsetopt beep histbeep listbeep flowcontrol
+unsetopt \
+  beep \
+  cdablevars \
+  histbeep \
+  listbeep \
+  flowcontrol \
+  mailwarning \
+  hup \
+  bgnice \
+  checkjobs
 # vi keybindings
 bindkey -v
 
@@ -51,16 +64,7 @@ zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
 zstyle ':completion::complete:*' use-cache on
 zstyle ':completion::complete:*' cache-path "${ZDOTDIR:-$HOME}/.zcompcache"
 
-# Load prezto
-if [[ -z "${NO_ZPREZTO}" && -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
-  source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
-fi
-
-# Overrides to prezto
-unsetopt cdablevars
-
 # .profile is universal
-# but after zprezto to use/override anything setup there
 . ~/.profile
 # Deduplicate the path
 typeset -U path