From 5246e26a6bc546ad52f815978c31a85f359a0a85 Mon Sep 17 00:00:00 2001
From: Nikolas Weger <weger@hbz-nrw.de>
Date: Fri, 23 Jul 2021 15:04:04 +0200
Subject: [PATCH] prepare for chezmoi

---
 {zsh => .config/dotfiles}/files/direnv.zsh   |  0
 {zsh => .config/dotfiles}/files/sshagent.zsh |  0
 {zsh => .config/dotfiles}/starship.toml      |  0
 .gitignore                                   |  1 -
 zsh/.p10k.zsh => .p10k.zsh                   |  0
 zshenv => .zshenv                            |  0
 zsh/rc.zsh => .zshrc                         | 18 ++++++++++--------
 zsh/.zshrc                                   |  1 -
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename {zsh => .config/dotfiles}/files/direnv.zsh (100%)
 rename {zsh => .config/dotfiles}/files/sshagent.zsh (100%)
 rename {zsh => .config/dotfiles}/starship.toml (100%)
 delete mode 100644 .gitignore
 rename zsh/.p10k.zsh => .p10k.zsh (100%)
 rename zshenv => .zshenv (100%)
 rename zsh/rc.zsh => .zshrc (89%)
 delete mode 120000 zsh/.zshrc

diff --git a/zsh/files/direnv.zsh b/.config/dotfiles/files/direnv.zsh
similarity index 100%
rename from zsh/files/direnv.zsh
rename to .config/dotfiles/files/direnv.zsh
diff --git a/zsh/files/sshagent.zsh b/.config/dotfiles/files/sshagent.zsh
similarity index 100%
rename from zsh/files/sshagent.zsh
rename to .config/dotfiles/files/sshagent.zsh
diff --git a/zsh/starship.toml b/.config/dotfiles/starship.toml
similarity index 100%
rename from zsh/starship.toml
rename to .config/dotfiles/starship.toml
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 810742a..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-zsh/local/*
diff --git a/zsh/.p10k.zsh b/.p10k.zsh
similarity index 100%
rename from zsh/.p10k.zsh
rename to .p10k.zsh
diff --git a/zshenv b/.zshenv
similarity index 100%
rename from zshenv
rename to .zshenv
diff --git a/zsh/rc.zsh b/.zshrc
similarity index 89%
rename from zsh/rc.zsh
rename to .zshrc
index 560dc03..06d0adf 100644
--- a/zsh/rc.zsh
+++ b/.zshrc
@@ -1,7 +1,6 @@
 # Enable Powerlevel10k instant prompt
 [[ -r "$HOME/.cache/p10k-instant-prompt-${(%):-%n}.zsh" ]] && source "$HOME/.cache/p10k-instant-prompt-${(%):-%n}.zsh"
 
-export fpath=($fpath $ZDOTDIR/local/fpath)
 export SPACEVIMDIR="$HOME/.config/spacevim/"
 export FZF_MARKS_FILE=$HOME/.config/fzfmarks
 export STARSHIP_CONFIG=$ZDOTDIR/starship.toml
@@ -41,6 +40,12 @@ alias cat='bat'
 alias rm='rm -i'
 alias cp='cp -i'
 alias mv='mv -i'
+alias grep='grep --color=auto'
+alias fgrep='fgrep --color=auto'
+alias egrep='egrep --color=auto'
+alias diff='diff --color=auto'
+alias ip='ip --color=auto'
+alias vim='nvim'
 
 alias sc-status="sudo systemctl status"
 alias sc-start="sudo systemctl start"
@@ -53,13 +58,9 @@ alias sc-daemon-reload="sudo systemctl daemon-reload"
 
 alias termbin="nc termbin.com 9999"
 
-gitpush () { git add .; git commit -m "$*"; git pull; git push }
-dotupdate () { echo -n "Updating Dotfiles... "; git -C $HOME/.config/dotfiles pull &>/dev/null; echo "done" }
-themeupdate () { curl -fsSL https://starship.rs/install.sh | bash -s -- --force }
-
 # Library Files
-source $ZDOTDIR/files/direnv.zsh
-source $ZDOTDIR/files/sshagent.zsh
+source $HOME/.config/dotfiles/.config/dotfiles/files/direnv.zsh
+source $HOME/.config/dotfiles/.config/dotfiles/files/sshagent.zsh
 zinit pack for ls_colors
 zinit snippet OMZL::history.zsh
 zinit snippet OMZL::functions.zsh
@@ -91,6 +92,7 @@ zinit ice lucid; zinit light "urbainvaes/fzf-marks"
 zinit ice lucid; zinit light "Aloxaf/fzf-tab"
 zinit ice lucid; zinit light "wfxr/forgit"
 zinit ice lucid; zinit light "reegnz/jq-zsh-plugin"
+[[ -f /home/linuxbrew/.linuxbrew/bin/brew ]] && _evalcache /home/linuxbrew/.linuxbrew/bin/brew shellenv
 
 # syntax highlighting
 zinit ice lucid atinit"ZINIT[COMPINIT_OPTS]=-C; zpcompinit; zpcdreplay"; zinit light "zdharma/fast-syntax-highlighting"
@@ -100,4 +102,4 @@ zinit ice depth=1; zinit light "romkatv/powerlevel10k"
 [[ ! -f "$ZDOTDIR/.p10k.zsh" ]] || source "$ZDOTDIR/.p10k.zsh" # p10k configure || nano ~/.config/dotfiles/zsh/.p10k.zsh
 
 # Local RC
-[[ -f "$ZDOTDIR/local/rc.zsh" ]] && source "$ZDOTDIR/local/rc.zsh"
+[[ -f "$HOME/.config/local/rc.zsh" ]] && source "$HOME/.config/local/rc.zsh"
diff --git a/zsh/.zshrc b/zsh/.zshrc
deleted file mode 120000
index 385a63a..0000000
--- a/zsh/.zshrc
+++ /dev/null
@@ -1 +0,0 @@
-rc.zsh
\ No newline at end of file