From 986a99990e2e166ed61f143dfc17ec2068fb9aa3 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 6 Jun 2016 19:57:13 -0400
Subject: [PATCH] Move TMUXIFIER/ZSH_HIGHLIGHT config into zsh/config

---
 zsh/config | 5 ++++-
 zshrc      | 5 +----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/zsh/config b/zsh/config
index 26674c2f..903a5c32 100644
--- a/zsh/config
+++ b/zsh/config
@@ -1,6 +1,9 @@
 #!/usr/bin/env zsh
 
-export GIT_MERGE_AUTOEDIT=no
+## Plugins
+TMUXIFIER="$HOME/.tmuxifier"
+TMUXIFIER_LAYOUT_PATH="$HOME/.tmux/layouts"
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
 
 ## General
 # Treat these characters as part of a word.
diff --git a/zshrc b/zshrc
index 23224890..f00a9caa 100644
--- a/zshrc
+++ b/zshrc
@@ -6,9 +6,7 @@ if [ ! -d ~/.zgen ]; then
     exit 1
 fi
 
-TMUXIFIER="$HOME/.tmuxifier"
-TMUXIFIER_LAYOUT_PATH="$HOME/.tmux/layouts"
-ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
+source ~/.zsh/config
 
 source ~/.zgen/zgen.zsh
 if ! zgen saved; then
@@ -23,7 +21,6 @@ if ! zgen saved; then
     zgen save
 fi
 
-source ~/.zsh/config
 if is-interactive; then
     source ~/.zsh/keybinds
     source ~/.zsh/prompt