diff --git a/fish/.gitignore b/fish/.gitignore
index e2b8233..562cb70 100644
--- a/fish/.gitignore
+++ b/fish/.gitignore
@@ -1,5 +1,2 @@
 fish_variables
 fisher/
-functions/br.fish
-functions/fish_user_key_bindings.fish
-functions/fzf_key_bindings.fish
diff --git a/fish/functions/battery.fish b/fish/functions/battery.fish
index 35152b5..984ee69 100644
--- a/fish/functions/battery.fish
+++ b/fish/functions/battery.fish
@@ -1,5 +1,4 @@
-function battery
-    # Only works on Mac
+function battery --description "Print battery status"
     if test (uname -s) != Darwin
         echo "Unsupported kernel: "(uname -s)
         return 1
@@ -12,4 +11,5 @@ function battery
     set_color green
     echo "⚡️ Running on $power_source with $battery_charge charge"
     set_color normal
+    commandline -f repaint
 end
diff --git a/fish/functions/fish_user_key_bindings.fish b/fish/functions/fish_user_key_bindings.fish
new file mode 100644
index 0000000..3ee7992
--- /dev/null
+++ b/fish/functions/fish_user_key_bindings.fish
@@ -0,0 +1,10 @@
+function fish_user_key_bindings
+    bind \cb battery
+    bind \cq fkill
+
+    # Bindings for fzf
+    if test -f (brew --prefix)/opt/fzf/shell/key-bindings.fish
+        source (brew --prefix)/opt/fzf/shell/key-bindings.fish
+        fzf_key_bindings
+    end
+end
diff --git a/install-fzf.sh b/install-fzf.sh
deleted file mode 100755
index ff22eb1..0000000
--- a/install-fzf.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Install fzf key-bindings
-FZF_INSTALLER=$(brew --prefix)/opt/fzf/install
-
-if [ -x "$FZF_INSTALLER" ]; then
-	"$FZF_INSTALLER" --key-bindings --no-completion --no-update-rc --no-bash --no-zsh
-end
diff --git a/install.sh b/install.sh
index f4723f3..2acce4d 100755
--- a/install.sh
+++ b/install.sh
@@ -18,8 +18,5 @@ grep -q "$BREW_PREFIX/bin/fish" /etc/shells || echo "$BREW_PREFIX/bin/fish" | su
 # Make fish the default shell
 sudo chsh -s "$BREW_PREFIX/bin/fish" `whoami`
 
-# Install fzf keybindings
-"$DOTFILES/install-fzf.sh"
-
 # Install symlinks
 "$DOTFILES/install-symlinks.sh"