diff --git a/common/neovim/default.nix b/common/neovim/default.nix
new file mode 100644
index 0000000..5528391
--- /dev/null
+++ b/common/neovim/default.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  cfg = config.my.neovim;
+in {
+  options.my.neovim = {
+    enable = lib.mkEnableOption "neovim";
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [nvim-custom];
+
+    environment.variables."EDITOR" = "nvim";
+  };
+}
diff --git a/machines/nova/configuration.nix b/machines/nova/configuration.nix
index 252372c..84a4dbd 100644
--- a/machines/nova/configuration.nix
+++ b/machines/nova/configuration.nix
@@ -56,6 +56,7 @@
     firewallInterface = "enp1s0";
   };
 
+  my.neovim.enable = true;
   my.services.keycloak.enable = true;
   my.services.mealie.enable = true;
   my.services.nextcloud.enable = true;