diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl
index 74f054d..ae6655d 100644
--- a/.chezmoi.toml.tmpl
+++ b/.chezmoi.toml.tmpl
@@ -24,9 +24,6 @@
 {{-   $cpuThreads = (output "powershell.exe" "-NoProfile" "-NonInteractive" "-Command" "(Get-CimInstance -ClassName 'Win32_Processor').NumberOfLogicalProcessors") | trim | atoi }}
 {{- end -}}
 
-[edit]
-	command = "micro"
-
 [data]
 	chassis = "{{ $chassisType }}"
 
@@ -37,4 +34,4 @@
 encryption = "age"
 [age]
     identity = "/home/xevion/key.txt"
-    recipient = "age1s3ctpj9lafl6qwyvd89sn448us7gdzd53d8yyhsc7zny78c0k4sqerrkze"
\ No newline at end of file
+    recipient = "age1s3ctpj9lafl6qwyvd89sn448us7gdzd53d8yyhsc7zny78c0k4sqerrkze"
diff --git a/dot_bashrc b/dot_bashrc.tmpl
similarity index 98%
rename from dot_bashrc
rename to dot_bashrc.tmpl
index 22ae640..e8f995b 100644
--- a/dot_bashrc
+++ b/dot_bashrc.tmpl
@@ -149,3 +149,6 @@ export PATH=$PATH:/usr/local/go/bin
 . "$HOME/.cargo/env"
 
 eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+
+# Set default chezmoi editor
+export EDITOR="micro"