diff --git a/README.md b/README.md index 16eb1b22..14f15829 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ in { imports = [ # For home-manager - nixvim.homeManagerModules.nixvim + nixvim.homeModules.nixvim # For NixOS nixvim.nixosModules.nixvim # For nix-darwin @@ -158,7 +158,7 @@ flakes, just add the nixvim input: } ``` -You can now access the module using `inputs.nixvim.homeManagerModules.nixvim`, +You can now access the module using `inputs.nixvim.homeModules.nixvim`, for a home-manager installation, `inputs.nixvim.nixosModules.nixvim`, for NixOS, and `inputs.nixvim.nixDarwinModules.nixvim` for nix-darwin. @@ -167,7 +167,7 @@ and `inputs.nixvim.nixDarwinModules.nixvim` for nix-darwin. ## Usage NixVim can be used in four ways: through the home-manager, nix-darwin, NixOS modules, and standalone through the `makeNixvim` function. To use the modules, just import the -`nixvim.homeManagerModules.nixvim`, `nixvim.nixDarwinModules.nixvim`, and +`nixvim.homeModules.nixvim`, `nixvim.nixDarwinModules.nixvim`, and `nixvim.nixosModules.nixvim` modules, depending on which system you're using. diff --git a/docs/user-guide/install.md b/docs/user-guide/install.md index 4faab4ff..14fefeb7 100644 --- a/docs/user-guide/install.md +++ b/docs/user-guide/install.md @@ -56,7 +56,7 @@ When used as a module, NixVim can be enabled though `programs.nixvim.enable`. When using NixVim as a module you must import the NixVim module into your module system. The three imports are: -- `.homeManagerModules.nixvim` +- `.homeModules.nixvim` - `.nixosModules.nixvim` - `.nixDarwinModules.nixvim` diff --git a/flake/wrappers.nix b/flake/wrappers.nix index 38ab4548..842e6999 100644 --- a/flake/wrappers.nix +++ b/flake/wrappers.nix @@ -24,7 +24,7 @@ nixvim = import ../wrappers/hm.nix self; default = self.homeManagerModules.nixvim; }; - homeModules = self.homeManagerModules; + homeModules = self.homeModules; nixDarwinModules = { nixvim = import ../wrappers/darwin.nix self; default = self.nixDarwinModules.nixvim; diff --git a/tests/nixpkgs-module.nix b/tests/nixpkgs-module.nix index 031ce209..0eea61da 100644 --- a/tests/nixpkgs-module.nix +++ b/tests/nixpkgs-module.nix @@ -71,7 +71,7 @@ let ) { nixos = self.nixosModules.default; - hm = self.homeManagerModules.default; + hm = self.homeModules.default; nix-darwin = self.nixDarwinModules.default; } ); diff --git a/tests/platforms/hm-extra-files-byte-compiling.nix b/tests/platforms/hm-extra-files-byte-compiling.nix index 7f52f8c3..7caa4931 100644 --- a/tests/platforms/hm-extra-files-byte-compiling.nix +++ b/tests/platforms/hm-extra-files-byte-compiling.nix @@ -39,7 +39,7 @@ let inherit pkgs; modules = [ - self.homeManagerModules.nixvim + self.homeModules.nixvim config { programs.nixvim.performance.byteCompileLua.configs = true; } ]; @@ -50,7 +50,7 @@ let inherit pkgs; modules = [ - self.homeManagerModules.nixvim + self.homeModules.nixvim config { programs.nixvim.performance.byteCompileLua.configs = false; } ]; diff --git a/tests/platforms/hm-submodule-merge.nix b/tests/platforms/hm-submodule-merge.nix index e0d57f2e..32db65f5 100644 --- a/tests/platforms/hm-submodule-merge.nix +++ b/tests/platforms/hm-submodule-merge.nix @@ -50,7 +50,7 @@ let ]; } ) - self.homeManagerModules.nixvim + self.homeModules.nixvim ]; }; in diff --git a/tests/platforms/hm.nix b/tests/platforms/hm.nix index e5973f26..6e54ccf9 100644 --- a/tests/platforms/hm.nix +++ b/tests/platforms/hm.nix @@ -18,6 +18,6 @@ self.inputs.home-manager.lib.homeManagerConfiguration { programs.home-manager.enable = true; } - self.homeManagerModules.nixvim + self.homeModules.nixvim ]; }