From 1787b595a2c5cf6599b0d8c48f8c7a520721ab03 Mon Sep 17 00:00:00 2001
From: Aaron Johnson <ajohnson@skyfalltech.net>
Date: Sat, 25 Aug 2018 20:40:33 -0500
Subject: [PATCH 1/5] Added COMPLETION_STYLE option

---
 example_configs/zsh.conf | 1 +
 setopt                   | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/example_configs/zsh.conf b/example_configs/zsh.conf
index 5a3d980..6d756d9 100644
--- a/example_configs/zsh.conf
+++ b/example_configs/zsh.conf
@@ -4,6 +4,7 @@ SYNTAX_HIGHLIGHT=true		#On-the-fly syntax highlighting of commands that you type
 
 # Prompt Style
 PROMPT_STYLE=bsd		#Valid options: bsd, bsd2, ar5
+COMPLETION_STYLE=bash		#ZSH "automenu" option toggle - Valid options: bash, zsh (defaults to zsh)
 
 # Example prompts:
 # bsd: user@host:~/storage/git[git-branch]%
diff --git a/setopt b/setopt
index beb35e6..ced2288 100644
--- a/setopt
+++ b/setopt
@@ -5,7 +5,8 @@ promptinit
 setopt autocd
 unsetopt beep
 setopt HIST_IGNORE_SPACE
-
-## BASH-style completion; comment out for full ZSH completion.
-setopt noautomenu
+if [ $COMPLETION_STYLE = bash ]
+then
+  setopt noautomenu
+fi
 

From 1e148ed75ef7aa8435e38b095a7aa22a5ed093f8 Mon Sep 17 00:00:00 2001
From: Aaron Johnson <ajohnson@skyfalltech.net>
Date: Sun, 26 Aug 2018 17:54:53 -0500
Subject: [PATCH 2/5] Added toggle for auto cd feature

---
 example_configs/zsh.conf | 1 +
 setopt                   | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/example_configs/zsh.conf b/example_configs/zsh.conf
index 6d756d9..b23fc15 100644
--- a/example_configs/zsh.conf
+++ b/example_configs/zsh.conf
@@ -1,6 +1,7 @@
 # ZSH Configuration
 BSD_MODE=false			#Some options must be specified differently in BSD
 SYNTAX_HIGHLIGHT=true		#On-the-fly syntax highlighting of commands that you type
+AUTO_CD=true			#When true, if only a directory path is entered, you will cd to the directory
 
 # Prompt Style
 PROMPT_STYLE=bsd		#Valid options: bsd, bsd2, ar5
diff --git a/setopt b/setopt
index ced2288..a45f54c 100644
--- a/setopt
+++ b/setopt
@@ -2,7 +2,10 @@ autoload -U compinit promptinit
 autoload -U colors && colors
 compinit -d ${HOME}/.cache/.zcompdump
 promptinit
-setopt autocd
+if [ $AUTO_CD = true ]
+then
+  setopt autocd
+fi
 unsetopt beep
 setopt HIST_IGNORE_SPACE
 if [ $COMPLETION_STYLE = bash ]

From c54d03d00f041c4209ed4f4e2be246a1fd5b1f7f Mon Sep 17 00:00:00 2001
From: Aaron Johnson <ajohnson@skyfalltech.net>
Date: Sun, 26 Aug 2018 17:58:25 -0500
Subject: [PATCH 3/5] removed empty/unused 'completion' file and references

---
 completion | 0
 zshrc      | 2 --
 2 files changed, 2 deletions(-)
 delete mode 100644 completion

diff --git a/completion b/completion
deleted file mode 100644
index e69de29..0000000
diff --git a/zshrc b/zshrc
index 4d7af36..9845f1d 100644
--- a/zshrc
+++ b/zshrc
@@ -7,7 +7,6 @@ else
   source $HOME/.zsh/interactive
   source $HOME/.zsh/exports
   source $HOME/.zsh/bindkeys
-  source $HOME/.zsh/completion
   source $HOME/.zsh/setopt
   PROMPT="UNCONFIGURED%# "
   return 1
@@ -17,7 +16,6 @@ source $HOME/.zsh/alias
 source $HOME/.zsh/interactive
 source $HOME/.zsh/exports
 source $HOME/.zsh/bindkeys
-source $HOME/.zsh/completion
 source $HOME/.zsh/setopt
 if [ $SYNTAX_HIGHLIGHT = true ]
 then

From 143bf8a0c933c905fcca60cea11168201e6cfd61 Mon Sep 17 00:00:00 2001
From: Aaron Johnson <ajohnson@skyfalltech.net>
Date: Mon, 17 Sep 2018 00:39:15 -0500
Subject: [PATCH 4/5] added 'custom' file to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index fd58b0e..a93bd8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /zsh.conf
+/custom
 

From d6406b449be82852029c4a5aae31eed59dc8f39c Mon Sep 17 00:00:00 2001
From: Aaron Johnson <ajohnson@skyfalltech.net>
Date: Fri, 9 Nov 2018 00:19:43 -0600
Subject: [PATCH 5/5] Corrected typo

---
 example_configs/zsh.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example_configs/zsh.conf b/example_configs/zsh.conf
index b23fc15..2dddf62 100644
--- a/example_configs/zsh.conf
+++ b/example_configs/zsh.conf
@@ -5,7 +5,7 @@ AUTO_CD=true			#When true, if only a directory path is entered, you will cd to t
 
 # Prompt Style
 PROMPT_STYLE=bsd		#Valid options: bsd, bsd2, ar5
-COMPLETION_STYLE=bash		#ZSH "automenu" option toggle - Valid options: bash, zsh (defaults to zsh)
+COMPLETION_STYLE=bash		#ZSH "automenu" option toggle - Valid options: bash, zsh (defaults to bash)
 
 # Example prompts:
 # bsd: user@host:~/storage/git[git-branch]%