diff --git a/home/hosts/andromache/default.nix b/home/hosts/andromache/default.nix
index fdae455b..eef01cbf 100644
--- a/home/hosts/andromache/default.nix
+++ b/home/hosts/andromache/default.nix
@@ -59,6 +59,7 @@
   shell.bash.aliases.lang-js = true;
   shell.bash.addBinToPath = true;
   devenv.enable = true;
+  nvim.enable = true;
   pandoc.enable = true;
   photography.enable = true;
   torrenting.enable = true;
diff --git a/home/hosts/astyanax/default.nix b/home/hosts/astyanax/default.nix
index 8fb32543..b3b57a7a 100644
--- a/home/hosts/astyanax/default.nix
+++ b/home/hosts/astyanax/default.nix
@@ -56,6 +56,7 @@
   shell.bash.addBinToPath = true;
   my.yubikey.enable = true;
   devenv.enable = true;
+  nvim.enable = true;
   nfc.enable = true;
   pandoc.enable = true;
 
diff --git a/home/hosts/work/default.nix b/home/hosts/work/default.nix
index 8fea6576..9c71f260 100644
--- a/home/hosts/work/default.nix
+++ b/home/hosts/work/default.nix
@@ -65,6 +65,7 @@
 
   browser.primary = "firefox";
   devenv.enable = true;
+  nvim.enable = true;
   my.dconf.enable = true;
   pandoc.enable = true;
   browser.secondary = "chromium";
diff --git a/home/modules/nvim/default.nix b/home/modules/nvim/default.nix
index 3ac04438..2281fb42 100644
--- a/home/modules/nvim/default.nix
+++ b/home/modules/nvim/default.nix
@@ -1,7 +1,20 @@
-{ pkgs, inputs, ... }:
-
 {
-  home.packages = [
-    inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.nvim
-  ];
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}:
+
+let
+  cfg = config.nvim;
+in
+{
+  options.nvim.enable = lib.mkEnableOption "nvim";
+
+  config = lib.mkIf cfg.enable {
+    home.packages = [
+      inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.nvim
+    ];
+  };
 }