Rearrange files in .config folder, update makefile

.gitignore

@@ -1,5 +1,5 @@
 .DS_Store
-.vim/bundle
+home/.vim/bundle
-.vim/undodir
+home/.vim/undodir
 Brewfile.lock.json
 Caskfile.lock.json

Makefile

@@ -2,25 +2,12 @@ linux: link bash_git_prompt tmux vim zsh
 macos: link link_mac mac_setup bash_git_prompt tmux vim zsh brew
 
 link:
-	-rm ~/.aliases
+	ln -fs ~/Git/dotfiles/home/.config/bash ~/.config/
-	-rm ~/.bash_profile
+	mkdir -p ~/.config/git
-	-rm ~/.bashrc
+	ln -fs ~/Git/dotfiles/home/.config/git/.gitconfig ~/.config/git/.gitconfig
-	-rm ~/.git-completion.bash
+	ln -fs ~/Git/dotfiles/home/.config/.aliases ~/.config/
-	-rm ~/.gitconfig
+	ln -fs ~/Git/dotfiles/home/.bashrc ~/
-	-rm ~/.tmux.conf
+
-	-rm ~/.zsh/.zprompt
-	-rm ~/.zsh/.zshrc
-	-rm ~/.zshenv
-	mkdir -p ~/.zsh
-	ln -s ~/Git/dotfiles/git/.git-completion.bash ~
-	ln -s ~/Git/dotfiles/git/.gitconfig ~
-	ln -s ~/Git/dotfiles/shell/.aliases ~
-	ln -s ~/Git/dotfiles/shell/.bashrc ~
-	ln -s ~/Git/dotfiles/shell/.bash_profile ~
-	ln -s ~/Git/dotfiles/shell/.zprompt ~/.zsh/
-	ln -s ~/Git/dotfiles/shell/.zshrc ~/.zsh/
-	ln -s ~/Git/dotfiles/shell/.zshenv ~
-	ln -s ~/Git/dotfiles/tmux/.tmux.conf ~
 
 link_mac:
 	-rm ~/.hushlogin
@@ -41,28 +28,32 @@ cask_personal:
 	brew bundle --file ./macos/Caskfile.personal
 
 tmux:
-	git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+	ln -fs ~/Git/dotfiles/home/.tmux.conf ~/
-	-rm ~/.tmux/themes
+	mkdir -p ~/.config/tmux
-	ln -s ~/Git/dotfiles/tmux/themes ~/.tmux/themes
+	ln -fs ~/Git/dotfiles/home/.config/tmux/themes ~/.config/tmux/themes
+	-git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm
 
 bash_git_prompt:
-	-git clone https://github.com/magicmonty/bash-git-prompt.git ~/.bash-git-prompt --depth=1
+	-git clone https://github.com/magicmonty/bash-git-prompt.git ~/.config/bash/bash-git-prompt --depth=1
-	-rm ~/.git-prompt-colors
-	-ln -s ~/Git/dotfiles/git/.git-prompt-colors.sh ~
 
 vim:
 	-rm ~/.vim
 	-rm ~/.vimrc
-	ln -s ~/Git/dotfiles/.vim ~
+	ln -fs ~/Git/dotfiles/home/.vim ~
-	ln -s ~/Git/dotfiles/.vimrc ~
+	ln -fs ~/Git/dotfiles/home/.vimrc ~
 	-git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
 
 zsh:
