flake-modules/nixos-modules.nix

@@ -2,17 +2,12 @@
 {
   flake.nixosModules =
     let
-      nvim-config =
+      nvim-config = {
-        { pkgs, ... }:
+        imports = [
-        {
+          inputs.nixvim.homeManagerModules.nixvim
-          imports = [
+          ../nvim
-            inputs.nixvim.homeManagerModules.nixvim
+        ];
-            (import ../nvim {
+      };
-              inherit (inputs) unstable;
-              inherit (pkgs) system;
-            })
-          ];
-        };
       homeManagerModuleSandalone = import ../home {
         inherit nvim-config;
         inherit (inputs) stylix;

flake-modules/nvim.nix

@@ -3,20 +3,19 @@
   flake.overlays.nixvim = inputs.nixvim.overlays.default;
 
   perSystem =
-    { pkgs, system, ... }:
+    { lib, system, ... }:
     let
       nixvimLib = inputs.nixvim.lib.${system};
       nixvim = inputs.nixvim.legacyPackages.${system};
       testNvimModule = nixvimLib.check.mkTestDerivationFromNixvimModule;
       nvimModule = extraConfig: {
-        inherit pkgs;
+        pkgs = inputs.unstable.legacyPackages.${system};
-        extraSpecialArgs = {
-          inherit (inputs) unstable;
-          inherit system;
-        };
         module = {
-          imports = [ (import ../nvim/standalone.nix { standalone = true; }) ];
+          imports = [ ../nvim/standalone.nix ];
-          config = extraConfig;
+          config = lib.mkMerge [
+            { performance.combinePlugins.enable = true; }
+            extraConfig
+          ];
         };
       };
       moduleDev = nvimModule { };

nvim/default.nix

@@ -1,4 +1,3 @@
-{ system, unstable }:
 { lib, config, ... }:
 let
   cfg = config.jhome.nvim;
@@ -7,9 +6,8 @@ in
   imports = [ ./options.nix ];
 
   config.programs.nixvim = lib.mkMerge [
-    (import ./standalone.nix { standalone = false; })
+    (import ./standalone.nix)
     (lib.mkIf cfg.enable {
-      nixpkgs = lib.mkForce { pkgs = import unstable { inherit system; }; };
       enable = true;
       defaultEditor = lib.mkDefault true;
       jhome.nvim = cfg;

nvim/dev-plugins.nix

@@ -15,7 +15,6 @@ let
     # "html" # Not writing html
     "jsonls"
     "marksman"
-    "nixd"
     "ruff"
     "taplo"
     # "texlab" # Not using it

nvim/standalone.nix

@@ -1,11 +1,4 @@
-{ standalone }:
+{ pkgs, ... }:
-{
-  pkgs,
-  system,
-  unstable,
-  lib,
-  ...
-}:
 {
   imports = [
     ./options.nix
@@ -17,7 +10,6 @@
 
   config = {
     withRuby = false;
-    nixpkgs = lib.optionalAttrs standalone { pkgs = unstable.legacyPackages.${system}; };
     globals.mapleader = " ";
     # Appearance
     colorschemes.gruvbox = {
@@ -50,7 +42,6 @@
       # Enable local configuration :h 'exrc'
       exrc = true; # safe since nvim 0.9
     };
-    performance.combinePlugins.enable = true;
     extraPlugins =
       let
         plugins = pkgs.vimPlugins;