diff --git a/configurations/home/genHomes.nix b/configurations/home/genHomes.nix index 841b894..d9aea6a 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 // {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; }; }; diff --git a/configurations/host/default.nix b/configurations/host/default.nix index 6c32b49..7dfab37 100644 --- a/configurations/host/default.nix +++ b/configurations/host/default.nix @@ -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 = [ diff --git a/configurations/profile/home/shell/zsh.nix b/configurations/profile/home/shell/zsh.nix index 4db67d7..de3f113 100644 --- a/configurations/profile/home/shell/zsh.nix +++ b/configurations/profile/home/shell/zsh.nix @@ -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; };