From 70f331c8e7da588e07e70cef15a114f9fcec3cee Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sun, 4 May 2025 14:59:47 -0700 Subject: [PATCH] stylix: use lib.modules.importApply (#1185) Link: https://github.com/danth/stylix/pull/1185 Reviewed-by: Flameopathic <64027365+Flameopathic@users.noreply.github.com> Reviewed-by: Matt Sturgeon Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- stylix/darwin/default.nix | 2 +- stylix/droid/default.nix | 2 +- stylix/droid/palette.nix | 2 +- stylix/hm/default.nix | 2 +- stylix/nixos/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stylix/darwin/default.nix b/stylix/darwin/default.nix index 7de7db7c..fc9e3e1c 100644 --- a/stylix/darwin/default.nix +++ b/stylix/darwin/default.nix @@ -23,7 +23,7 @@ in "${inputs.self}/stylix/pixel.nix" "${inputs.self}/stylix/target.nix" "${inputs.self}/stylix/release.nix" - (import "${inputs.self}/stylix/overlays.nix" inputs) + (lib.modules.importApply "${inputs.self}/stylix/overlays.nix" inputs) ] ++ autoload; config.warnings = lib.mkIf diff --git a/stylix/droid/default.nix b/stylix/droid/default.nix index b1afb2bc..80cdeba9 100644 --- a/stylix/droid/default.nix +++ b/stylix/droid/default.nix @@ -12,7 +12,7 @@ in "${inputs.self}/stylix/palette.nix" "${inputs.self}/stylix/pixel.nix" "${inputs.self}/stylix/target.nix" - (import "${inputs.self}/stylix/overlays.nix" inputs) + (lib.modules.importApply "${inputs.self}/stylix/overlays.nix" inputs) ] ++ autoload; # See https://github.com/nix-community/nix-on-droid/issues/436 diff --git a/stylix/droid/palette.nix b/stylix/droid/palette.nix index 23c299f6..04a50aa3 100644 --- a/stylix/droid/palette.nix +++ b/stylix/droid/palette.nix @@ -2,7 +2,7 @@ args: { config, lib, ... }: { - imports = [ (import ../palette.nix args) ]; + imports = [ (lib.modules.importApply ../palette.nix args) ]; config = lib.mkIf config.stylix.enable { environment.etc = config.stylix.generated.fileTree; diff --git a/stylix/hm/default.nix b/stylix/hm/default.nix index 69f5686f..0c7e5ae8 100644 --- a/stylix/hm/default.nix +++ b/stylix/hm/default.nix @@ -26,7 +26,7 @@ in "${inputs.self}/stylix/pixel.nix" "${inputs.self}/stylix/target.nix" "${inputs.self}/stylix/release.nix" - (import "${inputs.self}/stylix/overlays.nix" inputs) + (lib.modules.importApply "${inputs.self}/stylix/overlays.nix" inputs) ] ++ autoload; config.warnings = lib.mkIf diff --git a/stylix/nixos/default.nix b/stylix/nixos/default.nix index 7f5f3e79..d08b5314 100644 --- a/stylix/nixos/default.nix +++ b/stylix/nixos/default.nix @@ -25,7 +25,7 @@ in "${inputs.self}/stylix/pixel.nix" "${inputs.self}/stylix/target.nix" "${inputs.self}/stylix/release.nix" - (import "${inputs.self}/stylix/overlays.nix" inputs) + (lib.modules.importApply "${inputs.self}/stylix/overlays.nix" inputs) ] ++ autoload; config.warnings = lib.mkIf