From 19b02dba5c92bad8c95443f32dff7ac53954f11d Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 3 Apr 2023 11:54:22 +0100
Subject: [PATCH] Add more/better neovim config with home-manager

---
 nixos/home-manager/packages/env/fish.nix   |  1 -
 nixos/home-manager/packages/tui/neovim.nix | 10 ++++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/nixos/home-manager/packages/env/fish.nix b/nixos/home-manager/packages/env/fish.nix
index e04ffab6..eadfe16d 100644
--- a/nixos/home-manager/packages/env/fish.nix
+++ b/nixos/home-manager/packages/env/fish.nix
@@ -7,7 +7,6 @@
       update = "sudo nixos-rebuild switch --upgrade";
       nr = "sudo nixos-rebuild";
       lg = "lazygit";
-      vim = "nvim";
     };
   };
 }
diff --git a/nixos/home-manager/packages/tui/neovim.nix b/nixos/home-manager/packages/tui/neovim.nix
index 81552f28..8a340c8b 100644
--- a/nixos/home-manager/packages/tui/neovim.nix
+++ b/nixos/home-manager/packages/tui/neovim.nix
@@ -1,11 +1,17 @@
 { pkgs, ... }:
 
 {
-  programs.neovim.enable = true;
+  programs.neovim = {
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
+    vimdiffAlias = true;
+    withNodeJs = true;
+    withPython3 = true;
+  };
   home.packages = with pkgs; [
     gnumake
     gcc
-    python310Packages.pynvim
     python310Packages.mypy
     python310Packages.black
     python310Packages.isort