talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
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
1 changed files with 57 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
nix/configuration/roles/git/default.nix
View File

@ -23,8 +23,7 @@
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, ... }:
{ {
@ -32,7 +31,55 @@
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 [
]
}
'';
};
})
];
})
]; ];
} }