From c072544efbde062f20b85f08e423c2382f189845 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Thu, 2 Mar 2023 12:04:36 -0600
Subject: [PATCH 01/11] Update executable_dot_zshrc.tmpl

---
 executable_dot_zshrc.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/executable_dot_zshrc.tmpl b/executable_dot_zshrc.tmpl
index 87f0427..a9f0d6e 100644
--- a/executable_dot_zshrc.tmpl
+++ b/executable_dot_zshrc.tmpl
@@ -21,7 +21,7 @@ fi
 if [[ ! -f "$HOME/antigen.zsh" ]]; then
   curl -L git.io/antigen > $HOME/antigen.zsh
 fi
-source "$HOME/.antigen.zsh"
+source "$HOME/antigen.zsh"
 
 # Load the oh-my-zsh library
 antigen use oh-my-zsh

From 9df027d4a6f8d781a00901402d8d69750a116671 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Thu, 2 Mar 2023 12:07:00 -0600
Subject: [PATCH 02/11] Update dot_envvar.tmpl

---
 dot_envvar.tmpl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dot_envvar.tmpl b/dot_envvar.tmpl
index 620d511..42346d3 100644
--- a/dot_envvar.tmpl
+++ b/dot_envvar.tmpl
@@ -4,12 +4,14 @@ if [ $(command -v pipx) ]; then
 fi
 
 # Preferred editor for local and remote sessions
-if [ $(command -v nano) ]; then
+if [ $(command -v nvim) ]; then
+  export EDITOR=nvim
+elif [ $(command -v nano) ]; then
   export EDITOR=nano
-elif [ $(command -v emacs) ]; then
-  export EDITOR='emacs -nw'
 elif [ $(command -v vim) ]; then
   export EDITOR=vim
+elif [ $(command -v emacs) ]; then
+  export EDITOR='emacs -nw'
 fi
 
 if [ $(command -v kate) ]; then

From 446e991859bc890e8d9d24471956e017ac0574e8 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Thu, 2 Mar 2023 12:25:10 -0600
Subject: [PATCH 03/11] Update executable_dot_gitconfig.tmpl

---
 executable_dot_gitconfig.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/executable_dot_gitconfig.tmpl b/executable_dot_gitconfig.tmpl
index 78279d0..7c714c2 100644
--- a/executable_dot_gitconfig.tmpl
+++ b/executable_dot_gitconfig.tmpl
@@ -3,7 +3,7 @@
 	email = {{ .email }}
 	signingkey = {{ .pubkey }}
 [core]
-	editor = nano
+	editor = nvim
 [credential]
 	helper = store
 [color]

From 8052c8f83be901ce8d2914de6d832ebaf164b319 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Thu, 2 Mar 2023 12:28:57 -0600
Subject: [PATCH 04/11] Update executable_dot_gitconfig.tmpl

---
 executable_dot_gitconfig.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/executable_dot_gitconfig.tmpl b/executable_dot_gitconfig.tmpl
index 7c714c2..c248c73 100644
--- a/executable_dot_gitconfig.tmpl
+++ b/executable_dot_gitconfig.tmpl
@@ -14,9 +14,9 @@
 	user = MillironX
 [pull]
 	rebase = false
+{{- if eq .machinetype "workstation" }}
 [commit]
 	gpgsign = true
-{{- if eq .chezmoi.osRelease.id "fedora" }}
 [diff]
 	tool = kdiff3
 [merge]

From 826b6a5fe8a7e2afd7619396e4c04cfdf473265a Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Thu, 2 Mar 2023 12:32:57 -0600
Subject: [PATCH 05/11] Change git credentials

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

diff --git a/executable_dot_gitconfig.tmpl b/executable_dot_gitconfig.tmpl
index c248c73..fec6ef4 100644
--- a/executable_dot_gitconfig.tmpl
+++ b/executable_dot_gitconfig.tmpl
@@ -1,7 +1,7 @@
 [user]
-	name = {{ .name }}
-	email = {{ .email }}
-	signingkey = {{ .pubkey }}
+	name = "Thomas A. Christensen II"
+	email = "25492070+MillironX@users.noreply.github.com"
+	signingkey = 0xD5F50D10552A4BEC
 [core]
 	editor = nvim
 [credential]

From 01e5ae652b378ab7ef564fd8615914632f33a3d0 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Thu, 2 Mar 2023 12:42:41 -0600
Subject: [PATCH 06/11] Update dot_hooks

---
 dot_hooks | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dot_hooks b/dot_hooks
index a7d3a2b..ffaa685 100644
--- a/dot_hooks
+++ b/dot_hooks
@@ -8,3 +8,9 @@ if [ $(command -v n) ]; then
   export N_PREFIX=$HOME/.n
   export PATH="$HOME/.n/bin:$PATH"
 fi
+
+{{- if eq .machinetype "workstation" }}
+export GPG_TTY="$(tty)"
+export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+gpgconf --launch gpg-agent
+{{- end }}

From 66d3a5c39051545805a255d6989b512e00bc684a Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Thu, 2 Mar 2023 12:44:20 -0600
Subject: [PATCH 07/11] Update dot_hooks

---
 dot_hooks | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dot_hooks b/dot_hooks
index ffaa685..ec49f4f 100644
--- a/dot_hooks
+++ b/dot_hooks
@@ -9,6 +9,11 @@ if [ $(command -v n) ]; then
   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"
+fi
+
 {{- if eq .machinetype "workstation" }}
 export GPG_TTY="$(tty)"
 export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)

From 5601bd7546e8847dc83eb0f375bfe7febf22128d Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Thu, 2 Mar 2023 12:46:05 -0600
Subject: [PATCH 08/11] Update dot_hooks

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

diff --git a/dot_hooks b/dot_hooks
index ec49f4f..7af0c42 100644
--- a/dot_hooks
+++ b/dot_hooks
@@ -11,7 +11,7 @@ fi
 
 if [ -f $HOME/.ion/bin/ion ]; then
   export PATH="$HOME/.ion/bin/ion:$PATH"
-  export FPATH=$HOME/.ion/completions:$FPATH"
+  export FPATH="$HOME/.ion/completions:$FPATH"
 fi
 
 {{- if eq .machinetype "workstation" }}

From 58d8801d7de5252a85e24d55ad22f73077c31b7c Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Thu, 2 Mar 2023 12:47:17 -0600
Subject: [PATCH 09/11] Rename dot_hooks to dot_hooks.tmpl

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

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

From 8369610a0edc1d699a0573d5cbc3d587e8c1dd2c Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Thu, 2 Mar 2023 19:19:11 +0000
Subject: [PATCH 10/11] Add Docker directory to unsafe allowed directories

---
 executable_dot_gitconfig.tmpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/executable_dot_gitconfig.tmpl b/executable_dot_gitconfig.tmpl
index fec6ef4..35a2da7 100644
--- a/executable_dot_gitconfig.tmpl
+++ b/executable_dot_gitconfig.tmpl
@@ -14,6 +14,8 @@
 	user = MillironX
 [pull]
 	rebase = false
+[safe]
+	directory = /var/docker
 {{- if eq .machinetype "workstation" }}
 [commit]
 	gpgsign = true

From 455d5636a77e38260f0b867ee74734ba7af60690 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Thu, 2 Mar 2023 19:33:57 +0000
Subject: [PATCH 11/11] Update tmux.conf

---
 dot_profile        | 13 +++++++++++++
 dot_tmux.conf      |  2 --
 dot_tmux.conf.tmpl |  6 ++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 delete mode 100644 dot_tmux.conf
 create mode 100644 dot_tmux.conf.tmpl

diff --git a/dot_profile b/dot_profile
index af1c378..17df7a2 100644
--- a/dot_profile
+++ b/dot_profile
@@ -7,6 +7,19 @@ 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 <<<
+
 # Linuxbrew setup
 if [ -d $HOME/../linuxbrew/.linuxbrew ]; then
   BREWPATH=$HOME/../linuxbrew/.linuxbrew
diff --git a/dot_tmux.conf b/dot_tmux.conf
deleted file mode 100644
index 029f1db..0000000
--- a/dot_tmux.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-set -g default-terminal "tmux-256color"
-source "/usr/share/tmux/powerline.conf"
diff --git a/dot_tmux.conf.tmpl b/dot_tmux.conf.tmpl
new file mode 100644
index 0000000..1c3c442
--- /dev/null
+++ b/dot_tmux.conf.tmpl
@@ -0,0 +1,6 @@
+set -g default-terminal "tmux-256color"
+{{- if (eq .chezmoi.osRelease.id "debian") }}
+source "/usr/share/powerline/bindings/tmux/powerline.conf"
+{{- else -}}
+source "/usr/share/tmux/powerline.conf"
+{{- end }}