|
|
@ -141,15 +141,18 @@ in
|
|
|
|
git = {
|
|
|
|
git = {
|
|
|
|
enable = true;
|
|
|
|
enable = true;
|
|
|
|
extraConfig =
|
|
|
|
extraConfig =
|
|
|
|
|
|
|
|
let
|
|
|
|
|
|
|
|
inherit (config.programs) vscode;
|
|
|
|
|
|
|
|
in
|
|
|
|
{
|
|
|
|
{
|
|
|
|
diff = {
|
|
|
|
diff = {
|
|
|
|
tool = "vscode";
|
|
|
|
tool = lib.mkIf vscode.enable "vscode";
|
|
|
|
};
|
|
|
|
};
|
|
|
|
difftool = {
|
|
|
|
difftool = {
|
|
|
|
prompt = false;
|
|
|
|
prompt = false;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
"difftool \"vscode\"" = {
|
|
|
|
"difftool \"vscode\"" = lib.mkIf vscode.enable {
|
|
|
|
cmd = "${lib.getExe config.programs.vscode.package} --wait --diff $LOCAL $REMOTE";
|
|
|
|
cmd = "${lib.getExe vscode.package} --wait --diff $LOCAL $REMOTE";
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
userName = "Felix Stupp";
|
|
|
|
userName = "Felix Stupp";
|
|
|
|