diff --git a/nix/configurations/vanadium/home/dev.nix b/nix/configurations/vanadium/home/dev.nix
index d2723405..6b9c1c7e 100644
--- a/nix/configurations/vanadium/home/dev.nix
+++ b/nix/configurations/vanadium/home/dev.nix
@@ -14,9 +14,7 @@
     pkgs.nix-doc
     pkgs.nixpkgs-review
     pkgs.shellcheck
-  ];
 
-  programs.neovim.extraPackages = [
     pkgs.lua-language-server
     pkgs.stylua                  # lua
     pkgs.nil                     # nix
diff --git a/nix/homeModules/common/neovim.nix b/nix/homeModules/common/neovim.nix
index 4e40a653..b60b8272 100644
--- a/nix/homeModules/common/neovim.nix
+++ b/nix/homeModules/common/neovim.nix
@@ -1,7 +1,11 @@
-{pkgs, ...}: {
-  programs.neovim = {
-    defaultEditor = true;
-    extraPackages = [
+{pkgs, lib, config, ...}: let
+  cfg = config.programs.neovim;
+in {
+  config = {
+    programs.neovim = lib.mkIf cfg.enable {
+      defaultEditor = true;
+    };
+    home.packages = [
       # might be useful for servers, serves as minimal configuration
       pkgs.nodePackages.bash-language-server
       pkgs.shellcheck