Kieran's opinionated (and probably slightly dumb) nix config

bug: fix git fetch failing being fatal

dunkirk.sh ed83c816 2f66f68e

verified
+3 -3
+1 -1
machines/terebithia/default.nix
··· 481 enable = true; 482 domain = "control.dunkirk.sh"; 483 deploy.repository = "https://tangled.org/dunkirk.sh/control"; 484 - deploy.autoUpdate = true; 485 secretsFile = config.age.secrets.control.path; 486 487 flags."map.dunkirk.sh" = {
··· 481 enable = true; 482 domain = "control.dunkirk.sh"; 483 deploy.repository = "https://tangled.org/dunkirk.sh/control"; 484 + deploy.autoUpdate = false; 485 secretsFile = config.age.secrets.control.path; 486 487 flags."map.dunkirk.sh" = {
+2 -2
modules/lib/mkService.nix
··· 234 235 cd ${cfg.dataDir}/app 236 '' + lib.optionalString (cfg.deploy.enable && cfg.deploy.autoUpdate) '' 237 - ${pkgs.git}/bin/git fetch origin 238 - ${pkgs.git}/bin/git reset --hard origin/${cfg.deploy.branch} 239 '' + lib.optionalString (runtime == "bun") '' 240 241 if [ -f package.json ]; then
··· 234 235 cd ${cfg.dataDir}/app 236 '' + lib.optionalString (cfg.deploy.enable && cfg.deploy.autoUpdate) '' 237 + ${pkgs.git}/bin/git fetch origin || true 238 + ${pkgs.git}/bin/git reset --hard origin/${cfg.deploy.branch} || true 239 '' + lib.optionalString (runtime == "bun") '' 240 241 if [ -f package.json ]; then