diff --git a/home/terminal/git.nix b/home/terminal/git.nix index dc1e3d9..92e52a7 100644 --- a/home/terminal/git.nix +++ b/home/terminal/git.nix @@ -17,6 +17,9 @@ log.date = "iso"; # ISO 8601 date format # Conflict resolution style for readable diffs merge.conflictStyle = "diff3"; + safe = { + directory = [ "/home/LillyOS" ]; + }; }; }; } \ No newline at end of file diff --git a/hosts/lillypc/default.nix b/hosts/lillypc/default.nix index 09a4da8..d9a23bb 100644 --- a/hosts/lillypc/default.nix +++ b/hosts/lillypc/default.nix @@ -16,4 +16,4 @@ let in { imports = module_files; -} \ No newline at end of file +} diff --git a/hosts/lillypc/gitwatch.nix b/hosts/lillypc/gitwatch.nix index 7ad9035..fe37bc0 100644 --- a/hosts/lillypc/gitwatch.nix +++ b/hosts/lillypc/gitwatch.nix @@ -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 = [