From 4f39666b1661217911bc26b218e3402a7308570f Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 6 Oct 2017 12:15:48 +0200
Subject: [PATCH] Update zsh config

---
 shell/+zsh/.zshrc       | 5 ++++-
 shell/+zsh/config.zsh   | 3 ---
 shell/+zsh/keybinds.zsh | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/shell/+zsh/.zshrc b/shell/+zsh/.zshrc
index 78185e46..77246d02 100644
--- a/shell/+zsh/.zshrc
+++ b/shell/+zsh/.zshrc
@@ -3,6 +3,8 @@
 # By Henrik Lissner <henrik@lissner.net>
 
 if is-interactive; then
+    AUTOPAIR_INHIBIT_INIT=1
+
     repo "tarjoilija/zgen" "$HOME/.zgen"
     source "$HOME/.zgen/zgen.zsh"
     if ! zgen saved; then
@@ -10,7 +12,7 @@ if is-interactive; then
 
         cache-clear
 
-        zgen load hlissner/zsh-autopair "autopair.zsh"
+        zgen load hlissner/zsh-autopair
         zgen load zsh-users/zsh-history-substring-search
         zgen load zdharma/history-search-multi-word
         zgen load zsh-users/zsh-completions src
@@ -27,6 +29,7 @@ if is-interactive; then
     load shell/+zsh/prompt.zsh
 
     cache fasd --init posix-alias zsh-hook zsh-ccomp zsh-ccomp-install zsh-wcomp zsh-wcomp-install
+    autopair-init
 fi
 loadall aliases.zsh
 
diff --git a/shell/+zsh/config.zsh b/shell/+zsh/config.zsh
index 80162b80..b52ca970 100644
--- a/shell/+zsh/config.zsh
+++ b/shell/+zsh/config.zsh
@@ -1,6 +1,3 @@
-## Plugin config
-AUTOPAIR_SPC_WIDGET=magic-space
-
 ## General
 # Treat these characters as part of a word.
 WORDCHARS='_-*?[]~&.;!#$%^(){}<>'
diff --git a/shell/+zsh/keybinds.zsh b/shell/+zsh/keybinds.zsh
index 19a0b7f6..f7a0ce1b 100644
--- a/shell/+zsh/keybinds.zsh
+++ b/shell/+zsh/keybinds.zsh
@@ -9,6 +9,7 @@ autoload -U is-at-least
 ## vi-mode ###############
 bindkey -v
 bindkey -M viins 'jk' vi-cmd-mode
+bindkey -M viins ' ' magic-space
 # bindkey -M viins '^I' expand-or-complete-prefix
 
 # surround