From 78eff56e53d4cd9e5f9264fa14f62bcada4d8b0f Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 14 Jan 2020 14:57:48 +0000
Subject: [PATCH] Move zsh configs

---
 rcrc                                          |  2 +-
 .../configs}/aliases.zsh                      | 26 ++-----------------
 .../configs}/functions.zsh                    |  0
 .../configs}/navigation.zsh                   |  0
 .../configs}/platformsh.zsh                   |  0
 tag-zsh/zshrc                                 |  2 +-
 6 files changed, 4 insertions(+), 26 deletions(-)
 rename tag-zsh/{zsh_profile.d => zsh/configs}/aliases.zsh (54%)
 rename tag-zsh/{zsh_profile.d => zsh/configs}/functions.zsh (100%)
 rename tag-zsh/{zsh_profile.d => zsh/configs}/navigation.zsh (100%)
 rename tag-zsh/{zsh_profile.d => zsh/configs}/platformsh.zsh (100%)

diff --git a/rcrc b/rcrc
index 8f46470..1178538 100644
--- a/rcrc
+++ b/rcrc
@@ -1,4 +1,4 @@
 DOTFILES_DIRS="$HOME/dotfiles-local $HOME/dotfiles"
 EXCLUDES="install.sh README.md"
-SYMLINK_DIRS="composer bin functions zsh_profile.d"
+SYMLINK_DIRS="composer bin functions configs"
 TAGS="git npm php tmux vim zsh"
diff --git a/tag-zsh/zsh_profile.d/aliases.zsh b/tag-zsh/zsh/configs/aliases.zsh
similarity index 54%
rename from tag-zsh/zsh_profile.d/aliases.zsh
rename to tag-zsh/zsh/configs/aliases.zsh
index e08b184..e2d22af 100644
--- a/tag-zsh/zsh_profile.d/aliases.zsh
+++ b/tag-zsh/zsh/configs/aliases.zsh
@@ -1,14 +1,3 @@
-alias ga="git add"
-alias gc="git commit"
-alias gca="git commit --amend --no-edit --reset-author"
-alias gcm="git commit -m"
-alias gl="git log"
-alias gs="git status"
-
-alias gh="github"
-alias nah="git reset --hard && git clean -fd"
-alias wip="git add . && git commit -m 'wip'"
-
 alias l="ls -lah"
 
 # Fast open
@@ -20,9 +9,6 @@ alias pstorm="phpstorm"
 alias st="subl"
 alias stt="subl ."
 
-# Quickly go to the Code directory
-alias web="cd ~/Code"
-
 alias y=yarn
 alias ya='yarn add'
 alias yd="yarn dev"
@@ -30,19 +16,10 @@ alias yp="yarn prod"
 alias ys="yarn serve"
 alias yw="yarn watch"
 
-# Shorter Git commands.
-alias add='git add'
-alias amend='git commit --amend'
-alias clone='git clone'
-alias commit='git commit'
-alias pull='git pull'
-alias push='git push'
-alias rebase='git rebase'
-alias reset='git reset'
-
 alias hosts="sudo vim /etc/hosts"
 alias sshconfig='vim ~/.ssh/config'
 alias zshconfig='vim ~/.zshrc'
+
 # Pretty print the path
 alias path='echo $PATH | tr -s ":" "\n"'
 
@@ -51,5 +28,6 @@ alias pstorm='open -a /Applications/PhpStorm.app "`pwd`"'
 
 # Sublime Text
 alias sublime='open -a /Applications/Sublime\ Text.app "`pwd`"'
+
 # Include custom aliases
 [[ -f ~/.aliases.local ]] && source ~/.aliases.local
diff --git a/tag-zsh/zsh_profile.d/functions.zsh b/tag-zsh/zsh/configs/functions.zsh
similarity index 100%
rename from tag-zsh/zsh_profile.d/functions.zsh
rename to tag-zsh/zsh/configs/functions.zsh
diff --git a/tag-zsh/zsh_profile.d/navigation.zsh b/tag-zsh/zsh/configs/navigation.zsh
similarity index 100%
rename from tag-zsh/zsh_profile.d/navigation.zsh
rename to tag-zsh/zsh/configs/navigation.zsh
diff --git a/tag-zsh/zsh_profile.d/platformsh.zsh b/tag-zsh/zsh/configs/platformsh.zsh
similarity index 100%
rename from tag-zsh/zsh_profile.d/platformsh.zsh
rename to tag-zsh/zsh/configs/platformsh.zsh
diff --git a/tag-zsh/zshrc b/tag-zsh/zshrc
index 195cafe..b78848d 100644
--- a/tag-zsh/zshrc
+++ b/tag-zsh/zshrc
@@ -98,7 +98,7 @@ for function in $HOME/.zsh/functions/*; do
   source $function
 done
 
-for zsh_source in $HOME/.zsh_profile.d/*.zsh; do
+for zsh_source in $HOME/.zsh/configs/*.zsh; do
   source $zsh_source
 done