ZSH: Move config to main directory

The config was placed in the zsh directory beforehand, this directory is
now managed by the upstream repo. Therefore the config file had to move.

Signed-off-by: Tobias Manske <tobias.manske@mailbox.org>

.zimrc

@@ -0,0 +1,132 @@
+#################
+# 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 \
+          syntax-highlighting history-substring-search prompt completion \
+          pacman git-info fasd )
+source ~/.zim/modules/zsh-autosuggestions/zsh-autosuggestions.zsh
+
+###################
+# 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 command correction prompts
+# See: http://zsh.sourceforge.net/Doc/Release/Options.html#Input_002fOutput
+setopt CORRECT
+
+#
+# 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
+#
+
+# 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)
+
+
+#
+# SSH
+#
+
+# Load these ssh identities with the ssh module
+zssh_ids=(id_ed25519)
+
+# Load any helper scripts as defined here
+zpacman_helper=(aur)
+
+# URXVT fix
+autoload -Uz add-zsh-hook
+function xterm_title_precmd () {
+    print -Pn '\e]2;%n@%m:%~\a'
+}
+
+if [[ "$TERM" == (screen*|xterm*|rxvt*) ]]; then
+    add-zsh-hook -Uz precmd xterm_title_precmd
+    # add-zsh-hook -Uz preexec xterm_title_preexec
+fi
+
+
+# ALIASES
+alias -g cb="xclip -selection clipboard"
+alias -g tb="nc termbin.com 9999 | xclip -selection clipboard"
+alias -g sshot='xfce4-screenshooter -o "$(which xclip) -i -t image/png -selection clipboard" $@'
+alias -g steam-wine='WINEDEBUG=-all wine ~/.wine/drive_c/Program\ Files\ \(x86\)/Steam/Steam.exe -no-cef-sandbox >/dev/null 2>&1 &'
+
+# History search
+bindkey -v
+bindkey '^R' history-incremental-search-backward
+
+# fzf
+source /usr/share/fzf/key-bindings.zsh
+source /usr/share/fzf/completion.zsh
+
+# thefuck
+fuck () {
+    TF_PYTHONIOENCODING=$PYTHONIOENCODING;
+    export TF_SHELL=zsh;
+    export TF_ALIAS=fuck;
+    export TF_SHELL_ALIASES=$(alias);
+    export TF_HISTORY="$(fc -ln -10)";
+    export PYTHONIOENCODING=utf-8;
+    TF_CMD=$(
+        thefuck THEFUCK_ARGUMENT_PLACEHOLDER $@
+    ) && eval $TF_CMD;
+    unset TF_HISTORY;
+    export PYTHONIOENCODING=$TF_PYTHONIOENCODING;
+    test -n "$TF_CMD" && print -s $TF_CMD
+}
+
+export VISUAL="vim"
+export PATH=/usr/local/texlive/2016/bin/x86_64-linux:$PATH
+
+# If not running interactively, do not do anything
+[[ $- != *i* ]] && return
+[[ -z "$TMUX" ]] && exec tmux -u

Makefile

@@ -33,7 +33,7 @@ zsh:
 	ln -s ~/.dotfiles/zsh ~/.zim
 	zsh zimsetup.zsh
 	rm ~/.zimrc
-	ln -s ~/.dotfiles/zsh/.zimrc ~/.zimrc
+	ln -s ~/.dotfiles/.zimrc ~/.zimrc
 
 compton:
 	ln -s ~/.dotfiles/.compton.conf ~/.compton.conf