-	mkdir -p ~/.zsh/plugins
+	ln -fs ~/Git/dotfiles/home/.zshenv ~/
-	-git clone git@github.com:zsh-git-prompt/zsh-git-prompt.git ~/.zsh/plugins/zsh-git-prompt
+	mkdir -p ~/.config/zsh
-	-git clone git@github.com:arzzen/calc.plugin.zsh.git ~/.zsh/plugins/calc.plugin.zsh
+	ln -fs ~/Git/dotfiles/home/.config/zsh/.zprompt ~/.config/zsh/.zprompt
-	-git clone git@github.com:softmoth/zsh-vim-mode.git ~/.zsh/plugins/zsh-vim-mode
+	ln -fs ~/Git/dotfiles/home/.config/zsh/.zshrc ~/.config/zsh/.zshrc
-	-git clone https://github.com/lukechilds/zsh-better-npm-completion.git ~/.zsh/plugins/.zsh-better-npm-completion
+
-	-git clone https://github.com/sunlei/zsh-ssh ~/.zsh/plugins/zsh-ssh
+	mkdir -p ~/.config/zsh/plugins
-	mkdir -p ~/.zsh/plugins/bd
+	-git clone git@github.com:zsh-git-prompt/zsh-git-prompt.git ~/.config/zsh/plugins/zsh-git-prompt
-	curl https://raw.githubusercontent.com/Tarrasch/zsh-bd/master/bd.zsh > ~/.zsh/plugins/bd/bd.zsh
+	-git clone git@github.com:arzzen/calc.plugin.zsh.git ~/.config/zsh/plugins/calc.plugin.zsh
+	-git clone git@github.com:softmoth/zsh-vim-mode.git ~/.config/zsh/plugins/zsh-vim-mode
+	-git clone https://github.com/lukechilds/zsh-better-npm-completion.git ~/.config/zsh/plugins/.zsh-better-npm-completion
+	-git clone https://github.com/sunlei/zsh-ssh ~/.config/zsh/plugins/zsh-ssh
+	mkdir -p ~/.config/zsh/plugins/bd
+	curl https://raw.githubusercontent.com/Tarrasch/zsh-bd/master/bd.zsh > ~/.config/zsh/plugins/bd/bd.zsh

home/.bashrc

@@ -0,0 +1,3 @@
+[ -n "$PS1" ] && source ~/.config/bash/.bash_profile;
+
+[ -f ~/.fzf.bash ] && source ~/.fzf.bash

home/.config/.aliases

@@ -16,7 +16,7 @@ alias l='ls -CFG'
 # fi;
 
 # eza aliases, if available
