From de8bacbf153e5422f9c546e3887e1205d9058d95 Mon Sep 17 00:00:00 2001
From: Nikolas Weger <nikolasweger@googlemail.com>
Date: Fri, 2 Oct 2015 12:36:39 +0200
Subject: [PATCH] changed around some paths

---
 git/gitconfig     |  2 +-
 install.conf.yaml |  7 +------
 zsh/alias.zsh     | 18 +++++++++---------
 zsh/inputrc       |  2 --
 zsh/zshrc         | 29 ++++++++++++-----------------
 5 files changed, 23 insertions(+), 35 deletions(-)
 delete mode 100644 zsh/inputrc

diff --git a/git/gitconfig b/git/gitconfig
index 15c741b..5e62b42 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -98,4 +98,4 @@
         detachedHead = false
 
 [core]
-        excludesfile = ~/.gitignore_global
+        excludesfile = ~/dotfiles/git/gitignore_global
diff --git a/install.conf.yaml b/install.conf.yaml
index 3ae091b..d0508a4 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -1,18 +1,13 @@
-- clean: ['~', '~/.config']
+- clean: ['~']
 
 - link:
-    ~/.dotfiles: ''
     ~/bin: bin
     ~/utils: sysadmin-util
     ~/.fzf: lib/fzf
     ~/.nano: lib/nano/syntax
     ~/.nanorc: lib/nano/syntax/nanorc
-    ~/.dircolors: zsh/dircolors
     ~/.gitconfig: git/gitconfig
-    ~/.gitignore_global: git/gitignore_global
-    ~/.zsh: zsh
     ~/.zshrc: zsh/zshrc
-    ~/.inputrc: zsh/inputrc
 
 - shell:
   - git update-submodules # after linking ~/.gitconfig
diff --git a/zsh/alias.zsh b/zsh/alias.zsh
index 7b1fd5a..9bcc131 100644
--- a/zsh/alias.zsh
+++ b/zsh/alias.zsh
@@ -1,26 +1,26 @@
 # Listing
-source ~/.zsh/aliases.d/list.zsh
+source ${HOME}/dotfiles/zsh/aliases.d/list.zsh
 
 # Grep
-source ~/.zsh/aliases.d/grep.zsh
+source ${HOME}/dotfiles/zsh/aliases.d/grep.zsh
 
 # Tail
-source ~/.zsh/aliases.d/tail.zsh
+source ${HOME}/dotfiles/zsh/aliases.d/tail.zsh
 
 # CD
-source ~/.zsh/aliases.d/cd.zsh
+source ${HOME}/dotfiles/zsh/aliases.d/cd.zsh
 
 # Du/Find
-source ~/.zsh/aliases.d/find.zsh
+source ${HOME}/dotfiles/zsh/aliases.d/find.zsh
 
 # Stuff
-source ~/.zsh/aliases.d/stuff.zsh
+source ${HOME}/dotfiles/zsh/aliases.d/stuff.zsh
 
 # Interactive
-source ~/.zsh/aliases.d/interactive.zsh
+source ${HOME}/dotfiles/zsh/aliases.d/interactive.zsh
 
 # Own
-source ~/.zsh/aliases.d/own.zsh
+source ${HOME}/dotfiles/zsh/aliases.d/own.zsh
 
 # Transfer
-source ~/.zsh/aliases.d/transfer.zsh
+source ${HOME}/dotfiles/zsh/aliases.d/transfer.zsh
diff --git a/zsh/inputrc b/zsh/inputrc
deleted file mode 100644
index 62b61bf..0000000
--- a/zsh/inputrc
+++ /dev/null
@@ -1,2 +0,0 @@
-"\e[1~": beginning-of-line
-"\e[4~": end-of-line
diff --git a/zsh/zshrc b/zsh/zshrc
index e49f91c..5ddf501 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,5 +1,5 @@
 # Oh My ZSH Path
-export ZSH=${HOME}/.dotfiles/lib/ohmyzsh
+export ZSH=${HOME}/dotfiles/lib/ohmyzsh
 
 # Oh My ZSH Theme
 ZSH_THEME="pygmalion"
@@ -25,32 +25,27 @@ export EDITOR='nano'
 # Load Oh My ZSH
 source ${ZSH}/oh-my-zsh.sh
 
+# Fix home/end key
+bindkey "^[[1~" beginning-of-line
+bindkey "^[[4~" end-of-line
+
 # Source k.sh
-source ${HOME}/.dotfiles/lib/k/k.sh
+source ${HOME}/dotfiles/lib/k/k.sh
 
 # Shell Syntax Highlighter
-source ${HOME}/.dotfiles/lib/highlighting/zsh-syntax-highlighting.zsh
+source ${HOME}/dotfiles/lib/highlighting/zsh-syntax-highlighting.zsh
 ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
 
-# CD without typing cd
-setopt autocd
-
-# History
-setopt histsavenodups
-setopt histverify
-setopt histignorealldups
-setopt extendedhistory
-setopt histreduceblanks
-export HISTSIZE=1000000 SAVEHIST=1000000 HISTFILE=${HOME}/.zhistory
-
 # Dircolors
-eval `dircolors ${HOME}/.dircolors`
+eval `dircolors ${HOME}/dotfiles/zsh/dircolors`
 
 # Source Aliases
-source ${HOME}/.zsh/alias.zsh
+source ${HOME}/dotfiles/zsh/alias.zsh
 
 # Source FZF
 [ -f ${HOME}/.fzf.zsh ] && source ${HOME}/.fzf.zsh
 
 # Completions Path
-fpath=(${HOME}/.dotfiles/lib/completions/src $fpath)
+fpath=(${HOME}/dotfiles/lib/completions/src $fpath)
+
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh