From 0c75e1ea0b0d479f7eb4b0548fc409aa5a7e9c00 Mon Sep 17 00:00:00 2001 From: Frantisek Bohacek Date: Sun, 2 Jun 2024 20:23:13 +0200 Subject: [PATCH] feat: add all inputs to registry --- home/default.nix | 9 ++++----- nixos/hosts/configuration.nix | 8 +++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/home/default.nix b/home/default.nix index 0fdb7ec..c2ff8a4 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,4 +1,4 @@ -{ config, inputs, pkgs, ... }: +{ config, lib, inputs, pkgs, ... }: let electronWaylandFlags = [ @@ -31,10 +31,9 @@ in { ./laptop.nix ]; - nix = { - registry.nixpkgs.flake = inputs.nixpkgs; - registry.nixpkgs-stable.flake = inputs.nixpkgs-stable; - }; + nix.registry = lib.mapAttrs (n: input: { + flake = input; + }) inputs; home.sessionVariables = { NIX_PATH = "nixpkgs=flake:nixpkgs$\{NIX_PATH:+:$NIX_PATH}"; diff --git a/nixos/hosts/configuration.nix b/nixos/hosts/configuration.nix index 0659dbe..83ecdb4 100644 --- a/nixos/hosts/configuration.nix +++ b/nixos/hosts/configuration.nix @@ -1,4 +1,4 @@ -{ stable, pkgs, inputs, config, ... }: +{ lib, stable, pkgs, inputs, config, ... }: { imports = [ @@ -140,8 +140,10 @@ }; nix = { # Nix Package Manager settings - registry.nixpkgs.flake = inputs.nixpkgs; - registry.nixpkgs-stable.flake = inputs.nixpkgs-stable; + registry = lib.mapAttrs (n: input: { + flake = input; + }) inputs; + nixPath = [ "nixpkgs=flake:nixpkgs" "nixpkgs-stable=flake:nixpkgs-stable" -- 2.48.1