lilly/LillyOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auto-commit: 2026-01-05 05:45:11

Browse Source
This commit is contained in:
Lilly
2026-01-05 05:45:11 +00:00
parent e48e85efca
commit bafc844394
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
home/terminal/git.nix
View File

@@ -17,6 +17,9 @@
log.date = "iso"; # ISO 8601 date format
# Conflict resolution style for readable diffs
merge.conflictStyle = "diff3";
safe = {
directory = [ "/home/LillyOS" ];
};
};
};
}

6
hosts/lillypc/gitwatch.nix
View File

@@ -20,16 +20,16 @@
"EXCLUDE_PATTERN" = "";
"GIT_BRANCH" = "main";
"GIT_REMOTE" = "origin";
"GIT_WATCH_DIR" = "/app/LillyOS";
"GIT_WATCH_DIR" = "/home/LillyOS";
"PULL_BEFORE_PUSH" = "true";
"SKIP_IF_MERGING" = "false";
"SLEEP_TIME" = "10";
"VERBOSE" = "false";
};
volumes = [
"${/home/lilly/.config/git/config}:/root/.gitconfig:ro"
"/home/lilly/.config/git/config:/root/.gitconfig:ro"
"/home/lilly/.ssh/id_ed25519:/root/.ssh/id_ed25519:ro"
"/home/lilly/LillyOS:/app/LillyOS:rw"
"/home/lilly/LillyOS:/home/LillyOS:rw"
];
log-driver = "journald";
extraOptions = [