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

Revert "config: add check if home-manager" 

This reverts commit 1b6e1b5d58.
This commit is contained in:
Mateusz Słodkowicz 2024-02-25 22:21:11 +01:00
parent 1b6e1b5d58
commit 64e8520dbd
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
3 changed files with 3 additions and 7 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
materusFlake.nixosConfigurations.${host}.materusCfg.hm.lib.homeManagerConfiguration {
pkgs = materusFlake.nixosConfigurations.${host}.pkgs;
extraSpecialArgs = { materusCfg = materusFlake.nixosConfigurations.${host}.materusCfg // {isHm = true;}; };
extraSpecialArgs = { materusCfg = materusFlake.nixosConfigurations.${host}.materusCfg; };
modules = [
./${username}
../host/${host}/extraHome.nix
@ -37,7 +37,6 @@ 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; }; };

5
configurations/host/default.nix
View File

@ -7,7 +7,7 @@ let
let
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;
materusCfg = rec {
materusCfg = {
inherit stable;
inherit materusFlake;
inherit host;
@ -15,10 +15,9 @@ 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 = configInputs.inputs.nixpkgs.lib.mkDefault false;
};
in
(nixosSystem {
(nixosSystem rec {
specialArgs = { inherit materusCfg; };
system = arch;
modules = [

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

@ -89,8 +89,6 @@ 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;
};