From 36c4881384bd07ba8454639f6eb925be8eaf721a Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Mon, 30 May 2022 13:09:50 -0400
Subject: [PATCH] revert to nvim as alias for vim

---
 modules/editor/neovim/default.nix      | 1 +
 modules/shell/fish/functions/edit.fish | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/editor/neovim/default.nix b/modules/editor/neovim/default.nix
index d8a503a..2ebec2c 100644
--- a/modules/editor/neovim/default.nix
+++ b/modules/editor/neovim/default.nix
@@ -47,6 +47,7 @@
       MANPAGER = "nvim +Man!";
     };
     programs.fish = {
+      shellAliases = { vim = "nvim"; };
       shellAbbrs = {
         v = lib.mkForce "nvim";
         vl = lib.mkForce "nvim -c 'normal! `0'";
diff --git a/modules/shell/fish/functions/edit.fish b/modules/shell/fish/functions/edit.fish
index f95b1c2..fbe13b0 100644
--- a/modules/shell/fish/functions/edit.fish
+++ b/modules/shell/fish/functions/edit.fish
@@ -1,4 +1,4 @@
 set vimfile (fzf)
 and set vimfile (echo $vimfile | tr -d '\r')
-and commandline -r "nvim $vimfile"
+and commandline -r "vim $vimfile"
 and commandline -f execute