From a48ea78ab6c525f4ac560ed781c1b79dea6083f7 Mon Sep 17 00:00:00 2001
From: koumakpet <koumakpet@protonmail.com>
Date: Sun, 29 Mar 2020 17:24:52 +0200
Subject: [PATCH] ~/ cleanup parameters added set new location for vim's bundle
 (to keep it organized)

---
 files/.config/vim/vimrc |  6 ++----
 files/.zshrc            | 15 +++++++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/files/.config/vim/vimrc b/files/.config/vim/vimrc
index d9d69eb..da2e911 100755
--- a/files/.config/vim/vimrc
+++ b/files/.config/vim/vimrc
@@ -1,6 +1,6 @@
 " TODO: Spell Checking
 
-set nocompatible				" Disable vi compatibilty (Use vi improved only)
+set nocompatible				" Disable vi compatibilty (Use vi improved only) - required for Vundle
 set encoding=utf-8				" Use UTF-8
 syntax enable					" Turn on syntax highlighting
 set showmatch					" Show matching brackets
@@ -80,7 +80,7 @@ map <C-p> "+P
 autocmd BufWritePre * %s/\s\+$//e
 
 " Vundle Init
-set rtp+=~/.vim/bundle/Vundle.vim
+set rtp+=~/.local/share/vim/bundle/Vundle.vim
 call vundle#begin()
 
 " Plugins
@@ -96,8 +96,6 @@ Plugin 'vim-syntastic/syntastic'		" Syntax checking
 Plugin 'PotatoesMaster/i3-vim-syntax'	" Add syntax for i3 config
 Plugin 'jmcantrell/vim-virtualenv'		" Manage Virtual Enviroment
 Plugin 'wakatime/vim-wakatime'			" Install WakaTime (Shows coding time)
-Plugin 'gko/vim-coloresque'				" Show color highlight in css/html/less/sass
-
 " Vundle End
 call vundle#end()
 filetype plugin indent on
diff --git a/files/.zshrc b/files/.zshrc
index 2758700..9320ee3 100755
--- a/files/.zshrc
+++ b/files/.zshrc
@@ -8,6 +8,7 @@ HISTFILE=$ZSH_CACHE/history
 # Move .zsh-update to $ZSH_CACHE
 [ -f ~/.zsh-update ] && mv ~/.zsh-update $ZSH_CACHE/.zsh-update
 
+export ZSH_COMPDUMP="$XDG_CACHE_HOME/zsh/zcompdump-$ZSH_VERSION"
 
 
 # Export oh-my-zsh location as $ZSH
@@ -33,8 +34,8 @@ autoload -U colors && colors
 autoload -U compinit
 zstyle ':completion:*' menu select
 zmodload zsh/complist
-compinit
-_comp_options+=(globdots)
+compinit -d $ZSH_COMPDUMP
+comp_options+=(globdots)
 
 # Setup aliases
 [ -f ~/.config/sh/.aliases ] && source ~/.config/sh/.aliases
@@ -45,11 +46,17 @@ export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_DATA_HOME="$HOME/.local/share"
 
 # ~/ Clean-up
-export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # Might break some DMs
-export WGETRC="$HOME/.config/wget/wgetrc"
+export WGETRC="$XDG_CONFIG_HOME"/wget/wgetrc
 export LESSHISTFILE="-"
 export VIMINIT=":source $XDG_CONFIG_HOME"/vim/vimrc
+export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
+export WAKATIME_HOME="$XDG_CONFIG_HOME"/wakatime
+export KDEHOME="$XDG_CONFIG_HOME"/kde
+export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv
+export GNUPGHOME="$XDG_DATA_HOME"/gnupg
 
+# Add ~/Personal/Shell-Scripts to PATH
+PATH+=":$HOME/.scripts"
 
 # Load zsh-syntax-highlighting (should be last)
 source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh