holm/flakelight
1
1
Fork 0
forked from extern/flakelight
Code Pull Requests Activity

Remove re-application check in propagationModule

Browse Source 
Home-manager does not actually use it's pkgs argument for packages, so
the overlays will not be applied twice.
This commit is contained in:
Archit Gupta 2024-01-14 00:34:35 -08:00
parent 1b51df0be3
commit cf3a2e5496
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builtinModules/propagationModule.nix
View File

@ -7,7 +7,7 @@
{ lib, config, flakelight, moduleArgs, inputs, outputs, ... }:
let
inherit (lib) composeManyExtensions mapAttrs mkOption optionalAttrs;
inherit (lib) mapAttrs mkOption optionalAttrs;
inherit (flakelight.types) module;
in
{
@ -21,16 +21,8 @@ in
{
config = (optionalAttrs (options ? nixpkgs.overlays) {
# Apply flakelight overlays to NixOS/home-manager configurations
nixpkgs.overlays = lib.mkOrder 10 [
# Avoid re-applying overlays
# This can happen when home-manager's pkgs arg already has them
(final: prev: optionalAttrs (! prev ? flakelight) (
(composeManyExtensions
(config.withOverlays ++ [ config.packageOverlay ]))
final
prev
))
];
nixpkgs.overlays = lib.mkOrder 10
(config.withOverlays ++ [ config.packageOverlay ]);
})
// (optionalAttrs (options ? home-manager.sharedModules) {
# Propagate module to home-manager when using its nixos module