diff --git a/fish/.config/fish/functions/fish_prompt.fish b/fish/.config/fish/functions/fish_prompt.fish
index 3e7ccc7..7a33ebc 100644
--- a/fish/.config/fish/functions/fish_prompt.fish
+++ b/fish/.config/fish/functions/fish_prompt.fish
@@ -1,4 +1,4 @@
-set fish_prompt_pwd_dir_length 1
+set fish_prompt_pwd_dir_length 0
 set __fish_git_prompt_show_informative_status 1
 
 # Fish command and parameter colors
@@ -54,7 +54,7 @@ function fish_prompt
   _print_in_color "┏["$USER"@"(prompt_hostname)"]" blue
 
   # current working dir
-  _print_in_color " "$PWD $fish_color_cwd
+  _print_in_color " "(prompt_pwd) $fish_color_cwd
 
   __fish_git_prompt " (%s)"
 
diff --git a/nvim/.config/nvim/lua/user/keymaps.lua b/nvim/.config/nvim/lua/user/keymaps.lua
index 725fee1..fcaa1a0 100644
--- a/nvim/.config/nvim/lua/user/keymaps.lua
+++ b/nvim/.config/nvim/lua/user/keymaps.lua
@@ -18,6 +18,17 @@ vim.g.maplocalleader = " "
 --   term_mode = "t",
 --   command_mode = "c",
 
+-- Disable Arrow keys to force myself to the Vim-Way of movement --
+keymap("i", "<Up>", "<Nop>", opts)
+keymap("i", "<Down>", "<Nop>", opts)
+keymap("i", "<Left>", "<Nop>", opts)
+keymap("i", "<Right>", "<Nop>", opts)
+
+keymap("n", "<Up>", "<Nop>", opts)
+keymap("n", "<Down>", "<Nop>", opts)
+keymap("n", "<Left>", "<Nop>", opts)
+keymap("n", "<Right>", "<Nop>", opts)
+
 -- Remap some language specific stuff --
 keymap("n", "ü", "{", opts)
 keymap("n", "<C-ü>", "<C-{>", opts)