diff --git a/.config/fish/conf.d/aliases.fish b/.config/fish/conf.d/aliases.fish
new file mode 100644
index 0000000..a0e0c45
--- /dev/null
+++ b/.config/fish/conf.d/aliases.fish
@@ -0,0 +1,4 @@
+alias cp='cp -v'
+alias vi=nvim
+alias vim=nvim
+alias tmx='tmux new-session -A -s'
diff --git a/.config/fish/functions/tmx.fish b/.config/fish/functions/tmx.fish
deleted file mode 100644
index 8225760..0000000
--- a/.config/fish/functions/tmx.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function tmx --description 'Attach to a tmux session, creating it if needed'
-    tmux new-session -A -s $argv[1]
-end
diff --git a/.config/fish/functions/vim.fish b/.config/fish/functions/vim.fish
deleted file mode 100644
index 5d72a1f..0000000
--- a/.config/fish/functions/vim.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function vim --wraps=nvim
-    nvim $argv
-end