From b3b9ee4dcca7802bb23f780de7898c4dc566d9ec Mon Sep 17 00:00:00 2001
From: Bo Jeanes <me@bjeanes.com>
Date: Sun, 23 Aug 2020 11:27:51 +1000
Subject: [PATCH] Hard-code .dotfiles path

Before I switched to Fresh, I assembled my dotfiles with my own script
that ensured this was set, but it is no longer set. I don't need the
dot files directory to be customisable, so I'll just hard-code the path
---
 shells/bash/bashrc                  | 2 +-
 shells/bash/config.bash             | 2 +-
 shells/bash/lib/50_completions.bash | 3 +--
 shells/common/functions.sh          | 2 +-
 shells/path.sh                      | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/shells/bash/bashrc b/shells/bash/bashrc
index 6e4bf65..0010795 100644
--- a/shells/bash/bashrc
+++ b/shells/bash/bashrc
@@ -2,4 +2,4 @@ CURRENT_SHELL="bash"
 SHELL_FILES="$(dirname $(readlink $BASH_SOURCE))"
 DOT_FILES="$(dirname $(dirname $SHELL_FILES))"
 
-source $DOT_FILES/shells/bootstrap.sh
+source $HOME/.dotfiles/shells/bootstrap.sh
diff --git a/shells/bash/config.bash b/shells/bash/config.bash
index ab476c6..4158d64 100644
--- a/shells/bash/config.bash
+++ b/shells/bash/config.bash
@@ -15,6 +15,6 @@ shopt -s checkwinsize histappend cdable_vars extglob nullglob cdspell cmdhist ho
 # Bash 4 and above only
 shopt -s globstar autocd checkjobs 2>/dev/null
 
-complete -C $DOT_FILES/bash/rake-completion.rb -o default rake}
+complete -C $HOME/.dotfiles/bash/rake-completion.rb -o default rake}
 
 alias reload="source ~/.bashrc"
diff --git a/shells/bash/lib/50_completions.bash b/shells/bash/lib/50_completions.bash
index e4271e2..f2aeb1a 100644
--- a/shells/bash/lib/50_completions.bash
+++ b/shells/bash/lib/50_completions.bash
@@ -1,3 +1,2 @@
 # Git completion support in bash
-source $DOT_FILES/vcs/git/git-completion
-
+source $HOME/.dotfiles/vcs/git/git-completion
diff --git a/shells/common/functions.sh b/shells/common/functions.sh
index 693c6c9..a01d649 100644
--- a/shells/common/functions.sh
+++ b/shells/common/functions.sh
@@ -80,7 +80,7 @@ function extract() {
 
 # Zsh
 function __disabled__command_not_found_handler() {
-  /usr/bin/env ruby $DOT_FILES/misc/method_missing.rb $*
+  /usr/bin/env ruby $HOME/.dotfiles/misc/method_missing.rb $*
 }
 
 # Bash (call Zsh version)
diff --git a/shells/path.sh b/shells/path.sh
index 05e29de..df4ff08 100644
--- a/shells/path.sh
+++ b/shells/path.sh
@@ -17,7 +17,7 @@ function __append_path {
 [ -d "$HOME/bin" ]          && __prepend_path "PATH" "$HOME/bin"
 [ -d "$HOME/.cargo/bin" ]   && __prepend_path "PATH" "$HOME/.cargo/bin"
 [ -d "$HOME/.emacs.d/bin" ] && __prepend_path "PATH" "$HOME/.emacs.d/bin"
-[ -d "$DOT_FILES/bin" ]     && __prepend_path "PATH" "$DOT_FILES/bin"
+[ -d "$HOME/.dotfiles/bin" ]     && __prepend_path "PATH" "$HOME/.dotfiles/bin"
 [ -d '/usr/local/bin' ]     && __append_path "PATH" "/usr/local/bin"
 [ -d '/usr/local/sbin' ]    && __append_path "PATH" "/usr/local/sbin"
 [ -d '/opt/local/bin' ]     && __append_path "PATH" "/opt/local/bin"