From 5d5dcf6c8429c259c5a8bf6c2c599eee3e1aafb5 Mon Sep 17 00:00:00 2001
From: Tobias Manske <tobias.manske@mailbox.org>
Date: Sun, 15 Jul 2018 14:46:28 +0200
Subject: [PATCH] ZSH: Fixed config doubling. Added CTRL+R support. Added fzf
 support.

---
 zsh/.zimrc | 116 +++++++----------------------------------------------
 1 file changed, 14 insertions(+), 102 deletions(-)

diff --git a/zsh/.zimrc b/zsh/.zimrc
index 7dbb9a3..1973cb1 100644
--- a/zsh/.zimrc
+++ b/zsh/.zimrc
@@ -1,96 +1,3 @@
-
-
-#################
-# 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)
-
-
-###################
-# 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 cursor)
-
-
-#
-# SSH
-#
-
-# Load these ssh identities with the ssh module
-zssh_ids=(id_ed25519)
-
-
-#
-# Pacman
-#
-
-# Set (optional) pacman front-end.
-#zpacman_frontend='powerpill'
-
-# Load any helper scripts as defined here
-#zpacman_helper=(aur)
-
 #################
 # CORE SETTINGS #
 #################
@@ -170,28 +77,37 @@ zhighlighters=(main brackets)
 #
 
 # Load these ssh identities with the ssh module
-zssh_ids=(id_rsa)
+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;
@@ -208,13 +124,9 @@ fuck () {
     test -n "$TF_CMD" && print -s $TF_CMD
 }
 
-# Set (optional) pacman front-end.
-# zpacman_frontend='powerpill'
-
-# Load any helper scripts as defined here
-zpacman_helper=(aur)
 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