diff --git a/home/common/core.nix b/home/common/core.nix
index 1734e13f..aadee85b 100644
--- a/home/common/core.nix
+++ b/home/common/core.nix
@@ -89,5 +89,7 @@
 
     urldecode = "python3 -c 'import sys, urllib.parse as ul; print(ul.unquote_plus(sys.stdin.read()))'";
     urlencode = "python3 -c 'import sys, urllib.parse as ul; print(ul.quote_plus(sys.stdin.read()))'";
+
+    vim = "nvim";
   };
 }
\ No newline at end of file
diff --git a/modules/darwin/core.nix b/modules/darwin/core.nix
index f23f8b4d..894489ff 100644
--- a/modules/darwin/core.nix
+++ b/modules/darwin/core.nix
@@ -30,8 +30,12 @@
   # `home-manager` currently has issues adding them to `~/Applications`
   # Issue: https://github.com/nix-community/home-manager/issues/1341
   environment.systemPackages = with pkgs; [
+    neovim
+    git
   ];
 
+  environment.variables.EDITOR = "nvim";
+
   # Fonts
   fonts = {
     # use fonts specified by user rather than default ones