Rework bash files

Makefile

@@ -2,21 +2,21 @@ linux: link bash_git_prompt tmux vim
 macos: link link_mac mac_setup bash_git_prompt brew cask tmux vim
 
 link:
-	rm ~/.bash_aliases
+	-rm ~/.aliases
-	rm ~/.bashrc
+	-rm ~/.bashrc
-	rm ~/.bash_profile
+	-rm ~/.bash_profile
-	rm ~/.git-completion.bash
+	-rm ~/.git-completion.bash
-	rm ~/.gitconfig
+	-rm ~/.gitconfig
-	rm ~/.tmux.conf
+	-rm ~/.tmux.conf
-	ln -s ~/Git/dotfiles/bash/.bash_aliases ~
+	ln -s ~/Git/dotfiles/shell/.aliases ~
-	ln -s ~/Git/dotfiles/bash/.bashrc ~
+	ln -s ~/Git/dotfiles/shell/.bashrc ~
-	ln -s ~/Git/dotfiles/bash/.bash_profile ~
+	ln -s ~/Git/dotfiles/shell/.bash_profile ~
 	ln -s ~/Git/dotfiles/git/.git-completion.bash ~
 	ln -s ~/Git/dotfiles/git/.gitconfig ~
 	ln -s ~/Git/dotfiles/tmux/.tmux.conf ~
 
 link_mac:
-	rm ~/.hushlogin
+	-rm ~/.hushlogin
 	ln -s ~/Git/dotfiles/macos/.hushlogin ~
 
 mac_setup:
@@ -34,12 +34,12 @@ cask_personal:
 
 tmux:
 	git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
-	rm ~/.tmux/themes
+	-rm ~/.tmux/themes
 	ln -s ~/Git/dotfiles/tmux/themes ~/.tmux/themes
 
 bash_git_prompt:
 	git clone https://github.com/magicmonty/bash-git-prompt.git ~/.bash-git-prompt --depth=1
-	rm ~/.git-prompt-colors
+	-rm ~/.git-prompt-colors
 	ln -s ~/Git/dotfiles/git/.git-prompt-colors.sh ~
 
 vim:

README.md

@@ -1,4 +1,16 @@
 dotfiles
 ========
 
-Some of my dotfiles
+Some of my dotfiles
+
+### Home folder structure
+```
+.bashrc
+.bash_profile
+.bash_profile.local
+.aliases
+.aliases.local
+.zsh/
+  .zshrc
+  .zshrc.local
+  .zprompt

shell/.aliases

@@ -1,15 +1,23 @@
 ##### Platform independent #####
 
 # Files
+alias ...="cd ../../"
+alias ....="cd ../../../"
+
 alias df1="du -h -d 1"
+
 alias ls='ls -hG'
 alias ll='ls -alhFG'
 alias la='ls -AG'
 alias l='ls -CFG'
+
 alias grep='grep --color=auto'
 alias fgrep='fgrep --color=auto'
 alias egrep='egrep --color=auto'
 
+# CD-ing to some commonly used folders
+alias og="cd ~/Git"
+
 # Git Aliases
 alias g="git"
 alias ga="git add"
@@ -62,12 +70,5 @@ alias be="bundle exec"
 alias serve="python -m http.server 9000"
 alias yda="youtube-dl -x --audio-format mp3"
 
-# CD-ing to some commonly used folders
-alias og="cd ~/Git"
-
 ##### Mac OS Specific #####
 alias fl="open -a ForkLift"
-
-if [ -f ~/.bash_aliases.local ]; then
-    . ~/.bash_aliases.local
-fi

shell/.bash_profile

@@ -65,10 +65,15 @@ export BASH_SILENCE_DEPRECATION_WARNING=1
 # Sources & exports  #
 ######################
 
-if [ -f ~/.bash_aliases ]; then
+if [ -f ~/.aliases ]; then
-  source ~/.bash_aliases
+  source ~/.aliases
 fi
 
+if [ -f ~/.aliases.local ]; then
+    . ~/.aliases.local
+fi
+
+
 if [ -f ~/.bash_profile.local ]; then
   source ~/.bash_profile.local
 fi