From 5e27e23c3df97726dd08d3446d390c5f3dee9081 Mon Sep 17 00:00:00 2001 From: Squibid Date: Thu, 4 Dec 2025 13:24:47 -0500 Subject: [PATCH] maybe modifying how the attrset merges in config will help --- flake.nix | 3 ++- lib.nix | 27 +++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index ab1b9e3..b793244 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,8 @@ in { lib = builtins.import ./lib.nix { pkgs = nixpkgs; }; nixosModules.fooud = { pkgs, lib, config, inputs, ... }: { - options.programs.fooud.enable = lib.mkEnableOption ("fooud") // { default = true; }; + options.programs.fooud.enable = lib.mkEnableOption ("fooud") + // { default = true; }; config = lib.mkIf config.programs.fooud.enable { environment.systemPackages = [ package ]; }; diff --git a/lib.nix b/lib.nix index 0773644..9f360bb 100644 --- a/lib.nix +++ b/lib.nix @@ -33,15 +33,34 @@ let }; }; in - dest; + { + config = config; + dest = dest; + }; in let gitUpdater = config: { git, keys, dest, check }: - defaultUpdater { git = git; keys = keys; dest = dest; check = check; config = config; }; + (defaultUpdater { + git = git; + keys = keys; + dest = dest; + check = check; + config = config; + }).dest; fsUpdater = config: { path, dest, check }: - defaultUpdater { path = path; dest = dest; check = check; config = config; }; + (defaultUpdater { + path = path; + dest = dest; + check = check; + config = config; + }).dest; urlUpdater = config: { url, dest, check }: - defaultUpdater { url = url; dest = dest; check = check; config = config; }; + (defaultUpdater { + url = url; + dest = dest; + check = check; + config = config; + }).dest; lib = { inherit