diff --git a/defaults/main.yaml b/defaults/main.yaml
index a679a95..02cf017 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -92,3 +92,5 @@ pulseaudio_jack_sink_client_name: PulseAudio
 pulseaudio_jack_source_enabled: false
 pulseaudio_jack_source_channels: 2
 pulseaudio_jack_source_client_name: PulseAudio
+
+home_use_xonsh_on_terminals: true
diff --git a/tasks/main.yaml b/tasks/main.yaml
index 7ffb075..41b8365 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -8,6 +8,7 @@
 - import_tasks: pulseaudio.yaml
 - import_tasks: git.yaml
 - import_tasks: timer.yaml
+- import_tasks: xonsh.yaml
 
 - import_tasks: kanboard.yaml
 
diff --git a/tasks/xonsh.yaml b/tasks/xonsh.yaml
new file mode 100644
index 0000000..0e83b25
--- /dev/null
+++ b/tasks/xonsh.yaml
@@ -0,0 +1,11 @@
+---
+
+- name: xonsh pip
+  pip:
+    name: xonsh[full]
+    state: latest
+
+- name: xonsh config
+  template:
+    src: xonsh/xonshrc.j2
+    dest: ~/.xonshrc
diff --git a/templates/xfce4-terminal/terminalrc.j2 b/templates/xfce4-terminal/terminalrc.j2
index ec2d53c..4cb8a02 100644
--- a/templates/xfce4-terminal/terminalrc.j2
+++ b/templates/xfce4-terminal/terminalrc.j2
@@ -31,3 +31,6 @@ ScrollingBar=TERMINAL_SCROLLBAR_NONE
 BackgroundImageShading=0,530000
 ScrollingUnlimited=TRUE
 FontName=Monospace 12
+{% if home_use_xonsh_on_terminals %}
+CustomCommand=.local/bin/xonsh
+{% endif %}
diff --git a/templates/xonsh/xonshrc.j2 b/templates/xonsh/xonshrc.j2
new file mode 100644
index 0000000..6e08828
--- /dev/null
+++ b/templates/xonsh/xonshrc.j2
@@ -0,0 +1,3 @@
+{{ansible_managed|comment}}
+
+xontrib load abbrevs coreutils