-if test $(which eza); then
+if type ls >/dev/null 2>&1; then
   eza_params=(
     '--git' '--icons' '--group' '--group-directories-first'
     '--time-style=relative'
@@ -84,8 +84,8 @@ alias dps="docker ps"
 alias dl="docker logs"
 
 # Editing files
-alias aliases="code ~/.aliases"
+alias aliases="code ~/.config/aliases"
-alias laliases="code ~/.aliases.local"
+alias laliases="code ~/.config/aliases.local"
 alias zshrc="code $ZDOTDIR/.zshrc"
 alias lzshrc="code $ZDOTDIR/.zshrc.local"
 alias vimrc="vim ~/.vimrc"

home/.config/bash/.bash_profile

@@ -65,22 +65,22 @@ export BASH_SILENCE_DEPRECATION_WARNING=1
 # Sources & exports  #
 ######################
 
-if [ -f ~/.aliases ]; then
+if [ -f ~/.config/.aliases ]; then
-  source ~/.aliases
+  source ~/.config/.aliases
 fi
 
-if [ -f ~/.aliases.local ]; then
+if [ -f ~/.config/.aliases.local ]; then
-    . ~/.aliases.local
+    . ~/.config/.aliases.local
 fi
 
 
-if [ -f ~/.bash_profile.local ]; then
+if [ -f ~/.config/bash/.bash_profile.local ]; then
-  source ~/.bash_profile.local
+  source ~/.config/bash/.bash_profile.local
 fi
 
 # bash-git prompt
-if [ -f ~/.bash-git-prompt/gitprompt.sh ]; then
+if [ -f ~/.config/bash/bash-git-prompt/gitprompt.sh ]; then
-  source ~/.bash-git-prompt/gitprompt.sh
+  source ~/.config/bash/bash-git-prompt/gitprompt.sh
 fi
 
 # enable programmable completion features (you don't need to enable
@@ -91,6 +91,6 @@ if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
 fi
 
 # Git completion
-if [ -f ~/.git-completion.bash ]; then
+if [ -f ~/.config/bash/git-completion.bash ]; then
-  source ~/.git-completion.bash
+  source ~/.config/bash/git-completion.bash
 fi

home/.config/bash/.bash_profile.local

@@ -0,0 +1 @@
+export PATH="$HOME/Scripts:$PATH"

home/.config/git/.gitconfig

@@ -1,6 +1,6 @@
 # local user config, usernames, etc
 [include]
-    path=~/.gitconfig.local
+    path=~/.config/git/.gitconfig.local
 [color]
     diff = auto
     status = auto

home/.config/tmux/themes/themes

@@ -0,0 +1 @@
+/home/georgi/Git/dotfiles/home/.config/tmux/themes

home/.config/zsh/.zshrc

@@ -1,14 +1,31 @@
-ZDOTDIR=~/.zsh
+
+ZDOTDIR=~/.config/zsh
 
 setopt auto_cd
 setopt no_case_glob
 setopt glob_complete
 
-setopt correct
+# setopt correct
-setopt correct_all
+# setopt correct_all
 
 setopt completeinword # not just at the end
 
+# --------
+# Comp init
+# --------
+
+# The following lines were added by compinstall
+
+zstyle ':completion:*' completer _complete _ignored _correct _approximate
+zstyle :compinstall filename '/home/georgi/.config/zsh/.zshrc'
+
+autoload -Uz compinit
+compinit
+# End of lines added by compinstall
+
+# Load bashcompinit for some old bash completions
+autoload bashcompinit && bashcompinit
+
 
 # --------
 # History
@@ -39,15 +56,18 @@ fpath+=~/Git/dotfiles/functions
 autoload extract
 
 
+echo "ATTEMPTING TO LOAD"
 [ -f $ZDOTDIR/.zshrc.local ] && source $ZDOTDIR/.zshrc.local
-[ -f ~/.aliases ] && source ~/.aliases
+[ -f ~/.config/.aliases ] && source ~/.config/.aliases
-[ -f ~/.aliases.local ] && source ~/.aliases.local
+[ -f ~/.config/.aliases.local ] && source ~/.config/.aliases.local
 
 
 # --------
 # Plugins
 # --------
-source $(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+if type brew >/dev/null 2>&1; then
+  source $(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+fi
 
 source "$ZDOTDIR/plugins/zsh-vim-mode/zsh-vim-mode.plugin.zsh"
 
@@ -64,14 +84,6 @@ source "$ZDOTDIR/plugins/zsh-ssh/zsh-ssh.zsh"
 source "$ZDOTDIR/plugins/bd/bd.zsh"
 
 
-# --------
-# Comp init
-# --------
-
-autoload -Uz compinit && compinit -i
-
-# Load bashcompinit for some old bash completions
-autoload bashcompinit && bashcompinit
 
 
 # Prompt

home/.tmux.conf

@@ -2,6 +2,8 @@
 #  General Settings
 # ------------------
 
+set-option -g default-shell "/bin/zsh"
+
 # See: https://github.com/gpakosz/.tmux/blob/master/.tmux.conf
 
 # Set Custom Prefix
@@ -31,7 +33,7 @@ setw -g aggressive-resize on
 # -------------------
 
 set -g default-terminal "screen-256color"
-source-file ~/.tmux/themes/tomorrow-night.tmux
+source-file ~/.config/tmux/themes/tomorrow-night.tmux
 
 # Theme Variables
 
@@ -109,7 +111,7 @@ unbind C-Left
 unbind C-Right
 
 # Source this file
-bind r source-file ~/.tmux.conf \; display "Config file reloaded!"
+bind r source-file $HOME/.tmux.conf \; display "Config file reloaded!"
 
 # split current window horizontally
 bind v split-window -h
@@ -160,4 +162,4 @@ set -g @plugin 'tmux-plugins/tmux-cpu'
 set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
 set -g @plugin 'sainnhe/tmux-fzf'
 
-run -b '~/.tmux/plugins/tpm/tpm'
+run -b '~/.config/tmux/plugins/tpm/tpm'

home/.zshenv

@@ -0,0 +1 @@
+ZDOTDIR=$HOME/.config/zsh

shell/.bashrc

@@ -1,3 +0,0 @@
-[ -n "$PS1" ] && source ~/.bash_profile;
-
-[ -f ~/.fzf.bash ] && source ~/.fzf.bash

shell/.zshenv

@@ -1 +0,0 @@
-ZDOTDIR=$HOME/.zsh