Update repository url to woof.rip
This commit is contained in:
parent
da539e687b
commit
e6a04e5c3a
5 changed files with 14 additions and 13 deletions
|
@ -13,11 +13,11 @@ $ nix run github:nix-community/nixos-anywhere -- --flake ".#<configuration>" roo
|
||||||
### desktops
|
### desktops
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix --extra-experimental-features nix-command run github:nix-community/nixos-anywhere -- --flake "git+https://git.bsd.gay/snaki/nixfiles.git#<configuration>" --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#<configuration>" --no-reboot --build-on-target root@127.0.0.1
|
||||||
$ nixos-enter
|
$ nixos-enter
|
||||||
$ passwd <local-user>
|
$ passwd <local-user>
|
||||||
reboot
|
reboot
|
||||||
$ git clone https://git.bsd.gay/snaki/nixfiles.git
|
$ git clone https://woof.rip/emily/nixfiles.git
|
||||||
$ colmena apply-local --sudo --node <node>
|
$ colmena apply-local --sudo --node <node>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
12
flake.lock
12
flake.lock
|
@ -495,17 +495,17 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715595647,
|
"lastModified": 1718808754,
|
||||||
"narHash": "sha256-AaOkMFg3gBmFRJw1u4543HDI2mm4GoSq7+IDRJ7IRhA=",
|
"narHash": "sha256-dKrzbEUuAyF7IMysWXuHZ0slP6eqf/9BfN1W1y6qWbQ=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "49227bab05e6c23a8d79156bd28c8f9a65879486",
|
"rev": "26e75b430bf10136da4855a6d5bf6ca98181eac2",
|
||||||
"revCount": 19,
|
"revCount": 20,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.bsd.gay/snaki/kyouma-net.git"
|
"url": "https://woof.rip/emily/kyouma-net.git"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.bsd.gay/snaki/kyouma-net.git"
|
"url": "https://woof.rip/emily/kyouma-net.git"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix-darwin": {
|
"nix-darwin": {
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
kyouma-www = {
|
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.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.flake-utils.follows = "flake-utils";
|
inputs.flake-utils.follows = "flake-utils";
|
||||||
};
|
};
|
||||||
|
|
|
@ -44,13 +44,13 @@ in {
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
addKeysToAgent = "yes";
|
addKeysToAgent = "yes";
|
||||||
matchBlocks."git.bsd.gay".identityFile = cfg.privateKey;
|
matchBlocks."woof.rip".identityFile = cfg.privateKey;
|
||||||
};
|
};
|
||||||
services.ssh-agent.enable = true;
|
services.ssh-agent.enable = true;
|
||||||
};
|
};
|
||||||
nix.settings.accept-flake-config = true;
|
nix.settings.accept-flake-config = true;
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
knownHosts."git.bsd.gay".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHd48YPVXBWVdQwVAF16Ihs7FNTPmD1kMUnOfQttc1bA";
|
knownHosts."woof.rip".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPeiU8hbOhTuF0Ku8XNIYno3rtxL1CR5gHmZJo4WbLZZ";
|
||||||
};
|
};
|
||||||
systemd.services.update-nixfiles = {
|
systemd.services.update-nixfiles = {
|
||||||
requires = [ "network-online.target" ];
|
requires = [ "network-online.target" ];
|
||||||
|
|
|
@ -62,7 +62,7 @@ SSH_AUTH_SOCK="${ROOT}/ssh-agent"
|
||||||
export SSH_AUTH_SOCK
|
export SSH_AUTH_SOCK
|
||||||
ssh-add "/run/secrets/services/update-nixfiles/privateKey"
|
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 fetch --all
|
||||||
gitin checkout origin/main
|
gitin checkout origin/main
|
||||||
|
|
||||||
|
@ -86,7 +86,8 @@ merge_theirs
|
||||||
gitin push origin update-inputs
|
gitin push origin update-inputs
|
||||||
|
|
||||||
echo "Waiting for hydra to get new commit"
|
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"
|
echo "Testing if all build jobs completed successfully"
|
||||||
test_build
|
test_build
|
||||||
|
|
Loading…
Reference in a new issue