diff --git a/alacritty.configlink/alacritty.yml b/alacritty.configlink/alacritty.yml
index 2d77efc..983a4e3 100644
--- a/alacritty.configlink/alacritty.yml
+++ b/alacritty.configlink/alacritty.yml
@@ -361,10 +361,12 @@ font:
 #   - (macOS) /bin/bash --login
 #   - (Linux/BSD) user login shell
 #   - (Windows) powershell
-#shell:
-#  program: /usr/local/bin/fish
-#  args:
-#    - --login
+shell:
+  program: /usr/local/bin/fish
+  args:
+    - --login
+    - --init-command
+    - tmux
 
 # Startup directory
 #
diff --git a/fish.configlink/config.fish b/fish.configlink/config.fish
index a08d8fe..af7b82e 100644
--- a/fish.configlink/config.fish
+++ b/fish.configlink/config.fish
@@ -9,7 +9,7 @@ if status --is-interactive
     set PATH $PATH /usr/local/bin ~/.local/bin $DOTS/bin ~/.cargo/bin
     set CDPATH . $HOME $PROJ $DOTS
 
-    # Use `vi` in the shell
+    # Use `vi` in the shell with cursor shapes
     fish_vi_key_bindings
     set -g fish_vi_force_cursor
     set -g fish_cursor_default block
diff --git a/tmux/tmux.conf.symlink b/tmux/tmux.conf.symlink
index 49fd330..6cc2c01 100644
--- a/tmux/tmux.conf.symlink
+++ b/tmux/tmux.conf.symlink
@@ -7,10 +7,10 @@ set -g prefix C-space
 bind C-space send-prefix
 
 # Keep plenty of history for scrollback
-set -g history-limit 10000
+set -g history-limit 100000
 
 # Upgrade colors
-set -g default-terminal "screen-256color"
+#set -g default-terminal "screen-256color"
 
 # Remove delay for entering copy mode
 set-option -sg escape-time 0