NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2024-11-22 13:20:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

flake/modules: add finalPackage akin to nixos' neovim module

Browse source
This commit is contained in:
raf 2024-04-14 17:13:57 +03:00
parent 8c4f32645b
commit c53c8311fc
No known key found for this signature in database
GPG key ID: 02D1DD3FA08B6B29
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake/modules/home-manager.nix
View file

@ -13,7 +13,7 @@ packages: inputs: {
cfg = config.programs.neovim-flake; cfg = config.programs.neovim-flake;
inherit (import ../../configuration.nix inputs) neovimConfiguration; inherit (import ../../configuration.nix inputs) neovimConfiguration;
builtPackage = neovimConfiguration { neovimConfigured = neovimConfiguration {
inherit pkgs; inherit pkgs;
modules = [cfg.settings]; modules = [cfg.settings];
}; };
@ -23,10 +23,10 @@ in {
options.programs.neovim-flake = { options.programs.neovim-flake = {
enable = mkEnableOption "neovim-flake, the extensible neovim-wrapper"; enable = mkEnableOption "neovim-flake, the extensible neovim-wrapper";
builtPackage = mkOption { finalPackage = mkOption {
type = anything; type = anything;
default = builtPackage; visible = false;
internal = true; readOnly = true;
description = '' description = ''
The built neovim-flake package, wrapped with the user's configuration. The built neovim-flake package, wrapped with the user's configuration.
''; '';
@ -57,6 +57,8 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [builtPackage]; home.packages = [cfg.finalPackage];
programs.neovim-flake.finalPackage = neovimConfigured.neovim;
}; };
} }

12
flake/modules/nixos.nix
View file

@ -13,7 +13,7 @@ packages: inputs: {
cfg = config.programs.neovim-flake; cfg = config.programs.neovim-flake;
inherit (import ../../configuration.nix inputs) neovimConfiguration; inherit (import ../../configuration.nix inputs) neovimConfiguration;
builtPackage = neovimConfiguration { neovimConfigured = neovimConfiguration {
inherit pkgs; inherit pkgs;
modules = [cfg.settings]; modules = [cfg.settings];
}; };
@ -23,10 +23,10 @@ in {
options.programs.neovim-flake = { options.programs.neovim-flake = {
enable = mkEnableOption "neovim-flake, the extensible neovim-wrapper"; enable = mkEnableOption "neovim-flake, the extensible neovim-wrapper";
builtPackage = mkOption { finalPackage = mkOption {
type = anything; type = anything;
default = builtPackage; visible = false;
internal = true; readOnly = true;
description = '' description = ''
The built neovim-flake package, wrapped with the user's configuration. The built neovim-flake package, wrapped with the user's configuration.
''; '';
@ -57,6 +57,8 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [builtPackage]; environment.systemPackages = [cfg.finalPackage];
programs.neovim-flake.finalPackage = neovimConfigured.neovim;
}; };
} }