From 09f1034ef2d3713472ceea24875751aad61cebb9 Mon Sep 17 00:00:00 2001
From: Price Hiller <price@orion-technologies.io>
Date: Sun, 31 Jul 2022 01:34:43 -0500
Subject: [PATCH] fix: use omz-init

---
 .config/zsh/config/init.zsh     | 44 +-----------------------------
 .config/zsh/config/omz-init.zsh | 47 +++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 43 deletions(-)
 create mode 100644 .config/zsh/config/omz-init.zsh

diff --git a/.config/zsh/config/init.zsh b/.config/zsh/config/init.zsh
index 542a6df..f08a90d 100644
--- a/.config/zsh/config/init.zsh
+++ b/.config/zsh/config/init.zsh
@@ -4,52 +4,10 @@ configure() {
 	autoload -U +X bashcompinit && bashcompinit
 }
 
-init-omz() {
-	# This has to break spec because omz will source EVERYTHING inside of the
-	# omz directory :(
-
-	### Autojump ###
-	source "${HOME}/.local/share/autojump/etc/profile.d/autojump.sh"
-
-	plugins=(
-		git
-		zsh-autosuggestions
-		zsh-completions
-		zsh-syntax-highlighting
-		colored-man-pages
-		pip
-		extract
-		fzf-tab
-		autojump
-		aws
-		docker
-		docker-compose
-		nmap
-		npm
-		python
-		zsh-vi-mode
-		zsh-kitty
-		rust
-		dotnet
-	)
-
-	if [[ "${OSTYPE}" = "darwin"* ]]; then
-		plugins +=(
-			macos
-		)
-	fi
-
-	local wkdir="${BASE_ZSH_CONFIG_DIR}/config/omz"
-	export ZSH="${HOME}/.local/share/omz"
-	export ZSH_CUSTOM="${wkdir}/"
-	export OMZ_INIT_RAN=true
-	source "${ZSH}/oh-my-zsh.sh"
-}
-
 init() {
 	local wkdir="${BASE_ZSH_CONFIG_DIR}/config"
 	source "${wkdir}/themes/init.zsh"
-	source "${wkdir}/omz/init.zsh"
+	source "${wkdir}/omz-init.zsh"
 	source "${wkdir}/profile/init.zsh"
 	source "${wkdir}/style/init.zsh"
 	configure
diff --git a/.config/zsh/config/omz-init.zsh b/.config/zsh/config/omz-init.zsh
new file mode 100644
index 0000000..7b6287d
--- /dev/null
+++ b/.config/zsh/config/omz-init.zsh
@@ -0,0 +1,47 @@
+# This has to break spec because omz will source EVERYTHING inside of the
+# omz directory :(
+
+configure() {
+	### Autojump ###
+	source "${HOME}/.local/share/autojump/etc/profile.d/autojump.sh"
+
+	plugins=(
+		git
+		zsh-autosuggestions
+		zsh-completions
+		zsh-syntax-highlighting
+		colored-man-pages
+		pip
+		extract
+		fzf-tab
+		autojump
+		aws
+		docker
+		docker-compose
+		nmap
+		npm
+		python
+		zsh-vi-mode
+		zsh-kitty
+		rust
+		dotnet
+	)
+
+	if [[ "${OSTYPE}" = "darwin"* ]]; then
+		plugins +=(
+			macos
+		)
+	fi
+
+	source "${ZSH}/oh-my-zsh.sh"
+
+}
+
+init() {
+	local wkdir="${BASE_ZSH_CONFIG_DIR}/config/omz"
+	export ZSH="${HOME}/.local/share/omz"
+	export ZSH_CUSTOM="${wkdir}/"
+
+}
+
+init