From ebac4c87f40f73cb26cbd188ea746d1afde89ef7 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 14 Apr 2024 16:51:20 +0300 Subject: [PATCH] flake: don't type check builtPackage --- flake.nix | 8 ++++++++ flake/modules/home-manager.nix | 4 ++-- flake/modules/nixos.nix | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 9ba4f69..2919af4 100644 --- a/flake.nix +++ b/flake.nix @@ -33,6 +33,14 @@ default = self.homeManagerModules.neovim-flake; }; + + nixosModules = { + neovim-flake = { + imports = [(import ./flake/modules/nixos.nix self.packages inputs)]; + }; + + default = self.nixosModules.neovim-flake; + }; }; perSystem = { diff --git a/flake/modules/home-manager.nix b/flake/modules/home-manager.nix index 5f4723a..0a6cd9d 100644 --- a/flake/modules/home-manager.nix +++ b/flake/modules/home-manager.nix @@ -8,7 +8,7 @@ packages: inputs: { inherit (lib) maintainers; inherit (lib.modules) mkIf; inherit (lib.options) mkOption mkEnableOption literalExpression; - inherit (lib.types) attrsOf anything package; + inherit (lib.types) attrsOf anything; cfg = config.programs.neovim-flake; inherit (import ../../configuration.nix inputs) neovimConfiguration; @@ -24,7 +24,7 @@ in { enable = mkEnableOption "neovim-flake, the extensible neovim-wrapper"; builtPackage = mkOption { - type = package; + type = anything; default = builtPackage; internal = true; description = '' diff --git a/flake/modules/nixos.nix b/flake/modules/nixos.nix index 5a7d769..968c7d4 100644 --- a/flake/modules/nixos.nix +++ b/flake/modules/nixos.nix @@ -8,7 +8,7 @@ packages: inputs: { inherit (lib) maintainers; inherit (lib.modules) mkIf; inherit (lib.options) mkOption mkEnableOption literalExpression; - inherit (lib.types) attrsOf package anything; + inherit (lib.types) attrsOf anything; cfg = config.programs.neovim-flake; inherit (import ../../configuration.nix inputs) neovimConfiguration; @@ -24,7 +24,7 @@ in { enable = mkEnableOption "neovim-flake, the extensible neovim-wrapper"; builtPackage = mkOption { - type = package; + type = anything; default = builtPackage; internal = true; description = ''