mirror of
https://github.com/DreamMaoMao/maomaowm.git
synced 2026-06-19 14:33:16 -04:00
nix: use importApply instead of importing modules directly
This commit is contained in:
parent
d463b4e168
commit
626c8806b5
2 changed files with 4 additions and 3 deletions
|
|
@ -21,6 +21,6 @@ in
|
||||||
|
|
||||||
inherit package;
|
inherit package;
|
||||||
|
|
||||||
nixosModule = importApply ./nix/nix-module.nix package;
|
nixosModule = importApply ./nix/nixos-module.nix package;
|
||||||
hmModule = importApply ./nix/hm-module.nix package;
|
hmModule = importApply ./nix/hm-module.nix package;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@
|
||||||
scenefx,
|
scenefx,
|
||||||
}: let
|
}: let
|
||||||
inherit (nixpkgs.lib) genAttrs;
|
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 mangowm supports. Options that call `forEachSystem` will generate an attribute for each of these options.
|
||||||
systems = [
|
systems = [
|
||||||
|
|
@ -62,12 +63,12 @@
|
||||||
|
|
||||||
nixosModules.mango = {pkgs, ...}: {
|
nixosModules.mango = {pkgs, ...}: {
|
||||||
imports = [
|
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, ...}: {
|
hmModules.mango = {pkgs, ...}: {
|
||||||
imports = [
|
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)
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue