diff --git a/modules/nvim-lazy/config.nix b/modules/nvim-lazy/config.nix
new file mode 100644
index 0000000..fe4cb07
--- /dev/null
+++ b/modules/nvim-lazy/config.nix
@@ -0,0 +1,27 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.programs.nvim-lazy;
+  inherit (pkgs.callPackage ../../pkgs { }) wrapNeovimLazy;
+in
+{
+  imports = [
+    ./options.nix
+  ];
+
+  config = lib.mkIf cfg.enable {
+    programs.nvim-lazy.finalPackage =
+      (wrapNeovimLazy cfg.package {
+        inherit (cfg)
+          luaRcContent
+          lazyConfig
+          lazyPlugins
+          vPlug
+      });
+  };
+}
diff --git a/modules/nvim-lazy/homeManager.nix b/modules/nvim-lazy/homeManager.nix
index cc5a290..928e198 100644
--- a/modules/nvim-lazy/homeManager.nix
+++ b/modules/nvim-lazy/homeManager.nix
@@ -1,22 +1,18 @@
 {
   lib,
   config,
-  pkgs,
   ...
 }:
 let
   cfg = config.programs.nvim-lazy;
-  inherit (pkgs.callPackage ../../pkgs { }) wrapNeovimLazy;
 in
 {
-  imports = [ ./default.nix ];
+  imports = [ ./config.nix ];
 
   config = (lib.mkIf cfg.enable) {
     _module.check = lib.mkDefault false;
     home.packages = [
-      (wrapNeovimLazy cfg.package {
-        inherit (cfg) luaRcContent lazyConfig lazyPlugins vPlug;
-      })
+      cfg.finalPackage
     ];
   };
 }
diff --git a/modules/nvim-lazy/nixosModule.nix b/modules/nvim-lazy/nixosModule.nix
index d6df827..45da1cf 100644
--- a/modules/nvim-lazy/nixosModule.nix
+++ b/modules/nvim-lazy/nixosModule.nix
@@ -1,22 +1,18 @@
 {
   lib,
   config,
-  pkgs,
   ...
 }:
 let
   cfg = config.programs.nvim-lazy;
-  inherit (pkgs.callPackage ../../pkgs { }) wrapNeovimLazy;
 in
 {
-  imports = [ ./default.nix ];
+  imports = [ ./config.nix ];
 
   config = (lib.mkIf cfg.enable) {
     _module.check = lib.mkDefault false;
     environment.systemPackages = [
-      (wrapNeovimLazy cfg.package {
-        inherit (cfg) luaRcContent lazyConfig lazyPlugins vPlug;
-      })
+      cfg.finalPackage
     ];
   };
 }
diff --git a/modules/nvim-lazy/default.nix b/modules/nvim-lazy/options.nix
similarity index 100%
rename from modules/nvim-lazy/default.nix
rename to modules/nvim-lazy/options.nix