Add XDG support

Recommendations came from this blog post:
    https://blog.gitbutler.com/how-git-core-devs-configure-git/

Let's see how this works out lol

Test

.gitmodules

@@ -61,6 +61,3 @@
 [submodule "vim/.vim/nvim-bundle/zk-nvim"]
 	path = vim/.vim/nvim-bundle/zk-nvim
 	url = https://github.com/zk-org/zk-nvim.git
-[submodule "vim/.vim/bundle/vim-helm"]
-	path = vim/.vim/bundle/vim-helm
-	url = https://github.com/towolf/vim-helm.git

apply-dotfiles

@@ -5,11 +5,6 @@ apply_dotfile() {
   stow --adopt -S -t "${HOME}" "${directory_to_stow}"
 }
 
-revert_dotfile() {
-  directory_to_stow="${1}"
-  stow -D -t "${HOME}" "${directory_to_stow}"
-}
-
 # Adopt will change the files in stow to match existing files.
 # We don't want this, we just want to handle existing files gracefully.
 # We simply adopt all the files and then at the end restore our git repo to undo changes
@@ -17,35 +12,22 @@ restore_from_adoption() {
   git restore .
 }
 
-mode_command=${1:-apply}
+apply_dotfile bash
-if [ "${mode_command}" != "apply" ] && [ "${mode_command}" != "revert" ]; then
+apply_dotfile sh
-  echo "$0: mode command ("'${1}'") must be apply or revert" 1>&2
+apply_dotfile readline
-  exit 1
+apply_dotfile screen
-fi
 
-operation() {
+apply_dotfile git
-  ${mode_command}_dotfile ${1}
+apply_dotfile xdg
-}
 
-# Create .local/bin to prevent tree folding
+apply_dotfile vim
-mkdir -p ~/.local/bin
 
-operation bash
+apply_dotfile ruby
-operation sh
+apply_dotfile python
-operation readline
-operation screen
-
-operation git
-operation xdg
-
-operation vim
-
-operation ruby
-operation python
 
 # Only if inside a coder instance
 if [ -n "${CODER}" ]; then
-  operation gnupg
+  apply_dotfile gnupg
 fi
 
 # Check that SSH version is above 9.2 (where EnableEscapeCommandline was added) before conditionally adding
@@ -56,6 +38,6 @@ cat <<CONFIG > ssh/.ssh/extra.conf
 EnableEscapeCommandline yes
 CONFIG
 fi
-operation ssh
+apply_dotfile ssh
 
 restore_from_adoption

bash/.bashrc

@@ -1,41 +1,5 @@
 #{- ~/.bashrc -}#
 
-#{- SOURCING -}#
-
-# Source profile, if it hasn't already been loaded
-if [ -z "$__PROFILE_DONE" ]; then
-  . $HOME/.profile
-fi
-
-# Source .env to extend with secret/sensitive environment variables if it exists
-if [ -r "$HOME/.env" ]; then
-  . "$HOME/.env"
-fi
-
-if [ -r "$HOME/.config/xdg/env" ]; then
-  . "$HOME/.config/xdg/env"
-fi
-
-# Source aliases, if they exist
-if [ -f "$HOME/.aliases" ] && [ -r "$HOME/.aliases" ]; then
-  . "$HOME/.aliases"
-fi
-
-# Source private aliases, if they exist
-if [ -f "$HOME/.private_aliases" ] && [ -r "$HOME/.private_aliases" ]; then
-  . "$HOME/.private_aliases"
-fi
-
-# Source functions, if they exist
-if [ -f "$HOME/.functions" ] && [ -r "$HOME/.functions" ]; then
-  . "$HOME/.functions"
-fi
-
-# Source private functions, if they exist
-if [ -f "$HOME/.private_functions" ] && [ -r "$HOME/.private_functions" ]; then
-  . "$HOME/.private_functions"
-fi
-
 #{- PROMPT -}#
 
 if which tput &> /dev/null && tput bold &> /dev/null; then
@@ -56,6 +20,7 @@ else
   no_color="\[\033[0m\]"
 fi
 
+
 export PS1="${green}"'\$'"${no_color} "
 export DIRENV_PS1="${red}"'\$'"${no_color} "
 export NIX_SHELL_PS1="${blue}"'λ'"${no_color} "
@@ -90,7 +55,7 @@ if which direnv &> /dev/null; then
       PS1=${ORIG_PS1}
     fi
   }
-  prompt_command_prepend update_prompt
+  PROMPT_COMMAND="update_prompt; $PROMPT_COMMAND"
 fi
 
 # Continuation Prompt: "> " in cyan
@@ -100,10 +65,7 @@ export PS4="${blue}#${no_color} "
 
 #{- HISTORY -}#
 
