diff --git a/src/dot_config/bashrc.tmpl b/src/dot_config/bashrc.tmpl
index 36871dc..97d5bfe 100644
--- a/src/dot_config/bashrc.tmpl
+++ b/src/dot_config/bashrc.tmpl
@@ -8,4 +8,4 @@
 
 # Use fish in place of bash
 # keep this line at the bottom of ~/.bashrc
-[ -x {{ $fish_path }} ] && SHELL={{ $fish_path }} exec fish
+[ -x {{ $fish_path }} ] && SHELL={{ $fish_path }} exec fish -l
diff --git a/src/dot_config/fish/config.fish b/src/dot_config/fish/config.fish
index b647ef2..b15cc20 100644
--- a/src/dot_config/fish/config.fish
+++ b/src/dot_config/fish/config.fish
@@ -32,3 +32,9 @@ if status --is-interactive
 		zoxide init fish | source
 	end
 end
+
+if status is-login
+	if test -z "$DISPLAY" -a "$XDG_VTNR" = 1
+		exec startx
+	end
+end