materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

config: add check if home-manager

This commit is contained in:
Mateusz Słodkowicz 2024-02-25 22:07:53 +01:00
parent c1f9da7b40
commit 1b6e1b5d58
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configurations/home/genHomes.nix
View File

@ -14,7 +14,7 @@ let
value = let host = builtins.elemAt hosts i; in value = let host = builtins.elemAt hosts i; in
materusFlake.nixosConfigurations.${host}.materusCfg.hm.lib.homeManagerConfiguration { materusFlake.nixosConfigurations.${host}.materusCfg.hm.lib.homeManagerConfiguration {
pkgs = materusFlake.nixosConfigurations.${host}.pkgs; pkgs = materusFlake.nixosConfigurations.${host}.pkgs;
extraSpecialArgs = { materusCfg = materusFlake.nixosConfigurations.${host}.materusCfg; }; extraSpecialArgs = { materusCfg = materusFlake.nixosConfigurations.${host}.materusCfg // {isHm = true;}; };
modules = [ modules = [
./${username} ./${username}
../host/${host}/extraHome.nix ../host/${host}/extraHome.nix
@ -37,6 +37,7 @@ let
nixerus = inputs.configInputs.inputs.nixerus; nixerus = inputs.configInputs.inputs.nixerus;
configInputs = inputs.configInputs; configInputs = inputs.configInputs;
path = materusFlake.selfPath; path = materusFlake.selfPath;
isHm = true;
}; in }; in
inputs.configInputs.inputs.home-manager.lib.homeManagerConfiguration { inputs.configInputs.inputs.home-manager.lib.homeManagerConfiguration {
pkgs = import inputs.nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; }; }; pkgs = import inputs.nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; }; };

5
configurations/host/default.nix
View File

@ -7,7 +7,7 @@ let
let let
nixosSystem = if stable then inputs.nixpkgs-stable.lib.nixosSystem else inputs.nixpkgs.lib.nixosSystem; nixosSystem = if stable then inputs.nixpkgs-stable.lib.nixosSystem else inputs.nixpkgs.lib.nixosSystem;
hm = if stable then inputs.configInputs-stable.inputs.home-manager else inputs.configInputs.inputs.home-manager; hm = if stable then inputs.configInputs-stable.inputs.home-manager else inputs.configInputs.inputs.home-manager;
materusCfg = { materusCfg = rec {
inherit stable; inherit stable;
inherit materusFlake; inherit materusFlake;
inherit host; inherit host;
@ -15,9 +15,10 @@ let
nixerus = if stable then inputs.configInputs-stable.inputs.nixerus else inputs.configInputs.inputs.nixerus; nixerus = if stable then inputs.configInputs-stable.inputs.nixerus else inputs.configInputs.inputs.nixerus;
configInputs = if stable then inputs.configInputs-stable else inputs.configInputs; configInputs = if stable then inputs.configInputs-stable else inputs.configInputs;
path = materusFlake.selfPath; path = materusFlake.selfPath;
isHm = configInputs.inputs.nixpkgs.lib.mkDefault false;
}; };
in in
(nixosSystem rec { (nixosSystem {
specialArgs = { inherit materusCfg; }; specialArgs = { inherit materusCfg; };
system = arch; system = arch;
modules = [ modules = [

2
configurations/profile/home/shell/zsh.nix
View File

@ -89,6 +89,8 @@ in
}; };
#home.file."${(lib.optionalString (config.programs.zsh.dotDir != null) (config.programs.zsh.dotDir + "/")) + ".zshrc"}".text = lib.mkAfter "#TEST";
programs.starship.enableZshIntegration = lib.mkForce false; programs.starship.enableZshIntegration = lib.mkForce false;
}; };