mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 00:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

wrappers: move programs.nixvim declaration to _shared.nix

Browse source
This commit is contained in:
Matt Sturgeon 2024-10-11 00:23:40 +01:00
parent af650ba940
commit e1c0b52487
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
4 changed files with 14 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
wrappers/_shared.nix
View file

@ -1,4 +1,6 @@
{ {
# Extra args for the `evalNixvim` call that produces the type for `programs.nixvim`
evalArgs ? { },
# Option path where extraFiles should go # Option path where extraFiles should go
filesOpt ? null, filesOpt ? null,
# Filepath prefix to apply to extraFiles # Filepath prefix to apply to extraFiles
@ -26,11 +28,17 @@ let
setAttrByPath setAttrByPath
; ;
cfg = config.programs.nixvim; cfg = config.programs.nixvim;
nixvimConfiguration = config.lib.nixvim.modules.evalNixvim evalArgs;
extraFiles = lib.filter (file: file.enable) (lib.attrValues cfg.extraFiles); extraFiles = lib.filter (file: file.enable) (lib.attrValues cfg.extraFiles);
in in
{ {
_file = ./_shared.nix; _file = ./_shared.nix;
options.programs.nixvim = lib.mkOption {
inherit (nixvimConfiguration) type;
default = { };
};
# TODO: Added 2024-07-24; remove after 24.11 # TODO: Added 2024-07-24; remove after 24.11
imports = [ imports = [
(lib.mkRenamedOptionModule (lib.mkRenamedOptionModule

11
wrappers/darwin.nix
View file

@ -16,7 +16,7 @@ let
types types
; ;
cfg = config.programs.nixvim; cfg = config.programs.nixvim;
nixvimConfig = config.lib.nixvim.modules.evalNixvim { evalArgs = {
extraSpecialArgs = { extraSpecialArgs = {
darwinConfig = config; darwinConfig = config;
}; };
@ -28,14 +28,7 @@ in
{ {
_file = ./darwin.nix; _file = ./darwin.nix;
options = { imports = [ (import ./_shared.nix { inherit evalArgs; }) ];
programs.nixvim = mkOption {
inherit (nixvimConfig) type;
default = { };
};
};
imports = [ (import ./_shared.nix { }) ];
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ environment.systemPackages = [

10
wrappers/hm.nix
View file

@ -15,7 +15,7 @@ let
types types
; ;
cfg = config.programs.nixvim; cfg = config.programs.nixvim;
nixvimConfig = config.lib.nixvim.modules.evalNixvim { evalArgs = {
extraSpecialArgs = { extraSpecialArgs = {
hmConfig = config; hmConfig = config;
}; };
@ -27,15 +27,9 @@ in
{ {
_file = ./hm.nix; _file = ./hm.nix;
options = {
programs.nixvim = mkOption {
inherit (nixvimConfig) type;
default = { };
};
};
imports = [ imports = [
(import ./_shared.nix { (import ./_shared.nix {
inherit evalArgs;
filesOpt = [ filesOpt = [
"xdg" "xdg"
"configFile" "configFile"

10
wrappers/nixos.nix
View file

@ -16,7 +16,7 @@ let
types types
; ;
cfg = config.programs.nixvim; cfg = config.programs.nixvim;
nixvimConfig = config.lib.nixvim.modules.evalNixvim { evalArgs = {
extraSpecialArgs = { extraSpecialArgs = {
nixosConfig = config; nixosConfig = config;
}; };
@ -28,15 +28,9 @@ in
{ {
_file = ./nixos.nix; _file = ./nixos.nix;
options = {
programs.nixvim = mkOption {
inherit (nixvimConfig) type;
default = { };
};
};
imports = [ imports = [
(import ./_shared.nix { (import ./_shared.nix {
inherit evalArgs;
filesOpt = [ filesOpt = [
"environment" "environment"
"etc" "etc"