nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename home-manager argument to home-manager-path

Browse source
This commit is contained in:
Zhaofeng Li 2021-12-08 15:22:43 -08:00 • committed by Alexander Sosedkin
parent 0b83ab6bf1
commit 74ff681bc9
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
flake.nix
View file

@ -16,9 +16,10 @@
inherit system; inherit system;
overlays = [ self.overlay ]; overlays = [ self.overlay ];
}; };
defaultHm = home-manager.outPath;
in rec { in rec {
lib.nix-on-droid = { pkgs ? defaultPkgs, config }: import ./modules { lib.nix-on-droid = { pkgs ? defaultPkgs, home-manager-path ? defaultHm, config }: import ./modules {
inherit pkgs home-manager config; inherit pkgs home-manager-path config;
isFlake = true; isFlake = true;
}; };

8
modules/default.nix
View file

@ -1,16 +1,12 @@
# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE.
{ pkgs ? import <nixpkgs> { }, home-manager ? <home-manager>, config ? null, isFlake ? false }: { pkgs ? import <nixpkgs> { }, home-manager-path ? <home-manager>, config ? null, isFlake ? false }:
with pkgs.lib; with pkgs.lib;
let let
defaultConfigFile = "${builtins.getEnv "HOME"}/.config/nixpkgs/nix-on-droid.nix"; defaultConfigFile = "${builtins.getEnv "HOME"}/.config/nixpkgs/nix-on-droid.nix";
hmPath = if home-manager ? install then
pkgs.lib.warn "Passing an initialized home-manager is useless - The overridden pkgs will not be used" home-manager.path
else home-manager;
configModule = configModule =
if config != null then config if config != null then config
else if builtins.pathExists defaultConfigFile then defaultConfigFile else if builtins.pathExists defaultConfigFile then defaultConfigFile
@ -20,7 +16,7 @@ let
rawModule = evalModules { rawModule = evalModules {
modules = [ modules = [
{ {
_module.args.home-manager = hmPath; _module.args.home-manager-path = home-manager-path;
_module.args.pkgs = mkDefault pkgs; _module.args.pkgs = mkDefault pkgs;
_module.args.isFlake = isFlake; _module.args.isFlake = isFlake;
} }

6
modules/home-manager.nix
View file

@ -1,19 +1,19 @@
# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE.
{ config, lib, pkgs, home-manager, ... }: { config, lib, pkgs, home-manager-path, ... }:
with lib; with lib;
let let
cfg = config.home-manager; cfg = config.home-manager;
extendedLib = import (home-manager + "/modules/lib/stdlib-extended.nix") pkgs.lib; extendedLib = import (home-manager-path + "/modules/lib/stdlib-extended.nix") pkgs.lib;
hmModule = types.submoduleWith { hmModule = types.submoduleWith {
specialArgs = { lib = extendedLib; }; specialArgs = { lib = extendedLib; };
modules = [ modules = [
({ name, ... }: { ({ name, ... }: {
imports = import (home-manager + "/modules/modules.nix") { imports = import (home-manager-path + "/modules/modules.nix") {
inherit pkgs; inherit pkgs;
lib = extendedLib; lib = extendedLib;
useNixpkgsModule = !cfg.useGlobalPkgs; useNixpkgsModule = !cfg.useGlobalPkgs;