From 0823288a5b44342cf0f604c58654648325d16909 Mon Sep 17 00:00:00 2001
From: Tobias Manske <tobias.manske@mailbox.org>
Date: Sun, 2 Sep 2018 07:52:32 +0200
Subject: [PATCH] ZSH: Fix Makefile and adjust .zimrc to new version

The new version removed fasd from modules and incorperates the
zsh-autosuggestions module as "autosuggestions". Therefore small changes
to the modules directive have been necessary.

Signed-off-by: Tobias Manske <tobias.manske@mailbox.org>
---
 .zimrc   | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 Makefile |   5 ++-
 2 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/.zimrc b/.zimrc
index 1973cb1..e5ee9e7 100644
--- a/.zimrc
+++ b/.zimrc
@@ -1,3 +1,5 @@
+
+
 #################
 # CORE SETTINGS #
 #################
@@ -6,13 +8,109 @@
 # Zim settings
 #
 
+# Select what modules you would like enabled.
+# The second line of modules may depend on options set by modules in the first
+# line. These dependencies are noted on the respective module's README.md.
+zmodules=(directory environment git git-info history input utility custom \
+          prompt completion syntax-highlighting history-substring-search )
+
+
+###################
+# MODULE SETTINGS #
+###################
+
+#
+# Prompt
+#
+
+# Set your desired prompt here
+zprompt_theme='steeef'
+
+#
+# Completion
+#
+
+# Set an optional host-specific filename for the completion cache file. If none
+# is provided, the default '.zcompdump' is used.
+#zcompdump_file=".zcompdump-${HOST}-${ZSH_VERSION}"
+
+#
+# Utility
+#
+
+# Uncomment to enable spelling correction prompt for commands. See:
+# http://zsh.sourceforge.net/Doc/Release/Options.html#Input_002fOutput
+#setopt CORRECT
+
+# Set custom spelling correction prompt
+#SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
+
+#
+# Environment
+#
+
+# Set the string below to the desired terminal title format string.
+# The terminal title is redrawn upon directory change, however, variables like
+# ${PWD} are only evaluated once. Use prompt expansion strings for dynamic data:
+#   http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Simple-Prompt-Escapes
+# The example below uses the following format: 'username@host:/current/directory'
+ztermtitle='%n@%m:%~'
+
+#
+# Input
+#
+
+# Set to vi or emacs
+zinput_mode='emacs'
+
+# Uncomment to enable double-dot expansion. This appends '../' to your input for
+# each '.' you type after an initial '..'
+#zdouble_dot_expand='true'
+
+#
+# Syntax-Highlighting
+#
+
+# This determines what highlighters will be used with the syntax-highlighting module.
+# Documentation of the highlighters can be found here:
+#   https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
+# For (u)rxvt, termite and gnome-terminal users,
+# removing the 'cursor' highlighter will fix the disappearing cursor problem
+zhighlighters=(main brackets cursor)
+
+
+#
+# SSH
+#
+
+# Load these ssh identities with the ssh module
+#zssh_ids=(id_rsa)
+
+
+#
+# Pacman
+#
+
+# Set (optional) pacman front-end.
+#zpacman_frontend='powerpill'
+
+# Load any helper scripts as defined here
+#zpacman_helper=(aur)#################
+# CORE SETTINGS #
+#################
+
+#
+# Zim settings
+#
+
 # Select what modules you would like enabled.
 # The second line of modules may depend on options set by modules in the first line.
 # These dependencies are noted on the respective module's README.md.
-zmodules=(directory environment git history input utility meta custom \
+zmodules=(directory environment git history input utility custom \
           syntax-highlighting history-substring-search prompt completion \
-          pacman git-info fasd )
-source ~/.zim/modules/zsh-autosuggestions/zsh-autosuggestions.zsh
+          pacman git-info fasd autosuggestions )
+
+# source ~/.zim/modules/autosuggestions/autosuggestions.zsh
 
 ###################
 # MODULE SETTINGS #
diff --git a/Makefile b/Makefile
index b9e7695..649a60e 100644
--- a/Makefile
+++ b/Makefile
@@ -30,9 +30,12 @@ albert:
 	ln -s ~/.dotfiles/albert ~/.config/albert
 
 zsh:
+	cd ~/.dotfiles/zsh/ && git submodule init && git submodule update
+	rm ~/.zim || echo
 	ln -s ~/.dotfiles/zsh ~/.zim
+	cd ~/.dotfiles
 	zsh zimsetup.zsh
-	rm ~/.zimrc
+	rm ~/.zimrc || echo
 	ln -s ~/.dotfiles/.zimrc ~/.zimrc
 
 compton: