diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl
new file mode 100644
index 0000000..ed97bc1
--- /dev/null
+++ b/.chezmoi.toml.tmpl
@@ -0,0 +1,35 @@
+{{- $gitname := promptStringOnce . "gitname" "Git Name" -}}
+{{- $gitmail := promptStringOnce . "gitmail" "Git Mail Address" -}}
+
+{{- $osid := chezmoi.os -}}
+{{- if .chezmoi.osRelease -}}
+{{-   if hasKey .chezmoi.osRelease "id" -}}
+{{-     $osid = printf "%s-%s" .chezmoi.os .chezmoi.osRelease.id -}}
+{{-   end -}}
+{{- end -}}
+
+pager = "less -R"
+encryption = "age"
+
+[data]
+  gitname = {{ $gitname | quote }}
+  gitmail = {{ $gitmail | quote }}
+  osid = {{ $osid | quote }}
+
+[age]
+  identity = ~"~/.config/sops/keys.txt"
+  recipient = "age1fc7myuewzdr7rvqr9fl3x3jwky3j4gp92hxguf3dlgnesm9s9e8q45xmp2"
+
+[git]
+  autoCommit = false
+  autoPush = false
+  autoAdd = true
+
+[diff]
+  exclude = ["externals"]
+
+{{- if lookPath "nvim" }}
+[merge]
+  command = "nvim"
+  args = ["-d"]
+{{- end }}
diff --git a/.chezmoi.yaml.tmpl b/.chezmoi.yaml.tmpl
deleted file mode 100644
index b1e2b34..0000000
--- a/.chezmoi.yaml.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{- $personal := promptBool "Personal?" -}}{{/* true if this is a personal machine */}}
-{{- if eq $personal true -}}
-  {{- $email := promptString "Email?" -}}
-  {{- $work := false -}}
-{{- else -}}
-  {{- $email = promptString "Email?" -}}
-  {{- $work := promptBool "Work?" -}}
-{{- end -}}
-
-
-sourceDir: {{ .chezmoi.SourceDir | quote }}
-data:
-  name: "Eric Renfro"
-  email: {{ $email | quote }}
-  is:
-    personal: {{ $personal -}}
-    work: {{ $work -}}
-    battlestation: false
-    headless: true
-  theme: "erenfro"
-  programs:
-    terminal: alacritty
-    editor: micro
-    visual: less
-    browser: firefox
-    font:
-      term:
-        name: "Hack Nerd Font"
-        size: 12.0
-encryption: age
-age:
-  recipient: "age1fc7myuewzdr7rvqr9fl3x3jwky3j4gp92hxguf3dlgnesm9s9e8q45xmp2"
-  identity: "~/.config/sops/keys.txt"