mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-20 16:15:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

wrappers: use (evalModules {}).type for nixvim submodule

Browse source
This commit is contained in:
Matt Sturgeon 2024-09-24 10:19:12 +01:00
parent 8f991cc8bc
commit 5b55858fe3
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
4 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

22
wrappers/darwin.nix
View file

@ -16,22 +16,22 @@ let
types
;
cfg = config.programs.nixvim;
nixvimConfig = config.lib.nixvim.modules.evalNixvim {
extraSpecialArgs = {
defaultPkgs = pkgs;
darwinConfig = config;
};
modules = [
./modules/darwin.nix
];
check = false;
};
in
{
options = {
programs.nixvim = mkOption {
inherit (nixvimConfig) type;
default = { };
type = types.submoduleWith {
shorthandOnlyDefinesConfig = true;
specialArgs = config.lib.nixvim.modules.specialArgsWith {
defaultPkgs = pkgs;
darwinConfig = config;
};
modules = [
./modules/darwin.nix
../modules/top-level
];
};
};
};

22
wrappers/hm.nix
View file

@ -15,22 +15,22 @@ let
types
;
cfg = config.programs.nixvim;
nixvimConfig = config.lib.nixvim.modules.evalNixvim {
extraSpecialArgs = {
defaultPkgs = pkgs;
hmConfig = config;
};
modules = [
./modules/hm.nix
];
check = false;
};
in
{
options = {
programs.nixvim = mkOption {
inherit (nixvimConfig) type;
default = { };
type = types.submoduleWith {
shorthandOnlyDefinesConfig = true;
specialArgs = config.lib.nixvim.modules.specialArgsWith {
defaultPkgs = pkgs;
hmConfig = config;
};
modules = [
./modules/hm.nix
../modules/top-level
];
};
};
};

22
wrappers/nixos.nix
View file

@ -16,22 +16,22 @@ let
types
;
cfg = config.programs.nixvim;
nixvimConfig = config.lib.nixvim.modules.evalNixvim {
extraSpecialArgs = {
defaultPkgs = pkgs;
nixosConfig = config;
};
modules = [
./modules/nixos.nix
];
check = false;
};
in
{
options = {
programs.nixvim = mkOption {
inherit (nixvimConfig) type;
default = { };
type = types.submoduleWith {
shorthandOnlyDefinesConfig = true;
specialArgs = config.lib.nixvim.modules.specialArgsWith {
defaultPkgs = pkgs;
nixosConfig = config;
};
modules = [
./modules/nixos.nix
../modules/top-level
];
};
};
};

6
wrappers/standalone.nix
View file

@ -15,7 +15,7 @@ let
mkNvim =
mod:
let
evaledModule = evalNixvim {
nixvimConfig = evalNixvim {
modules = [
mod
./modules/standalone.nix
@ -24,7 +24,7 @@ let
defaultPkgs = pkgs;
} // extraSpecialArgs;
};
inherit (evaledModule.config) enableMan finalPackage printInitPackage;
inherit (nixvimConfig.config) enableMan finalPackage printInitPackage;
in
(pkgs.symlinkJoin {
name = "nixvim";
@ -35,7 +35,7 @@ let
meta.mainProgram = "nvim";
})
// rec {
inherit (evaledModule) config options;
inherit (nixvimConfig) config options;
extend =
extension:
mkNvim {