From e6a04e5c3a34f2446e7f0da16ac2b22df7e97ff1 Mon Sep 17 00:00:00 2001 From: emily Date: Thu, 20 Jun 2024 14:18:21 +0200 Subject: [PATCH] Update repository url to woof.rip --- README.md | 4 ++-- flake.lock | 12 ++++++------ flake.nix | 2 +- modules/update-nixfiles/default.nix | 4 ++-- pkgs/update-nixfiles/update-nixfiles.sh | 5 +++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 45957f2..e3b4d83 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,11 @@ $ nix run github:nix-community/nixos-anywhere -- --flake ".#" roo ### desktops ```console -$ nix --extra-experimental-features nix-command run github:nix-community/nixos-anywhere -- --flake "git+https://git.bsd.gay/snaki/nixfiles.git#" --no-reboot --build-on-target root@127.0.0.1 +$ nix --extra-experimental-features nix-command run github:nix-community/nixos-anywhere -- --flake "git+https://woof.rip/emily/nixfiles.git#" --no-reboot --build-on-target root@127.0.0.1 $ nixos-enter $ passwd reboot -$ git clone https://git.bsd.gay/snaki/nixfiles.git +$ git clone https://woof.rip/emily/nixfiles.git $ colmena apply-local --sudo --node ``` diff --git a/flake.lock b/flake.lock index dd32ee3..4186c30 100644 --- a/flake.lock +++ b/flake.lock @@ -495,17 +495,17 @@ ] }, "locked": { - "lastModified": 1715595647, - "narHash": "sha256-AaOkMFg3gBmFRJw1u4543HDI2mm4GoSq7+IDRJ7IRhA=", + "lastModified": 1718808754, + "narHash": "sha256-dKrzbEUuAyF7IMysWXuHZ0slP6eqf/9BfN1W1y6qWbQ=", "ref": "refs/heads/main", - "rev": "49227bab05e6c23a8d79156bd28c8f9a65879486", - "revCount": 19, + "rev": "26e75b430bf10136da4855a6d5bf6ca98181eac2", + "revCount": 20, "type": "git", - "url": "https://git.bsd.gay/snaki/kyouma-net.git" + "url": "https://woof.rip/emily/kyouma-net.git" }, "original": { "type": "git", - "url": "https://git.bsd.gay/snaki/kyouma-net.git" + "url": "https://woof.rip/emily/kyouma-net.git" } }, "nix-darwin": { diff --git a/flake.nix b/flake.nix index 1972027..3d250a6 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; kyouma-www = { - url = "git+https://git.bsd.gay/snaki/kyouma-net.git"; + url = "git+https://woof.rip/emily/kyouma-net.git"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; diff --git a/modules/update-nixfiles/default.nix b/modules/update-nixfiles/default.nix index 2638d7d..aca356f 100644 --- a/modules/update-nixfiles/default.nix +++ b/modules/update-nixfiles/default.nix @@ -44,13 +44,13 @@ in { programs.ssh = { enable = true; addKeysToAgent = "yes"; - matchBlocks."git.bsd.gay".identityFile = cfg.privateKey; + matchBlocks."woof.rip".identityFile = cfg.privateKey; }; services.ssh-agent.enable = true; }; nix.settings.accept-flake-config = true; programs.ssh = { - knownHosts."git.bsd.gay".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHd48YPVXBWVdQwVAF16Ihs7FNTPmD1kMUnOfQttc1bA"; + knownHosts."woof.rip".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPeiU8hbOhTuF0Ku8XNIYno3rtxL1CR5gHmZJo4WbLZZ"; }; systemd.services.update-nixfiles = { requires = [ "network-online.target" ]; diff --git a/pkgs/update-nixfiles/update-nixfiles.sh b/pkgs/update-nixfiles/update-nixfiles.sh index 785a886..baeeec6 100644 --- a/pkgs/update-nixfiles/update-nixfiles.sh +++ b/pkgs/update-nixfiles/update-nixfiles.sh @@ -62,7 +62,7 @@ SSH_AUTH_SOCK="${ROOT}/ssh-agent" export SSH_AUTH_SOCK ssh-add "/run/secrets/services/update-nixfiles/privateKey" -git clone git@git.bsd.gay:snaki/nixfiles.git "${ROOT}/nixfiles" +git clone forgejo@woof.rip:emily/nixfiles.git "${ROOT}/nixfiles" gitin fetch --all gitin checkout origin/main @@ -86,7 +86,8 @@ merge_theirs gitin push origin update-inputs echo "Waiting for hydra to get new commit" -wait_for_hydra +export -f wait_for_hydra +timeout 4h bash -c wait_for_hydra echo "Testing if all build jobs completed successfully" test_build