diff --git a/fish/config.fish b/fish/config.fish
index 5a62519..382f7b1 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -13,6 +13,8 @@ end
 fish_add_path $HOME/bin
 fish_add_path $HOME/.local/bin
 
+set -x EDITOR /usr/local/bin/nvim
+
 # Colors
 set fish_color_user normal
 set fish_color_host blue
diff --git a/nvim/lua/user/icons.lua b/nvim/lua/user/icons.lua
index bae8dd2..01dd131 100644
--- a/nvim/lua/user/icons.lua
+++ b/nvim/lua/user/icons.lua
@@ -9,6 +9,11 @@ return {
     separator = "│",
     edit = "",
     buffer = "",
+    whitespace = {
+        tab = "»",
+        space = "·",
+        eol = ""
+    },
     fold = {
         open = "",
         close = "",