From c955e117e8c0c680f2a277f17e8d220b9bfe3b9b Mon Sep 17 00:00:00 2001
From: John Bowdre <john@bowdre.net>
Date: Thu, 5 Dec 2024 08:11:10 -0600
Subject: [PATCH] make neovim the default editor

---
 home/global/default.nix             | 2 +-
 home/modules/tui/neovim/default.nix | 4 ++++
 home/modules/tui/shell/aliases.nix  | 6 +++---
 home/modules/tui/vim.nix            | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/home/global/default.nix b/home/global/default.nix
index 7ff9d75..9e27605 100644
--- a/home/global/default.nix
+++ b/home/global/default.nix
@@ -25,7 +25,7 @@
     stateVersion = lib.mkDefault "23.05";
 
     sessionVariables = {
-      EDITOR = "vim";
+      EDITOR = "nvim";
     };
   };
 
diff --git a/home/modules/tui/neovim/default.nix b/home/modules/tui/neovim/default.nix
index a86a881..b4b7ba0 100644
--- a/home/modules/tui/neovim/default.nix
+++ b/home/modules/tui/neovim/default.nix
@@ -12,6 +12,7 @@
 
   programs.nixvim = {
     enable = true;
+    defaultEditor = true;
 
     performance = {
       combinePlugins = {
@@ -24,6 +25,9 @@
       byteCompileLua.enable = true;
     };
 
+    viAlias = true;
+    vimAlias = true;
+
     luaLoader.enable = true;
   };
 }
diff --git a/home/modules/tui/shell/aliases.nix b/home/modules/tui/shell/aliases.nix
index 1eafb56..62667d1 100644
--- a/home/modules/tui/shell/aliases.nix
+++ b/home/modules/tui/shell/aliases.nix
@@ -10,6 +10,6 @@
   tf = "terraform";
   tfyolo = "terraform apply -auto-approve";
   top = "btop";
-  v = "vim";
-  vi = "vim";
-}
\ No newline at end of file
+  v = "nvim";
+}
+
diff --git a/home/modules/tui/vim.nix b/home/modules/tui/vim.nix
index fb37202..4268d66 100644
--- a/home/modules/tui/vim.nix
+++ b/home/modules/tui/vim.nix
@@ -1,7 +1,7 @@
 { pkgs, lib, ... }: {
   programs.vim = {
     enable = true;
-    defaultEditor = true;
+    # defaultEditor = true;
     settings = {
       background = "dark";
       expandtab = true;