diff --git a/.profile b/.profile
deleted file mode 100644
index 497441fa..00000000
--- a/.profile
+++ /dev/null
@@ -1,9 +0,0 @@
-# Start keychain
-command -v keychain > /dev/null && eval $(keychain --eval --quiet --noask -Q id_ed25519 id_rsa)
-
-# Set local paths
-LOCAL_BIN="$HOME/.local/bin"
-echo $PATH | grep -i "$LOCAL_BIN" - > /dev/null || export PATH=$PATH:$LOCAL_BIN
-
-DOTFILES_BIN="$(dirname $(dirname $(readlink -f $0)))/bin"
-echo $PATH | grep -i "$DOTFILES_BIN" - > /dev/null || export PATH=$PATH:$DOTFILES_BIN
diff --git a/config/fish/config.fish b/config/fish/config.fish
index 4f5eb1d3..3831d19c 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -1,9 +1,7 @@
 if status is-interactive
+    set -gx EDITOR nvim
+    set -gx VISUAL nvim
     fish_config theme choose CatppuccinMacchiato
-    alias vim="nvim"
-    alias vimdiff="nvim -d"
-    alias nvimdiff="nvim -d"
-    alias lg="lazygit"
 end
 
 function starship_transient_prompt_func
diff --git a/config/fish/functions/lg.fish b/config/fish/functions/lg.fish
new file mode 100644
index 00000000..74a631a6
--- /dev/null
+++ b/config/fish/functions/lg.fish
@@ -0,0 +1,3 @@
+function lg
+    lazygit $argv
+end
diff --git a/config/fish/functions/nvimdiff.fish b/config/fish/functions/nvimdiff.fish
new file mode 100644
index 00000000..0a55a47b
--- /dev/null
+++ b/config/fish/functions/nvimdiff.fish
@@ -0,0 +1,3 @@
+function nvimdiff
+    nvim -d
+end
diff --git a/config/fish/functions/vim.fish b/config/fish/functions/vim.fish
new file mode 100644
index 00000000..b10dc2f6
--- /dev/null
+++ b/config/fish/functions/vim.fish
@@ -0,0 +1,3 @@
+function vim
+    nvim
+end
diff --git a/config/fish/functions/vimdiff.fish b/config/fish/functions/vimdiff.fish
new file mode 100644
index 00000000..1dcb34a6
--- /dev/null
+++ b/config/fish/functions/vimdiff.fish
@@ -0,0 +1,3 @@
+function vimdiff
+    vim -d
+end