-prompt_command_prepend "history -r"
+PROMPT_COMMAND="history -n; history -w; history -c; history -r; $PROMPT_COMMAND"
-prompt_command_prepend "history -c"
-prompt_command_prepend "history -w"
-prompt_command_prepend "history -n"
 # PROMPT_COMMAND="echo hist1; history; history -n; echo hist2; history; history -w; echo hist3; history; history -c; echo hist4; history; history -r; echo hist5; history; $PROMPT_COMMAND"
 export HISTFILE="$HOME/.history/bash"
 export HISTTIMEFORMAT="%F %T  "
@@ -131,18 +93,45 @@ log_bash_persistent_history()
   fi
 }
 
-prompt_command_prepend "log_bash_persistent_history"
+PROMPT_COMMAND="log_bash_persistent_history; $PROMPT_COMMAND"
 
 
-# Source bash completion, this file will then lazy load all other completions
+#{- SOURCING -}#
-source_completions() {
+
-  if [ -r "/usr/share/bash-completion/bash_completion" ]; then
+
-    . "/usr/share/bash-completion/bash_completion"
+# Source profile, if it hasn't already been loaded
-  elif [ -r "/etc/bash_completion" ]; then
+if [ -z "$__PROFILE_DONE" ]; then
-    . "/etc/bash_completion"
+  . $HOME/.profile
-  fi
+fi
-}
+
-source_completions
+# Source .env to extend with secret/sensitive environment variables if it exists
+if [ -r "$HOME/.env" ]; then
+  . "$HOME/.env"
+fi
+
+if [ -r "$HOME/.config/xdg/env" ]; then
+  . "$HOME/.config/xdg/env"
+fi
+
+# Source aliases, if they exist
+if [ -f "$HOME/.aliases" ] && [ -r "$HOME/.aliases" ]; then
+  . "$HOME/.aliases"
+fi
+
+# Source private aliases, if they exist
+if [ -f "$HOME/.private_aliases" ] && [ -r "$HOME/.private_aliases" ]; then
+  . "$HOME/.private_aliases"
+fi
+
+# Source functions, if they exist
+if [ -f "$HOME/.functions" ] && [ -r "$HOME/.functions" ]; then
+  . "$HOME/.functions"
+fi
+
+# Source private functions, if they exist
+if [ -f "$HOME/.private_functions" ] && [ -r "$HOME/.private_functions" ]; then
+  . "$HOME/.private_functions"
+fi
 
 # Preserve the usefulness of set -x by attempting to hide everything that
 # happens in prompt_command
@@ -159,12 +148,8 @@ preserve_xtrace_reset() {
   fi
 } 2>/dev/null
 
-prompt_command_prepend preserve_xtrace
+PROMPT_COMMAND="preserve_xtrace; $PROMPT_COMMAND preserve_xtrace_reset"
-prompt_command_append  preserve_xtrace_reset
 
 if $(which direnv &> /dev/null); then
-  # Only if direnv isn't already defined in our prompt_command
+  eval "$(direnv hook bash)"
-  if ! grep -q _direnv_hook <<< $PROMPT_COMMAND; then
-    eval "$(direnv hook bash)"
-  fi
 fi

bash/.functions

@@ -18,59 +18,6 @@ maths()
 
 cat_with_newline()
 {
-  \cat "$@" && echo
+  cat "$@" && echo
 }
 alias cat="cat_with_newline"
-
-k_prompt()
-{
-  set -x
-  if [ -z ${KUBE_PROMPT+x} ]; then
-    export KUBE_PROMPT=1
-  else
-    unset KUBE_PROMPT
-  fi
-  set +x
-}
-
-kube_prompt()
-{
-  set -x
-  if ! [ -z ${KUBE_PROMPT+x} ]; then
-    context=$(\cat ${KUBECONFIG} \
-              | grep "current-context: " \
-              | sed "s/current-context: //")
-    echo {$context}
-  fi
-  set +x
-}
-
-g_prompt()
-{
-  if ! [ -z ${GIT_PROMPT+x} ]; then
-    export GIT_PROMPT=1
-  else
-    unset GIT_PROMPT
-  fi
-}
-
-git_prompt()
-{
-  if ! [ -z ${GIT_PROMPT+x} ]; then
-    # Determine if we are in a git repository
-    if git rev-parse --is-inside-work-tree &> /dev/null; then
-      branch=$(git rev-parse --abbrev-ref HEAD)
-      echo [$branch]
-    fi
-  fi
-}
-
-prompt_command_append() {
-  arg=${1}
-  PROMPT_COMMAND=${PROMPT_COMMAND:+"$PROMPT_COMMAND; "}"${arg}"
-}
-
-prompt_command_prepend() {
-  arg=${1}
-  PROMPT_COMMAND="${arg}"${PROMPT_COMMAND:+"; $PROMPT_COMMAND"}
-}

install.sh

@@ -6,7 +6,6 @@ set -ex
 echo "PWD: $PWD"
 # Coder dotfiles (and most other ways of doing this) will not do a recursive clone, so do that in install script.
 git submodule init && git submodule update
