hm: fix bugs when overriding things

This commit is contained in:
Motiejus Jakštys 2023-10-08 16:40:16 +03:00
parent 0f185c7d11
commit 531d8dde37
1 changed files with 15 additions and 12 deletions

View File

@ -61,11 +61,13 @@ in {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.users.motiejus = {pkgs, ...}: home-manager.users.motiejus = {pkgs, ...}:
import ../../../shared/home/default.nix { lib.mkMerge [
(import ../../../shared/home/default.nix {
inherit pkgs; inherit pkgs;
inherit (config.mj) stateVersion; inherit (config.mj) stateVersion;
email = "motiejus@jakstys.lt"; email = "motiejus@jakstys.lt";
})
{
programs.bash = { programs.bash = {
enable = true; enable = true;
shellAliases = { shellAliases = {
@ -73,6 +75,7 @@ in {
"gp" = "${pkgs.git}/bin/git remote | ${pkgs.parallel}/bin/parallel --verbose git push"; "gp" = "${pkgs.git}/bin/git remote | ${pkgs.parallel}/bin/parallel --verbose git push";
}; };
}; };
}; }
];
}; };
} }