From d4e523271ee43855da6524943138234b56c3b3c9 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 15:54:11 -0500
Subject: [PATCH 01/19] fix: Add whitespace back into tmux.conf

---
 dot_tmux.conf.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dot_tmux.conf.tmpl b/dot_tmux.conf.tmpl
index 1c3c442..4f55050 100644
--- a/dot_tmux.conf.tmpl
+++ b/dot_tmux.conf.tmpl
@@ -1,6 +1,6 @@
 set -g default-terminal "tmux-256color"
-{{- if (eq .chezmoi.osRelease.id "debian") }}
+{{ if (eq .chezmoi.osRelease.id "debian") }}
 source "/usr/share/powerline/bindings/tmux/powerline.conf"
-{{- else -}}
+{{ else }}
 source "/usr/share/tmux/powerline.conf"
-{{- end }}
+{{ end }}

From 1c558abfa65114663c0e5dce183cfd30ec9e6e09 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 17:09:08 -0500
Subject: [PATCH 02/19] feat: Add gpub alias

---
 dot_aliases | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dot_aliases b/dot_aliases
index e21d69f..6448c8f 100644
--- a/dot_aliases
+++ b/dot_aliases
@@ -24,6 +24,7 @@ alias please='sudo $(fc -ln -1)'
 alias nrun='__NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia __VK_LAYER_NV_optimus="NVIDIA_only"'
 alias grim='git rebase -i --autosquash $(git_main_branch)'
 alias grid='git rebase -i --autosquash $(git_develop_branch)'