-
 # Match case insensitively to make things easier for this part
 shopt -s nocasematch
 
@@ -15,21 +14,13 @@ echo "Installing dotfiles..."
 if [ "${CODER_TEMPLATE_TYPE}" == "Devcontainer" ]; then
   installers/install-nix.sh
   installers/install-nix-packages-flake.sh
-  if [ -r "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then
+  . ~/.nix-profile/etc/profile.d/nix.sh
-    . "$HOME/.nix-profile/etc/profile.d/nix.sh"
-  elif [ -r "${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile/etc/profile.d/nix.sh" ]; then
-    . "${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile/etc/profile.d/nix.sh"
-  fi
 elif [ "${CODER_OS_FAMILY:-}" == "Ubuntu" ]; then
   echo "Detected OS as Ubuntu, using apt";
   sudo apt-get update;
   sudo apt-get install -y stow;
   installers/install-nix.sh
-  if [ -r "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then
+  . ~/.nix-profile/etc/profile.d/nix.sh
-    . "$HOME/.nix-profile/etc/profile.d/nix.sh"
-  elif [ -r "${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile/etc/profile.d/nix.sh" ]; then
-    . "${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile/etc/profile.d/nix.sh"
-  fi
 elif [ -f /etc/os-release ]; then
   echo "Idenitfying OS to install GNU stow..."
   if grep -q -i debian /etc/os-release; then

installers/install-nix-packages-flake.sh

@@ -11,8 +11,6 @@ ARCHIVE_PATH="${FLAKE_PATH}/archive.nar"
 if ! which nix &>/dev/null; then
   if [ -r "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then
     . "$HOME/.nix-profile/etc/profile.d/nix.sh"
-  elif [ -r "${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile/etc/profile.d/nix.sh" ]; then
-    . "${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile/etc/profile.d/nix.sh"
   else
     echo "Nix isn't available. Exiting now!"
     exit 1

installers/install-nix.sh

@@ -7,12 +7,8 @@ set -e
 set -x
 
 # Abort installation if Nix is already installed
-if [ -d /nix/store ]; then
+if [ -d /nix ]; then
   exit 0
-elif [ -d /nix ] && ! [ -O /nix ]; then
-  # If we don't own /nix use sudo to chown it.
-  # If we can't sudo then nothing we do here will work so we just let this fail
-  sudo chown $UID /nix
 fi
 
 # Workaround to make a single user install work as root
@@ -32,8 +28,6 @@ cat << EOF > ~/.bashrc
 # Source nix if it's installed
 if [ -r ~/.nix-profile/etc/profile.d/nix.sh ]; then
   . ~/.nix-profile/etc/profile.d/nix.sh
-elif [ -r "${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile/etc/profile.d/nix.sh" ]; then
-	. "${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile/etc/profile.d/nix.sh"
 fi
 EOF
 

screen/.config/screen/screenrc

@@ -1,5 +1,5 @@
 # Defaults to using bash as the shell
-defshell $SHELL
+defshell bash
 # Extend scrollback buffer
 defscrollback 100000
 # Disable startup message

sh/.profile

@@ -50,6 +50,4 @@ export HISTFILESIZE=10000
 
 if [ -r "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then
 	. "$HOME/.nix-profile/etc/profile.d/nix.sh"
-elif [ -r "${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile/etc/profile.d/nix.sh" ]; then
-	. "${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile/etc/profile.d/nix.sh"
 fi

xdg/.config/xdg/env

@@ -9,6 +9,3 @@ export GNUPGHOME="$XDG_DATA_HOME"/gnupg
 export MYSQL_HISTFILE="$XDG_DATA_HOME"/mysql_history
 export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc
 export IRBRC="$XDG_CONFIG_HOME/irb/irbrc"
-
-export KUBECONFIG="${XDG_CONFIG_HOME}/kube/config"
-mkdir -p "$(dirname ${KUBECONFIG})"

xdg/.local/bin/enable-xdg-legacy-support

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-# For older systems that don't support newer versions of programs that may
-# support XDG config paths natively we have to symlink to the new paths from 
-# the expected locations of the older paths.
-
-# This can also be used to support migrations from systems before we started XDGifying
-
-ln -s "${XDG_CONFIG_HOME}/screen/screenrc" "${HOME}/.screenrc"
-ln -s "${XDG_DATA_HOME}/.gnupg" "${HOME}/.gnupg"
-ln -s "${XDG_DATA_HOME}/mysql_history" "${HOME}/.mysql_history"
-ln -s "${XDG_CONFIG_HOME}/readline/inputrc" "${HOME}/.inputrc"
-ln -s "${XDG_CONFIG_HOME}/irb/irbc" "${HOME}/.irbrc"
-ln -s "${XDG_CONFIG_HOME}/kube/config" "${HOME}/.kubeconfig"