Install meld to git's path when doing a graphical install.

This commit is contained in:
Tom Alexander 2025-01-23 20:07:23 -05:00
parent b37f8a8e1a
commit 3be710b4ad
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE

View File

@ -23,16 +23,63 @@
git git
]; ];
} }
( (lib.mkIf (config.me.git.config != null) {
lib.mkIf config.me.git.config != null { home-manager.users.talexander =
home-manager.users.talexander = { pkgs, ... }:
{ pkgs, ... }: {
{ home.file.".gitconfig" = {
home.file.".gitconfig" = { source = config.me.git.config;
source = config.me.git.config;
};
}; };
} };
) })
(lib.mkIf (config.me.graphical) {
nixpkgs.overlays = [
(final: prev: {
git = pkgs.buildEnv {
name = prev.git.name;
paths = [
prev.git
];
extraOutputsToInstall = [
"man"
"doc"
"info"
];
buildInputs = [ final.makeWrapper ];
postBuild = ''
wrapProgram $out/bin/git --prefix PATH : ${
lib.makeBinPath [
final.meld
]
}
'';
};
})
];
})
(lib.mkIf (!config.me.graphical) {
nixpkgs.overlays = [
(final: prev: {
git = pkgs.buildEnv {
name = prev.git.name;
paths = [
prev.git
];
extraOutputsToInstall = [
"man"
"doc"
"info"
];
buildInputs = [ final.makeWrapper ];
postBuild = ''
wrapProgram $out/bin/git --prefix PATH : ${
lib.makeBinPath [
]
}
'';
};
})
];
})
]; ];
} }