diff --git a/home.nix b/home.nix
index d1cd69d..6f71054 100644
--- a/home.nix
+++ b/home.nix
@@ -76,6 +76,9 @@ in {
       gp = "git push";
       gd = "git diff";
       gds = "git diff --staged";
+
+      vim = "nvim";
+      vi = "nvim";
     };
   };
 }
diff --git a/nixvim/config/base.nix b/nixvim/config/base.nix
new file mode 100644
index 0000000..9b8a869
--- /dev/null
+++ b/nixvim/config/base.nix
@@ -0,0 +1,3 @@
+{
+  defaultEditor = true;
+}
diff --git a/nixvim/config/default.nix b/nixvim/config/default.nix
index fb318ab..71d4bcf 100644
--- a/nixvim/config/default.nix
+++ b/nixvim/config/default.nix
@@ -1,4 +1,7 @@
 {
   # Import all your configuration modules here
-  imports = [ ./bufferline.nix ];
+  imports = [
+    ./bufferline.nix
+    ./base.nix
+  ];
 }