diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..3c9fb93
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "fishline-fork"]
+	path = fish/.config/fish/fishline
+	url = https://github.com/drewcassidy/fishline
diff --git a/fish/.config/fish/fishline b/fish/.config/fish/fishline
new file mode 160000
index 0000000..bddf62a
--- /dev/null
+++ b/fish/.config/fish/fishline
@@ -0,0 +1 @@
+Subproject commit bddf62a3237d5f011b4a844b2fa78473d653caff
diff --git a/fish/.config/fish/fishline_colors.fish b/fish/.config/fish/fishline_colors.fish
index acf574b..1f05694 100644
--- a/fish/.config/fish/fishline_colors.fish
+++ b/fish/.config/fish/fishline_colors.fish
@@ -48,7 +48,7 @@ set FLCLR_CONDA_BG          $FLCLR_VFISH_BG
 set FLCLR_CONDA_FG          $FLCLR_VFISH_FG
 
 # Color for GIT segment
-set FLCLR_GIT_BG_CLEAN      green 
+set FLCLR_GIT_BG_CLEAN      green
 set FLCLR_GIT_FG_CLEAN      black
 set FLCLR_GIT_BG_DIRTY      yellow
 set FLCLR_GIT_FG_DIRTY      black
diff --git a/fish/.config/fish/functions/__history_previous_command.fish b/fish/.config/fish/functions/__history_previous_command.fish
new file mode 100755
index 0000000..4055545
--- /dev/null
+++ b/fish/.config/fish/functions/__history_previous_command.fish
@@ -0,0 +1,8 @@
+function __history_previous_command
+  switch (commandline -t)
+  case "!"
+    commandline -t $history[1]; commandline -f repaint
+  case "*"
+    commandline -i !
+  end
+end
diff --git a/fish/.config/fish/functions/__history_previous_command_arguments.fish b/fish/.config/fish/functions/__history_previous_command_arguments.fish
new file mode 100755
index 0000000..adc8fbd
--- /dev/null
+++ b/fish/.config/fish/functions/__history_previous_command_arguments.fish
@@ -0,0 +1,9 @@
+function __history_previous_command_arguments
+  switch (commandline -t)
+  case "!"
+    commandline -t ""
+    commandline -f history-token-search-backward
+  case "*"
+    commandline -i '$'
+  end
+end
diff --git a/fish/.config/fish/functions/fish_user_key_bindings.fish b/fish/.config/fish/functions/fish_user_key_bindings.fish
new file mode 100644
index 0000000..5e5d786
--- /dev/null
+++ b/fish/.config/fish/functions/fish_user_key_bindings.fish
@@ -0,0 +1,4 @@
+function fish_user_key_bindings
+    bind ! __history_previous_command
+    bind '$' __history_previous_command_arguments
+end