Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

home-manager: allow a user-defined third module path

Browse source 
The user-defined path will be used if present, otherwise the two
"fallback" defaults (in `.nixpkgs` and `.config/nixpkgs`) will be
used.
This commit is contained in:
Robert Helgesson 2017-07-11 19:50:29 +02:00
parent 98c7b23178
commit 28d3f74614
No known key found for this signature in database
GPG key ID: C3DB11069E65DC86
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
home-manager/default.nix
View file

@ -1,4 +1,10 @@
{ pkgs, modulesPath ? "$HOME/.config/nixpkgs/home-manager/modules" }: { pkgs
# Extra path to the Home Manager modules. If set then this path will
# be tried before `$HOME/.config/nixpkgs/home-manager/modules` and
# `$HOME/.nixpkgs/home-manager/modules`.
, modulesPath ? null
}:
let let
@ -16,6 +22,8 @@ let
} }
''; '';
modulesPathStr = if modulesPath == null then "" else modulesPath;
in in
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
@ -29,7 +37,7 @@ pkgs.stdenv.mkDerivation {
substituteInPlace $out/bin/home-manager \ substituteInPlace $out/bin/home-manager \
--subst-var-by bash "${pkgs.bash}" \ --subst-var-by bash "${pkgs.bash}" \
--subst-var-by coreutils "${pkgs.coreutils}" \ --subst-var-by coreutils "${pkgs.coreutils}" \
--subst-var-by MODULES_PATH '${modulesPath}' \ --subst-var-by MODULES_PATH '${modulesPathStr}' \
--subst-var-by HOME_MANAGER_EXPR_PATH "${homeManagerExpr}" --subst-var-by HOME_MANAGER_EXPR_PATH "${homeManagerExpr}"
''; '';

1
home-manager/home-manager
View file

@ -39,6 +39,7 @@ function setConfigFile() {
function setHomeManagerModulesPath() { function setHomeManagerModulesPath() {
local modulesPath local modulesPath
for modulesPath in "@MODULES_PATH@" \ for modulesPath in "@MODULES_PATH@" \
"$HOME/.config/nixpkgs/home-manager/modules" \
"$HOME/.nixpkgs/home-manager/modules" ; do "$HOME/.nixpkgs/home-manager/modules" ; do
if [[ -e "$modulesPath" ]] ; then if [[ -e "$modulesPath" ]] ; then
export NIX_PATH="$NIX_PATH${NIX_PATH:+:}home-manager=$modulesPath" export NIX_PATH="$NIX_PATH${NIX_PATH:+:}home-manager=$modulesPath"