From d13428b28bae3594421021ec7867dcd0ea777903 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 21 Jun 2024 20:57:01 +0800 Subject: [PATCH] flake-parts/setups: update shared Nix configuration --- modules/flake-parts/setups/shared/nix-conf.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/modules/flake-parts/setups/shared/nix-conf.nix b/modules/flake-parts/setups/shared/nix-conf.nix index 208804bc..1ddbaef4 100644 --- a/modules/flake-parts/setups/shared/nix-conf.nix +++ b/modules/flake-parts/setups/shared/nix-conf.nix @@ -7,6 +7,9 @@ let nixpkgs = inputs.${config.nixpkgs.branch}; home-manager = inputs.${config.homeManagerBranch}; }; + + flakeInputName = name: + if name == "self" then "config" else name; in { config.modules = [( @@ -17,19 +20,12 @@ in nix.registry = lib.mapAttrs' (name: flake: - let - name' = if (name == "self") then "config" else name; - in - lib.nameValuePair name' { inherit flake; }) + lib.nameValuePair (flakeInputName name) { inherit flake; }) inputs'; nix.settings.nix-path = (lib.mapAttrsToList - (name: source: - let - name' = if (name == "self") then "config" else name; - in - "${name'}=${source}") + (name: source: "${flakeInputName name}=${source}") inputs' ++ [ "/nix/var/nix/profiles/per-user/root/channels"