diff --git a/git/gitconfig b/git/gitconfig
new file mode 100644
index 0000000..5854015
--- /dev/null
+++ b/git/gitconfig
@@ -0,0 +1,7 @@
+[user]
+	name = Mari
+	email = reya.git@reya.zone
+[pull]
+	ff = only
+[init]
+	defaultBranch = main
diff --git a/i3/config b/i3/config
index 73d0e0c..9c611e5 100644
--- a/i3/config
+++ b/i3/config
@@ -36,9 +36,6 @@ exec --no-startup-id exec /usr/libexec/gnome-settings-daemon-localeexec
 # Fix a bug in gnome-settings-daemon: http://feeding.cloud.geek.nz/posts/creating-a-modern-tiling-desktop-environment-using-i3/
 exec --no-startup-id exec dconf write /org/gnome/settings-daemon/plugins/cursor/active false
 
-# Initialize a tmux session on startup
-exec --no-startup-id exec zsh -ic "tmux_init"
-
 # Start up the gammastep color temperature adjustment daemon.
 exec --no-startup-id exec gammastep
 
@@ -50,7 +47,9 @@ exec --no-startup-id exec xcape -e 'Hyper_L=Control_L|grave'
 exec --no-startup-id exec xcape -e 'Control_L=Escape'
 # Set up xcape to make tapping the super key trigger the tmux modifier key.
 exec --no-startup-id exec xcape -e 'Super_L=Control_L|a'
-bindsym $mod+j exec ~/.config/i3/helpers/terminal && zsh -ic 'tmux_window /home/reya/.local/bin/guided-journal Journal'
+for_window [class="^journal-terminal-st$"] floating enable
+for_window [class="^journal-terminal-st$"] sticky enable
+bindsym $mod+j exec exec st -c journal-terminal-st -t "Journal" -g 150x50 -e ~/.local/bin/guided-journal
 
 # Use pactl to adjust volume in PulseAudio.
 bindsym XF86AudioRaiseVolume exec --no-startup-id exec ~/.config/i3/helpers/volume.sh up
@@ -246,10 +245,10 @@ for_window [class="^jetbrains-.*$" title="win0"] floating enable
 assign [class="^jetbrains-.*$"] workspace number $ws4
 
 # start a terminal
-assign [class="^Lxterminal$"] workspace number $ws5
-bindsym $mod+Control+5 workspace $ws5 ; exec exec lxterminal -e '$SHELL -ic "go_tmux -x"' 
-bindsym $mod+Control+Shift+5 workspace $ws5 ; exec exec lxterminal -e '$SHELL -ic "exec ssh gubal"' 
-bindsym $mod+Return workspace $ws5 ; exec exec lxterminal -e '$SHELL -ic "go_tmux -x"' 
+assign [class="^st$"] workspace number $ws5
+bindsym $mod+Control+5 workspace $ws5 ; exec exec st -t "Simple Terminal (Local)" -e $SHELL -ic 'go_tmux -x'
+bindsym $mod+Control+Shift+5 workspace $ws5 ; exec exec st -t "Simple Terminal (Gubal)" -e $SHELL -ic 'exec ssh gubal'
+bindsym $mod+Return workspace $ws5 ; exec exec st -t "Simple Terminal (Local)" -e $SHELL -ic 'go_tmux -x'
 
 # open a file manager
 assign [class="^Org\.gnome\.Nautilus$"] workspace number $ws6
diff --git a/per-host/costadelsol/.gitconfig b/per-host/costadelsol/.gitconfig
new file mode 100644
index 0000000..5854015
--- /dev/null
+++ b/per-host/costadelsol/.gitconfig
@@ -0,0 +1,7 @@
+[user]
+	name = Mari
+	email = reya.git@reya.zone
+[pull]
+	ff = only
+[init]
+	defaultBranch = main
diff --git a/per-host/crystarium/.gitconfig b/per-host/crystarium/.gitconfig
new file mode 100644
index 0000000..5854015
--- /dev/null
+++ b/per-host/crystarium/.gitconfig
@@ -0,0 +1,7 @@
+[user]
+	name = Mari
+	email = reya.git@reya.zone
+[pull]
+	ff = only
+[init]
+	defaultBranch = main
diff --git a/per-host/goldsaucer/.gitconfig b/per-host/goldsaucer/.gitconfig
new file mode 100644
index 0000000..5854015
--- /dev/null
+++ b/per-host/goldsaucer/.gitconfig
@@ -0,0 +1,7 @@
+[user]
+	name = Mari
+	email = reya.git@reya.zone
+[pull]
+	ff = only
+[init]
+	defaultBranch = main
diff --git a/per-host/gubal/.gitconfig b/per-host/gubal/.gitconfig
new file mode 100644
index 0000000..5854015
--- /dev/null
+++ b/per-host/gubal/.gitconfig
@@ -0,0 +1,7 @@
+[user]
+	name = Mari
+	email = reya.git@reya.zone
+[pull]
+	ff = only
+[init]
+	defaultBranch = main
diff --git a/per-host/mordhona/.gitconfig b/per-host/mordhona/.gitconfig
new file mode 100644
index 0000000..5854015
--- /dev/null
+++ b/per-host/mordhona/.gitconfig
@@ -0,0 +1,7 @@
+[user]
+	name = Mari
+	email = reya.git@reya.zone
+[pull]
+	ff = only
+[init]
+	defaultBranch = main
diff --git a/per-host/template/.gitconfig b/per-host/template/.gitconfig
new file mode 120000
index 0000000..0b083aa
--- /dev/null
+++ b/per-host/template/.gitconfig
@@ -0,0 +1 @@
+../../git/gitconfig
\ No newline at end of file