diff --git a/.gitmodules b/.gitmodules
index f94569a..1acc3ad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "fish/.config/fish/fishline"]
 	path = fish/.config/fish/fishline
 	url = https://github.com/0rax/fishline.git/
+[submodule "fishline"]
+	path = fish/.config/fish/fishline
+	url = https://github.com/drewcassidy/fishline
diff --git a/fish/.config/fish/fishline b/fish/.config/fish/fishline
index e7376c1..bddf62a 160000
--- a/fish/.config/fish/fishline
+++ b/fish/.config/fish/fishline
@@ -1 +1 @@
-Subproject commit e7376c10bb0811795bd81275e22bfa8a9ea4cdd3
+Subproject commit bddf62a3237d5f011b4a844b2fa78473d653caff
diff --git a/fish/.config/fish/functions/fish_prompt.fish b/fish/.config/fish/functions/fish_prompt.fish
new file mode 100644
index 0000000..7e5a37f
--- /dev/null
+++ b/fish/.config/fish/functions/fish_prompt.fish
@@ -0,0 +1,3 @@
+function fish_prompt
+    fishline -s $status USER PWD GIT ROOT
+end