diff --git a/flake/modules/home-manager.nix b/flake/modules/home-manager.nix
index e879223..7b80984 100644
--- a/flake/modules/home-manager.nix
+++ b/flake/modules/home-manager.nix
@@ -6,7 +6,7 @@ packages: inputs: {
   ...
 }: let
   inherit (lib) maintainers;
-  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.modules) mkIf;
   inherit (lib.lists) optionals;
   inherit (lib.options) mkOption mkEnableOption literalExpression;
   inherit (lib.types) attrsOf anything bool;
@@ -75,10 +75,10 @@ in {
   };
 
   config = mkIf cfg.enable {
-    programs.neovim-flake.finalPackage = neovimConfigured.neovim-wrapped;
+    programs.neovim-flake.finalPackage = neovimConfigured.neovim;
 
     home = {
-      sessionVariables.EDITOR = mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim");
+      sessionVariables = mkIf cfg.defaultEditor {EDITOR = "nvim";};
       packages =
         [cfg.finalPackage]
         ++ optionals cfg.enableManpages packages.${pkgs.stdenv.system}.docs-manpages;
diff --git a/flake/modules/nixos.nix b/flake/modules/nixos.nix
index 226175f..57f99d9 100644
--- a/flake/modules/nixos.nix
+++ b/flake/modules/nixos.nix
@@ -6,7 +6,7 @@ packages: inputs: {
   ...
 }: let
   inherit (lib) maintainers;
-  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.modules) mkIf mkOverride;
   inherit (lib.lists) optionals;
   inherit (lib.options) mkOption mkEnableOption literalExpression;
   inherit (lib.types) attrsOf anything bool;
@@ -75,10 +75,10 @@ in {
   };
 
   config = mkIf cfg.enable {
-    programs.neovim-flake.finalPackage = neovimConfigured.neovim-wrapped;
+    programs.neovim-flake.finalPackage = neovimConfigured.neovim;
 
     environment = {
-      variables.EDITOR = mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim");
+      variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim");
       systemPackages =
         [cfg.finalPackage]
         ++ optionals cfg.enableManpages packages.${pkgs.stdenv.system}.docs-manpages;