Fix failing build
- Fix formatting on SSH keys
- Fix hash mismatch on gerrit oauth plugin (build breaks when it updates,
to fix this we should build it ourself)
Change-Id: I166ce26ea95184ba71c4d8a2b6ab260bcbe29301
Reviewed-on: https://git.clicks.codes/c/Infra/NixFiles/+/601
Reviewed-by: Samuel Shuert <coded@clicks.codes>
Tested-by: Skyler Grey <minion@clicks.codes>
diff --git a/flake.lock b/flake.lock
index ad0121f..40c87c6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -217,7 +217,7 @@
"gerrit-oauth": {
"flake": false,
"locked": {
- "narHash": "sha256-hkOMnVvI00SxrONIiD6hIy/Z4Ovi9R3Izs7ZZKiaXiE=",
+ "narHash": "sha256-khJkYXiSVUL2zNvWjYejwjLCz44nB0oBJNi8942hLj8=",
"type": "file",
"url": "https://gerrit-ci.gerritforge.com/job/plugin-oauth-bazel-master-master/lastBuild/artifact/bazel-bin/plugins/oauth/oauth.jar"
},
diff --git a/modules/common/users.nix b/modules/common/users.nix
index e326d18..7e6fa03 100644
--- a/modules/common/users.nix
+++ b/modules/common/users.nix
@@ -15,10 +15,8 @@
shell = pkgs.zsh;
openssh.authorizedKeys.keys = [
- "sk-ssh-ed25519@openssh.com
- AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAILrwKN4dJQ0BiLmjsA/66QHhu06+JyokWtHkLcjhWU79AAAABHNzaDo= coded@5CNFC"
- "sk-ssh-ed25519@openssh.com
- AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIOMSUqXuH1bQZJc9rLV0H7/UY0c2BlkzAKWkwrXFWbQ7AAAABHNzaDo= coded@5CNano"
+ "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAILrwKN4dJQ0BiLmjsA/66QHhu06+JyokWtHkLcjhWU79AAAABHNzaDo= coded@5CNFC"
+ "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIOMSUqXuH1bQZJc9rLV0H7/UY0c2BlkzAKWkwrXFWbQ7AAAABHNzaDo= coded@5CNano"
];
};
users.users.pineafan = {