diff --git a/modules/top-level/output.nix b/modules/top-level/output.nix index 9e61256e..399a971a 100644 --- a/modules/top-level/output.nix +++ b/modules/top-level/output.nix @@ -9,6 +9,7 @@ let inherit (lib) types mkOption mkPackageOption; inherit (lib) optional optionalAttrs; builders = lib.nixvim.builders.withPkgs pkgs; + inherit (pkgs.stdenv.hostPlatform) system; in { options = { @@ -146,6 +147,16 @@ in readOnly = true; visible = false; }; + + manDocsPackage = mkOption { + type = types.package; + defaultText = lib.literalMD "`packages..man-docs` from Nixvim's flake"; + description = '' + Nixvim's manpage documentation. + ''; + readOnly = true; + visible = false; + }; }; }; @@ -370,6 +381,8 @@ in bat --language=lua "$init" ''; }; + + manDocsPackage = config.flake.packages.${system}.man-docs; }; # Set `wrapRc` and `impureRtp`s option defaults with even lower priority than `mkOptionDefault` diff --git a/wrappers/darwin.nix b/wrappers/darwin.nix index 9a66f910..4a4ce940 100644 --- a/wrappers/darwin.nix +++ b/wrappers/darwin.nix @@ -1,6 +1,5 @@ self: { - pkgs, config, lib, ... @@ -28,6 +27,6 @@ in environment.systemPackages = [ cfg.build.package cfg.build.printInitPackage - ] ++ lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs; + ] ++ lib.optional cfg.enableMan cfg.build.manDocsPackage; }; } diff --git a/wrappers/hm.nix b/wrappers/hm.nix index b588c497..0ecb4d23 100644 --- a/wrappers/hm.nix +++ b/wrappers/hm.nix @@ -1,6 +1,5 @@ self: { - pkgs, config, lib, ... @@ -36,7 +35,7 @@ in home.packages = [ cfg.build.package cfg.build.printInitPackage - ] ++ lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs; + ] ++ lib.optional cfg.enableMan cfg.build.manDocsPackage; home.sessionVariables = mkIf cfg.defaultEditor { EDITOR = "nvim"; }; diff --git a/wrappers/nixos.nix b/wrappers/nixos.nix index 6f603f26..698bfa9c 100644 --- a/wrappers/nixos.nix +++ b/wrappers/nixos.nix @@ -1,6 +1,5 @@ self: { - pkgs, config, lib, ... @@ -37,7 +36,7 @@ in environment.systemPackages = [ cfg.build.package cfg.build.printInitPackage - ] ++ lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs; + ] ++ lib.optional cfg.enableMan cfg.build.manDocsPackage; environment.variables = { VIM = mkIf (!cfg.wrapRc) "/etc/nvim"; diff --git a/wrappers/standalone.nix b/wrappers/standalone.nix index 241b715c..494074a5 100644 --- a/wrappers/standalone.nix +++ b/wrappers/standalone.nix @@ -33,7 +33,7 @@ let paths = [ build.package build.printInitPackage - ] ++ pkgs.lib.optional enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs; + ] ++ lib.optional enableMan build.manDocsPackage; meta.mainProgram = "nvim"; }) // rec {