From 626c8806b52e22fd305ec6dc314cf1f8b2bc017a Mon Sep 17 00:00:00 2001 From: pengo Date: Mon, 8 Jun 2026 18:52:58 -0600 Subject: [PATCH] nix: use importApply instead of importing modules directly --- default.nix | 2 +- flake.nix | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 95fb09cb..121b36c3 100644 --- a/default.nix +++ b/default.nix @@ -21,6 +21,6 @@ in inherit package; - nixosModule = importApply ./nix/nix-module.nix package; + nixosModule = importApply ./nix/nixos-module.nix package; hmModule = importApply ./nix/hm-module.nix package; } diff --git a/flake.nix b/flake.nix index 945fe0e3..3bce1e87 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ scenefx, }: let inherit (nixpkgs.lib) genAttrs; + inherit (nixpkgs.lib.modules) importApply; # Systems mangowm supports. Options that call `forEachSystem` will generate an attribute for each of these options. systems = [ @@ -62,12 +63,12 @@ nixosModules.mango = {pkgs, ...}: { imports = [ - (import ./nix/nixos-module.nix self.packages.${pkgs.stdenv.hostPlatform.system}.default) + (importApply ./nix/nixos-module.nix self.packages.${pkgs.stdenv.hostPlatform.system}.default) ]; }; hmModules.mango = {pkgs, ...}: { imports = [ - (import ./nix/hm-module.nix self.packages.${pkgs.stdenv.hostPlatform.system}.default) + (importApply ./nix/hm-module.nix self.packages.${pkgs.stdenv.hostPlatform.system}.default) ]; };