+alias gpub='git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)'
 
 # Alias-like functions
 nd () {

From 7319c7382024a0be3fc673bdb32e61cc1f2bc93c Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 17:11:41 -0500
Subject: [PATCH 03/19] chore: Convert .aliases to template

---
 dot_aliases => dot_aliases.tmpl | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename dot_aliases => dot_aliases.tmpl (100%)

diff --git a/dot_aliases b/dot_aliases.tmpl
similarity index 100%
rename from dot_aliases
rename to dot_aliases.tmpl

From 1e8b917803e053e955628b4df02adec49b26ad0b Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 17:16:40 -0500
Subject: [PATCH 04/19] refactor: Replace shell path evaluation with Chezmoi
 evaluation

---
 dot_aliases.tmpl | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/dot_aliases.tmpl b/dot_aliases.tmpl
index 6448c8f..89e6d7e 100644
--- a/dot_aliases.tmpl
+++ b/dot_aliases.tmpl
@@ -1,22 +1,13 @@
-# Only create aliases if the underlying programs are available
-# This allows portability between machines in different states
-alias_if_exists () {
-  ALIAS=${1}
-  COMMAND=${2}
-  ARGS=${3}
-  if [ $(command -v $COMMAND) ]; then
-    if [ -n "$ARGS" ]; then
-      alias $ALIAS="$COMMAND $ARGS"
-    else
-      alias $ALIAS="$COMMAND"
-    fi
-  fi
-}
-
 # Context-sensitive aliases
-alias_if_exists bat batcat
-alias_if_exists cat bat
-alias_if_exists ls lsd
+{{- if lookPath "batcat" }}
+alias bat=batcat
+{{- end }}
+{{- if or (lookPath "bat") (lookPath "batcat") }}
+alias cat=bat
+{{- end }}
+{{- if lookPath "lsd" }}
+alias ls=lsd
+{{- end }}
 
 # Universal aliases
 alias config='git --git-dir=$HOME/.cfg/ --work-tree=$HOME'

From 6f57123a63834c3ab3af2c38b85fd8490a0a21df Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 17:19:08 -0500
Subject: [PATCH 05/19] feat: Add alias for codium

---
 dot_aliases.tmpl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dot_aliases.tmpl b/dot_aliases.tmpl
index 89e6d7e..45b6949 100644
--- a/dot_aliases.tmpl
+++ b/dot_aliases.tmpl
@@ -8,6 +8,9 @@ alias cat=bat
 {{- if lookPath "lsd" }}
 alias ls=lsd
 {{- end }}
+{{- if and (lookPath "codium") (not (lookPath "code")) }}
+alias code=codium
+{{- end }}
 
 # Universal aliases
 alias config='git --git-dir=$HOME/.cfg/ --work-tree=$HOME'

From f89211ef87d2110a44ef90e65a98ec4673ca2fbd Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 17:45:11 -0500
Subject: [PATCH 06/19] feat!: Remove rbenv and n hooks

I'll be using nix for those types of dependencies from now on
---
 dot_hooks.tmpl | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/dot_hooks.tmpl b/dot_hooks.tmpl
index 7af0c42..69a2185 100644
--- a/dot_hooks.tmpl
+++ b/dot_hooks.tmpl
@@ -1,14 +1,3 @@
-if [ -f $HOME/.rbenv/bin/rbenv ]; then
-  export PATH="$HOME/.rbenv/bin:$PATH"
-  eval "$(rbenv init -)"
-  export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH"
-fi
-
-if [ $(command -v n) ]; then
-  export N_PREFIX=$HOME/.n
-  export PATH="$HOME/.n/bin:$PATH"
-fi
-
 if [ -f $HOME/.ion/bin/ion ]; then
   export PATH="$HOME/.ion/bin/ion:$PATH"
   export FPATH="$HOME/.ion/completions:$FPATH"

From 433c576a444b760bb27f12ad3b0e758153f79f0e Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 17:45:49 -0500
Subject: [PATCH 07/19] refactor: Replace all shell command searching with
 Chezmoi searching

---
 dot_envvar.tmpl | 57 ++++++++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/dot_envvar.tmpl b/dot_envvar.tmpl
index 42346d3..206ff7b 100644
--- a/dot_envvar.tmpl
+++ b/dot_envvar.tmpl
@@ -1,45 +1,38 @@
+{{- if lookPath "pipx" }}
 # Enable pipx completions
-if [ $(command -v pipx) ]; then
-  eval "$(register-python-argcomplete pipx)"
-fi
+eval "$(register-python-argcomplete pipx)"
+{{- end }}
 
+{{- if lookPath "nvim" }}
 # Preferred editor for local and remote sessions
-if [ $(command -v nvim) ]; then
-  export EDITOR=nvim
-elif [ $(command -v nano) ]; then
-  export EDITOR=nano
-elif [ $(command -v vim) ]; then
-  export EDITOR=vim
-elif [ $(command -v emacs) ]; then
-  export EDITOR='emacs -nw'
-fi
+export EDITOR=nvim
+{{- end }}
 
-if [ $(command -v kate) ]; then
-  export VISUAL=kate
-elif [ $(command -v code) ]; then
-  export VISUAL=code
-elif [ $(command -v emacs) ]; then
-  export VISUAL=emacs
-fi
+{{- if lookPath "kate" }}
+export VISUAL=kate
+{{- else if lookPath "codium" }}
+export VISUAL=codium
+{{- else if lookPath "code" }}
+export VISUAL=code
+{{- end }}
 
+{{- if lookPath "most" }}
 # Set a cool new pager with color support
-if [ $(command -v most) ]; then
-  export PAGER=most
-fi
-
+export PAGER=most
+{{- end }}
 
+{{- if or (lookPath "bat") (lookPath "catbat") }}
 # Replace cat with bat
-if [ $(command -v bat) ]; then
-  export BAT_PAGER="less -SRF"
-  export MANPAGER="sh -c 'col -bx | bat -l man -p'"
-  export MANROFFOPT="-c"
-fi
+export BAT_PAGER="less -SRF"
+export MANPAGER="sh -c 'col -bx | bat -l man -p'"
+export MANROFFOPT="-c"
+{{- end }}
 
 # Add notification support for long-running processes
-if [ $(command -v ntfy) ]; then
-  eval "$(ntfy shell-integration --longer-than 30)"
-  export AUTO_NTFY_DONE_IGNORE="vim nano emacs kate zshconfig screen tmux ssh top htop less more most nethogs 'singularity shell' julia man glances"
-fi
+{{- if lookPath "ntfy" }}
+eval "$(ntfy shell-integration --longer-than 30)"
+export AUTO_NTFY_DONE_IGNORE="vim nano emacs kate zshconfig screen tmux ssh top htop less more most nethogs 'singularity shell' julia man glances"
+{{- end }}
 
 # Set the Nextflow enviroment caches
 export NXF_HOME="$HOME/.nextflow"

From c416a5304be4a6cd723fd4c5036e9c5f1de172af Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 18:01:04 -0500
Subject: [PATCH 08/19] refactor: Move conda hooks to .hooks

---
 dot_hooks.tmpl             | 15 +++++++++++++++
 executable_dot_bashrc.tmpl | 16 ----------------
 executable_dot_zshrc.tmpl  | 15 ---------------
 3 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/dot_hooks.tmpl b/dot_hooks.tmpl
index 69a2185..ead7ebd 100644
--- a/dot_hooks.tmpl
+++ b/dot_hooks.tmpl
@@ -1,3 +1,18 @@
+# >>> conda initialize >>>
+# !! Contents within this block are managed by 'conda init' !!
+__conda_setup="$($HOME/miniconda3/bin/conda shell.$(basename $0) 'hook' 2> /dev/null)"
+if [ $? -eq 0 ]; then
+    eval "$__conda_setup"
+else
+    if [ -f "$HOME/miniconda3/etc/profile.d/conda.sh" ]; then
+        . "$HOME/miniconda3/etc/profile.d/conda.sh"
+    else
+        export PATH="$HOME/miniconda3/bin:$PATH"
+    fi
+fi
+unset __conda_setup
+# <<< conda initialize <<<
+
 if [ -f $HOME/.ion/bin/ion ]; then
   export PATH="$HOME/.ion/bin/ion:$PATH"
   export FPATH="$HOME/.ion/completions:$FPATH"
diff --git a/executable_dot_bashrc.tmpl b/executable_dot_bashrc.tmpl
index 7782a56..732a3b7 100644
--- a/executable_dot_bashrc.tmpl
+++ b/executable_dot_bashrc.tmpl
@@ -11,22 +11,6 @@ source $HOME/.hooks
 # User specific aliases and functions
 source $HOME/.aliases
 
-# >>> conda initialize >>>
-# !! Contents within this block are managed by 'conda init' !!
-__conda_setup="$('$HOME/miniconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
-if [ $? -eq 0 ]; then
-    eval "$__conda_setup"
-else
-    if [ -f "$HOME/miniconda3/etc/profile.d/conda.sh" ]; then
-        . "$HOME/miniconda3/etc/profile.d/conda.sh"
-    else
-        export PATH="$HOME/miniconda3/bin:$PATH"
-    fi
-fi
-unset __conda_setup
-conda config --set changeps1 true
-# <<< conda initialize <<<
-
 # >>> direnv initalize >>>
 if [ $(command -v direnv) ]; then
   eval "$(direnv hook bash)"
diff --git a/executable_dot_zshrc.tmpl b/executable_dot_zshrc.tmpl
index 5c42c92..bedc10e 100644
--- a/executable_dot_zshrc.tmpl
+++ b/executable_dot_zshrc.tmpl
@@ -54,21 +54,6 @@ COMPLETION_WAITING_DOTS="true"
 
 source $HOME/.hooks
 
-# >>> conda initialize >>>
-# !! Contents within this block are managed by 'conda init' !!
-__conda_setup="$('$HOME/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
-if [ $? -eq 0 ]; then
-    eval "$__conda_setup"
-else
-    if [ -f "$HOME/miniconda3/etc/profile.d/conda.sh" ]; then
-        . "$HOME/miniconda3/etc/profile.d/conda.sh"
-    else
-        export PATH="$HOME/miniconda3/bin:$PATH"
-    fi
-fi
-unset __conda_setup
-# <<< conda initialize <<<
-
 # >>> direnv initalize >>>
 if [ $(command -v direnv) ]; then
   eval "$(direnv hook zsh)"

From 6caa4f13efe132f131e070c1a3239ee46a746fed Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 18:01:23 -0500
Subject: [PATCH 09/19] feat: Persist ps1 change for conda in bash

---
 dot_condarc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dot_condarc b/dot_condarc
index fab3508..9a57598 100644
--- a/dot_condarc
+++ b/dot_condarc
@@ -1,2 +1,2 @@
 auto_activate_base: false
-changeps1: false
+changeps1: true

From 85b05d50f0558e46a91e33c3e9931002a125956f Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 18:01:42 -0500
Subject: [PATCH 10/19] feat: Add mamba hooks

---
 dot_hooks.tmpl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dot_hooks.tmpl b/dot_hooks.tmpl
index ead7ebd..757e684 100644
--- a/dot_hooks.tmpl
+++ b/dot_hooks.tmpl
@@ -11,6 +11,10 @@ else
     fi
 fi
 unset __conda_setup
+
+if [ -f "$HOME/miniconda3/etc/profile.d/mamba.sh" ]; then
+  . "$HOME/miniconda3/etc/profile.d/mamba.sh"
+fi
 # <<< conda initialize <<<
 
 if [ -f $HOME/.ion/bin/ion ]; then

From ba3dfc5f52b61e23e851fabc94f446316648b463 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 18:03:24 -0500
Subject: [PATCH 11/19] refactor: Move direnv hooks to .hooks

---
 dot_hooks.tmpl             | 4 ++++
 executable_dot_bashrc.tmpl | 6 ------
 executable_dot_zshrc.tmpl  | 6 ------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/dot_hooks.tmpl b/dot_hooks.tmpl
index 757e684..565dc5a 100644
--- a/dot_hooks.tmpl
+++ b/dot_hooks.tmpl
@@ -17,6 +17,10 @@ if [ -f "$HOME/miniconda3/etc/profile.d/mamba.sh" ]; then
 fi
 # <<< conda initialize <<<
 
+{{- if lookPath "direnv" }}
+eval "$(direnv hook $(basename $0))"
+{{- end }}
+
 if [ -f $HOME/.ion/bin/ion ]; then
   export PATH="$HOME/.ion/bin/ion:$PATH"
   export FPATH="$HOME/.ion/completions:$FPATH"
diff --git a/executable_dot_bashrc.tmpl b/executable_dot_bashrc.tmpl
index 732a3b7..aac0dde 100644
--- a/executable_dot_bashrc.tmpl
+++ b/executable_dot_bashrc.tmpl
@@ -11,12 +11,6 @@ source $HOME/.hooks
 # User specific aliases and functions
 source $HOME/.aliases
 
-# >>> direnv initalize >>>
-if [ $(command -v direnv) ]; then
-  eval "$(direnv hook bash)"
-fi
-# <<< direnv initalize <<<
-
 source $HOME/.envvar
 
 if [ $(command -v env_parallel.bash) ]; then
diff --git a/executable_dot_zshrc.tmpl b/executable_dot_zshrc.tmpl
index bedc10e..734a0de 100644
--- a/executable_dot_zshrc.tmpl
+++ b/executable_dot_zshrc.tmpl
@@ -54,12 +54,6 @@ COMPLETION_WAITING_DOTS="true"
 
 source $HOME/.hooks
 
-# >>> direnv initalize >>>
-if [ $(command -v direnv) ]; then
-  eval "$(direnv hook zsh)"
-fi
-# <<< direnv initalize <<<
-
 # Tell Antigen that you're done
 antigen apply
 

From 99c8b6ec4b23161a39d0e8f7a82261c6280f3981 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 18:12:14 -0500
Subject: [PATCH 12/19] refactor: Move env_parallel hooks to .hooks

---
 dot_hooks.tmpl             | 5 +++++
 executable_dot_bashrc.tmpl | 4 ----
 executable_dot_zshrc.tmpl  | 5 -----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/dot_hooks.tmpl b/dot_hooks.tmpl
index 565dc5a..29097e0 100644
--- a/dot_hooks.tmpl
+++ b/dot_hooks.tmpl
@@ -26,6 +26,11 @@ if [ -f $HOME/.ion/bin/ion ]; then
   export FPATH="$HOME/.ion/completions:$FPATH"
 fi
 
+# Import GNU parallel
+if [ $(command -v env_parallel.$(basename $0)) ]; then
+  source $(which env_parallel.$(basename $0))
+fi
+
 {{- if eq .machinetype "workstation" }}
 export GPG_TTY="$(tty)"
 export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
diff --git a/executable_dot_bashrc.tmpl b/executable_dot_bashrc.tmpl
index aac0dde..34b39c0 100644
--- a/executable_dot_bashrc.tmpl
+++ b/executable_dot_bashrc.tmpl
@@ -13,9 +13,5 @@ source $HOME/.aliases
 
 source $HOME/.envvar
 
-if [ $(command -v env_parallel.bash) ]; then
-  source $(which env_parallel.bash)
-fi
-
 # Make the prompt pretty, just in case we're stuck in bash land
 export PS1="[\[\e[32m\]\u\[\e[m\]@\[\e[33m\]\h\[\e[m\] \[\e[34m\]\W\[\e[m\]] \\$ "
diff --git a/executable_dot_zshrc.tmpl b/executable_dot_zshrc.tmpl
index 734a0de..41cb7f8 100644
--- a/executable_dot_zshrc.tmpl
+++ b/executable_dot_zshrc.tmpl
@@ -68,11 +68,6 @@ source $HOME/.envvar
 alias zshconfig="$EDITOR ~/.zshrc"
 source $HOME/.aliases
 
-# Import GNU parallel
-if [ $(command -v env_parallel.zsh) ]; then
-  source $(which env_parallel.zsh)
-fi
-
 {{ if or
   (eq .machinetype "workstation")
   (eq .chezmoi.osRelease.id "fedora")

From 9813078c5ee3f6fa514149d753f1be97228822cd Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 18:13:02 -0500
Subject: [PATCH 13/19] feat: Remove n external download

---
 .chezmoiexternal.toml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml
index c58bdfc..6ddd71a 100644
--- a/.chezmoiexternal.toml
+++ b/.chezmoiexternal.toml
@@ -1,9 +1,3 @@
-[".local/bin/n"]
-    type = "file"
-    url = "https://raw.githubusercontent.com/tj/n/master/bin/n"
-    executable = true
-    refreshPeriod = "168h"
-
 [".local/share/fonts/meslolgs-nf-regular.ttf"]
     type = "file"
     url = "https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Regular.ttf"

From 597a4edb0f17cca1dc6a553aacee7de3ba5ca04b Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 18:15:03 -0500
Subject: [PATCH 14/19] refactor: Move antigen to chezmoiexternal

---
 .chezmoiexternal.toml     | 5 +++++
 executable_dot_zshrc.tmpl | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml
index 6ddd71a..a107be7 100644
--- a/.chezmoiexternal.toml
+++ b/.chezmoiexternal.toml
@@ -1,3 +1,8 @@
+["antigen.zsh"]
+    type = "file"
+    url = "https://git.io/antigen"
+    refreshPeriod = "168h"
+
 [".local/share/fonts/meslolgs-nf-regular.ttf"]
     type = "file"
     url = "https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Regular.ttf"
diff --git a/executable_dot_zshrc.tmpl b/executable_dot_zshrc.tmpl
index 41cb7f8..4bf3d42 100644
--- a/executable_dot_zshrc.tmpl
+++ b/executable_dot_zshrc.tmpl
@@ -18,9 +18,6 @@ then
 fi
 
 # Load the antigen library
-if [[ ! -f "$HOME/antigen.zsh" ]]; then
-  curl -L git.io/antigen > $HOME/antigen.zsh
-fi
 source "$HOME/antigen.zsh"
 
 # Load the oh-my-zsh library

From 2bf7c0a80b92626fb788cd7df3ea2414e243fb3a Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 18:46:50 -0500
Subject: [PATCH 15/19] feat: Add mamba installer

---
 run_once_install_mamba.sh.tmpl | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 run_once_install_mamba.sh.tmpl

diff --git a/run_once_install_mamba.sh.tmpl b/run_once_install_mamba.sh.tmpl
new file mode 100644
index 0000000..a17e22f
--- /dev/null
+++ b/run_once_install_mamba.sh.tmpl
@@ -0,0 +1,12 @@
+#!/bin/bash
+{{ if eq .chezmoi.os "linux" }}
+{{ $mambaURL := print "https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-pypy3-Linux-x86_64.sh" }}
+{{ if lookPath "wget" }}
+wget -qO- "{{ $mambaURL }}" > mamba.sh
+{{ else }}
+curl -L "{{ $mambaURL }}" > mamba.sh
+{{ end }}
+chmod +x mamba.sh
+./mamba.sh -b -u -p $HOME/miniconda3
+rm mamba.sh
+{{ end }}

From 774e277e9900b3d6fe92de5eff687503d9e08deb Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 18:57:04 -0500
Subject: [PATCH 16/19] refactor: Simplify juliaup support

---
 dot_profile | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/dot_profile b/dot_profile
index 17df7a2..93f26fa 100644
--- a/dot_profile
+++ b/dot_profile
@@ -3,22 +3,8 @@
 export PATH="$HOME/.local/bin:$HOME/bin:$PATH"
 
 # juliaup setup
-if [ -d $HOME/.julia/juliaup/bin ]; then
-  export PATH="$HOME/.julia/juliaup/bin:$PATH"
-fi
-
-# >>> juliaup initialize >>>
-
-# !! Contents within this block are managed by juliaup !!
-
-case ":$PATH:" in
-  *:/home/millironx/.juliaup/bin:*)
-    ;;
-  *)
-    export PATH=/home/millironx/.juliaup/bin${PATH:+:${PATH}}
-    ;;
-esac
-# <<< juliaup initialize <<<
+export PATH="$HOME/.julia/juliaup/bin:$PATH"
+export PATH="$HOME/.juliaup/bin:$PATH"
 
 # Linuxbrew setup
 if [ -d $HOME/../linuxbrew/.linuxbrew ]; then

From 83f28d03f08c0203a602936d98473b2c950ad694 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 19:01:21 -0500
Subject: [PATCH 17/19] fix: Use private key to login on Windows

---
 private_dot_ssh/config.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/private_dot_ssh/config.tmpl b/private_dot_ssh/config.tmpl
index ca7432b..1288e19 100644
--- a/private_dot_ssh/config.tmpl
+++ b/private_dot_ssh/config.tmpl
@@ -1,6 +1,6 @@
 Host *
 	IdentitiesOnly yes
-	IdentityFile {{ if and (eq .machinetype "workstation") (ne .chezmoi.os "windows") }}~/.ssh/id_rsa_yubikey.pub{{ else }}~/.ssh/id_ed25519.pub{{ end }}
+	IdentityFile {{ if and (eq .machinetype "workstation") (ne .chezmoi.os "windows") }}~/.ssh/id_rsa_yubikey.pub{{ else }}~/.ssh/id_ed25519{{ end }}
 
 Host aahz
 	HostName 129.130.108.37

From bc153ee4d1652662687ef379d5acc09d27720748 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 19:11:11 -0500
Subject: [PATCH 18/19] feat: Add local nix install hook

---
 dot_profile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dot_profile b/dot_profile
index 93f26fa..9079577 100644
--- a/dot_profile
+++ b/dot_profile
@@ -18,3 +18,7 @@ if [ -n "$BREWPATH" ]; then
   export HOMEBREW_MAKE_JOBS=1
   export HOMEBREW_NO_ANALYTICS=1
 fi
+
+if [ -e "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then
+  . "$HOME/.nix-profile/etc/profile.d/nix.sh"
+fi

From 44b9b80d27441fed56f8cd9dfa18a81b3af44208 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 15 Apr 2023 19:13:10 -0500
Subject: [PATCH 19/19] refactor: Update GPG conf to match Dr Duh's

---
 private_dot_gnupg/private_gpg-agent.conf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/private_dot_gnupg/private_gpg-agent.conf b/private_dot_gnupg/private_gpg-agent.conf
index 918e9f9..ca45c6f 100644
--- a/private_dot_gnupg/private_gpg-agent.conf
+++ b/private_dot_gnupg/private_gpg-agent.conf
@@ -1,2 +1,4 @@
-default-cache-ttl 10000
-max-cache-ttl 86400
+enable-ssh-support
+ttyname $GPG_TTY
+default-cache-ttl 60
+max-cache-ttl 120