dev/nixfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

home-manager/common: Use nixpkgs flake for pkgs in Nix registry

Browse Source
This commit is contained in:
Jack O'Sullivan 2022-07-21 11:47:27 +01:00
parent 1534f0a132
commit cf053a3f32
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
home-manager/default.nix
View File

@ -1,4 +1,4 @@
{ lib, hmFlakes, inputs, pkgs', config, ... }: { lib, hmFlakes, pkgsFlakes, inputs, pkgs', config, ... }:
let let
inherit (builtins) head tail mapAttrs attrValues; inherit (builtins) head tail mapAttrs attrValues;
inherit (lib) flatten optional optionalAttrs mkOption mkDefault mkOptionType mkIf; inherit (lib) flatten optional optionalAttrs mkOption mkDefault mkOptionType mkIf;
@ -24,7 +24,7 @@ let
# config merging behaviour (or lack thereof; similar to NixOS module), we explicitly pass empty config. # config merging behaviour (or lack thereof; similar to NixOS module), we explicitly pass empty config.
# TODO: Check if this is fixed in future. # TODO: Check if this is fixed in future.
pkgs = pkgs'.${config'.nixpkgs}.${config'.system} // { config = { }; }; pkgs = pkgs'.${config'.nixpkgs}.${config'.system} // { config = { }; };
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = { inherit inputs pkgsFlakes; pkgsFlake = pkgsFlakes.${config'.nixpkgs}; };
"${modArg}" = (attrValues cfg.modules) ++ [ "${modArg}" = (attrValues cfg.modules) ++ [
{ {
warnings = flatten [ warnings = flatten [

4
home-manager/modules/common.nix
View File

@ -1,4 +1,4 @@
{ lib, pkgs, pkgs', inputs, config, ... }@args: { lib, pkgsFlake, pkgs, pkgs', inputs, config, ... }@args:
let let
inherit (builtins) listToAttrs mapAttrs readFile; inherit (builtins) listToAttrs mapAttrs readFile;
inherit (lib) inherit (lib)
@ -223,7 +223,7 @@ in
pkgs = { pkgs = {
to = { to = {
type = "path"; type = "path";
path = "${pkgs.path}"; path = "${pkgsFlake}";
}; };
exact = true; exact = true;
}; };

2
nixos/default.nix
View File

@ -31,7 +31,7 @@ let
lib = pkgs.lib; lib = pkgs.lib;
# Put the inputs in specialArgs to avoid infinite recursion when modules try to do imports # Put the inputs in specialArgs to avoid infinite recursion when modules try to do imports
specialArgs = { inherit inputs allAssignments; inherit (cfg) systems; }; specialArgs = { inherit inputs pkgsFlakes pkgsFlake allAssignments; inherit (cfg) systems; };
# `baseModules` informs the manual which modules to document # `baseModules` informs the manual which modules to document
baseModules = baseModules =