From 88bdef39610dbefdb33f53adcdc78287e0b0ee08 Mon Sep 17 00:00:00 2001 From: materus Date: Sun, 25 Feb 2024 22:30:13 +0100 Subject: [PATCH] config: add check if home-manager --- configurations/home/genHomes.nix | 3 ++- configurations/host/default.nix | 3 ++- configurations/profile/home/shell/zsh.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configurations/home/genHomes.nix b/configurations/home/genHomes.nix index d9aea6a..841b894 100644 --- a/configurations/home/genHomes.nix +++ b/configurations/home/genHomes.nix @@ -14,7 +14,7 @@ let value = let host = builtins.elemAt hosts i; in materusFlake.nixosConfigurations.${host}.materusCfg.hm.lib.homeManagerConfiguration { pkgs = materusFlake.nixosConfigurations.${host}.pkgs; - extraSpecialArgs = { materusCfg = materusFlake.nixosConfigurations.${host}.materusCfg; }; + extraSpecialArgs = { materusCfg = materusFlake.nixosConfigurations.${host}.materusCfg // {isHm = true;}; }; modules = [ ./${username} ../host/${host}/extraHome.nix @@ -37,6 +37,7 @@ let nixerus = inputs.configInputs.inputs.nixerus; configInputs = inputs.configInputs; path = materusFlake.selfPath; + isHm = true; }; in inputs.configInputs.inputs.home-manager.lib.homeManagerConfiguration { pkgs = import inputs.nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; }; }; diff --git a/configurations/host/default.nix b/configurations/host/default.nix index 7dfab37..942f448 100644 --- a/configurations/host/default.nix +++ b/configurations/host/default.nix @@ -15,9 +15,10 @@ let nixerus = if stable then inputs.configInputs-stable.inputs.nixerus else inputs.configInputs.inputs.nixerus; configInputs = if stable then inputs.configInputs-stable else inputs.configInputs; path = materusFlake.selfPath; + isHm = false; }; in - (nixosSystem rec { + (nixosSystem { specialArgs = { inherit materusCfg; }; system = arch; modules = [ diff --git a/configurations/profile/home/shell/zsh.nix b/configurations/profile/home/shell/zsh.nix index de3f113..9c7df7a 100644 --- a/configurations/profile/home/shell/zsh.nix +++ b/configurations/profile/home/shell/zsh.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, materusArg, options, ... }: +{ config, pkgs, lib, materusArg, ... }: let p10kcfg = "${zshcfg}/p10kcfg"; zshcfg = "${materusArg.cfg.path}" + "/extraFiles/config/zsh";