From 1fa86d169984f229acc1a69d1454f38cd4b22e9f Mon Sep 17 00:00:00 2001 From: LightQuantum Date: Mon, 7 Nov 2022 23:12:40 +0800 Subject: [PATCH] helpers: expose to config.nixvim.helpers (#59) --- wrappers/hm.nix | 18 ++++++++++++++---- wrappers/nixos.nix | 18 ++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/wrappers/hm.nix b/wrappers/hm.nix index 5a547b97..8d32e200 100644 --- a/wrappers/hm.nix +++ b/wrappers/hm.nix @@ -2,18 +2,28 @@ modules: { pkgs, config, lib, ... }: let - inherit (lib) mkEnableOption mkOption mkIf mkMerge types; + inherit (lib) mkEnableOption mkOption mkOptionType mkMerge mkIf types; cfg = config.programs.nixvim; -in { +in +{ options = { - programs.nixvim = lib.mkOption { + programs.nixvim = mkOption { type = types.submodule ((modules pkgs) ++ [{ options.enable = mkEnableOption "nixvim"; }]); }; + nixvim.helpers = mkOption { + type = mkOptionType { + name = "helpers"; + description = "Helpers that can be used when writing nixvim configs"; + check = builtins.isAttrs; + }; + description = "Use this option to access the helpers"; + default = import ../plugins/helpers.nix { inherit (pkgs) lib; }; + }; }; - config = mkIf cfg.enable + config = mkIf cfg.enable (mkMerge [ { home.packages = [ cfg.finalPackage ]; } (mkIf (!cfg.wrapRc) { diff --git a/wrappers/nixos.nix b/wrappers/nixos.nix index a82bc056..0c6a807a 100644 --- a/wrappers/nixos.nix +++ b/wrappers/nixos.nix @@ -2,18 +2,28 @@ modules: { pkgs, config, lib, ... }: let - inherit (lib) mkEnableOption mkOption mkMerge mkIf types; + inherit (lib) mkEnableOption mkOption mkOptionType mkMerge mkIf types; cfg = config.programs.nixvim; -in { +in +{ options = { - programs.nixvim = lib.mkOption { + programs.nixvim = mkOption { type = types.submodule ((modules pkgs) ++ [{ options.enable = mkEnableOption "nixvim"; }]); }; + nixvim.helpers = mkOption { + type = mkOptionType { + name = "helpers"; + description = "Helpers that can be used when writing nixvim configs"; + check = builtins.isAttrs; + }; + description = "Use this option to access the helpers"; + default = import ../plugins/helpers.nix { inherit (pkgs) lib; }; + }; }; - config = mkIf cfg.enable + config = mkIf cfg.enable (mkMerge [ { environment.systemPackages = [ cfg.finalPackage ]; } (mkIf (!cfg.wrapRc) {