hm: fix bugs when overriding things
This commit is contained in:
parent
0f185c7d11
commit
531d8dde37
|
@ -61,18 +61,21 @@ in {
|
|||
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.users.motiejus = {pkgs, ...}:
|
||||
import ../../../shared/home/default.nix {
|
||||
inherit pkgs;
|
||||
inherit (config.mj) stateVersion;
|
||||
email = "motiejus@jakstys.lt";
|
||||
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
shellAliases = {
|
||||
"l" = "echo -n ł | xclip -selection clipboard";
|
||||
"gp" = "${pkgs.git}/bin/git remote | ${pkgs.parallel}/bin/parallel --verbose git push";
|
||||
lib.mkMerge [
|
||||
(import ../../../shared/home/default.nix {
|
||||
inherit pkgs;
|
||||
inherit (config.mj) stateVersion;
|
||||
email = "motiejus@jakstys.lt";
|
||||
})
|
||||
{
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
shellAliases = {
|
||||
"l" = "echo -n ł | xclip -selection clipboard";
|
||||
"gp" = "${pkgs.git}/bin/git remote | ${pkgs.parallel}/bin/parallel --verbose git push";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue