felix/nixos
1
0
Fork 0
mirror of https://github.com/Stunkymonkey/nixos.git synced 2025-07-05 09:19:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

treewide: migrate workman from thinkman
Some checks are pending
/ Build Nix targets (push) Waiting to run
Details

Browse source
This commit is contained in:
Felix Buehler 2025-06-01 20:18:42 +02:00
parent ba5e415474
commit 62d5687a0f
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
images/base-config.nix
View file

@ -79,6 +79,6 @@
systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ]; systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ];
users.extraUsers.root.openssh.authorizedKeys.keys = [ users.extraUsers.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFx6OLwL9MbkD3mnMsv+xrzZHN/rwCTgVs758SCLG0h felix@thinkman" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFx6OLwL9MbkD3mnMsv+xrzZHN/rwCTgVs758SCLG0h felix@workman"
]; ];
} }

2
machines/core/users.nix
View file

@ -23,7 +23,7 @@
]; ];
hashedPasswordFile = config.sops.secrets."users/felix/password".path; hashedPasswordFile = config.sops.secrets."users/felix/password".path;
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFx6OLwL9MbkD3mnMsv+xrzZHN/rwCTgVs758SCLG0h felix@thinkman" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFx6OLwL9MbkD3mnMsv+xrzZHN/rwCTgVs758SCLG0h felix@workman"
"no-touch-required sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIHhjrfqyOS+M9ATSTVr9JXPERBXOow/ZmkWICjbtbEgXAAAAFHNzaDpmZWxpeC1wZXJzb25hbC0x ssh:felix-personal-1" "no-touch-required sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIHhjrfqyOS+M9ATSTVr9JXPERBXOow/ZmkWICjbtbEgXAAAAFHNzaDpmZWxpeC1wZXJzb25hbC0x ssh:felix-personal-1"
"no-touch-required sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIMHExVOrEevQ+bwrrW3cXCO7Y/SyA+7wG+b6ZvAWY4MJAAAAFHNzaDpmZWxpeC1wZXJzb25hbC0y ssh:felix-personal-2" "no-touch-required sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIMHExVOrEevQ+bwrrW3cXCO7Y/SyA+7wG+b6ZvAWY4MJAAAAFHNzaDpmZWxpeC1wZXJzb25hbC0y ssh:felix-personal-2"
]; ];

10
machines/newton/syncthing.nix
View file

@ -23,7 +23,7 @@
urAccepted = 3; urAccepted = 3;
}; };
devices = { devices = {
"thinkman" = { "workman" = {
id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL"; id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL";
}; };
"birdman" = { "birdman" = {
@ -38,7 +38,7 @@
id = "djdxo-1akub"; id = "djdxo-1akub";
path = "/data/computer"; path = "/data/computer";
devices = [ devices = [
"thinkman" "workman"
"birdman" "birdman"
"serverle" "serverle"
]; ];
@ -47,7 +47,7 @@
id = "4hds7-gpypp"; id = "4hds7-gpypp";
path = "/data/phone"; path = "/data/phone";
devices = [ devices = [
"thinkman" "workman"
"birdman" "birdman"
"serverle" "serverle"
]; ];
@ -57,7 +57,7 @@
path = "/data/music"; path = "/data/music";
fsWatcherEnabled = false; fsWatcherEnabled = false;
devices = [ devices = [
"thinkman" "workman"
"birdman" "birdman"
"serverle" "serverle"
]; ];
@ -67,7 +67,7 @@
path = "/data/photos"; path = "/data/photos";
fsWatcherEnabled = false; fsWatcherEnabled = false;
devices = [ devices = [
"thinkman" "workman"
"serverle" "serverle"
]; ];
}; };

12
machines/serverle/syncthing.nix
View file

@ -23,7 +23,7 @@
urAccepted = 3; urAccepted = 3;
}; };
devices = { devices = {
"thinkman" = { "workman" = {
id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL"; id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL";
}; };
"birdman" = { "birdman" = {
@ -38,7 +38,7 @@
id = "djdxo-1akub"; id = "djdxo-1akub";
path = "/data/computer"; path = "/data/computer";
devices = [ devices = [
"thinkman" "workman"
"birdman" "birdman"
"newton" "newton"
]; ];
@ -47,7 +47,7 @@
id = "4hds7-gpypp"; id = "4hds7-gpypp";
path = "/data/phone"; path = "/data/phone";
devices = [ devices = [
"thinkman" "workman"
"birdman" "birdman"
"newton" "newton"
]; ];
@ -57,7 +57,7 @@
path = "/data/music"; path = "/data/music";
fsWatcherEnabled = false; fsWatcherEnabled = false;
devices = [ devices = [
"thinkman" "workman"
"birdman" "birdman"
"newton" "newton"
]; ];
@ -67,14 +67,14 @@
path = "/data/photos"; path = "/data/photos";
fsWatcherEnabled = false; fsWatcherEnabled = false;
devices = [ devices = [
"thinkman" "workman"
"newton" "newton"
]; ];
}; };
"Aria2" = { "Aria2" = {
id = "jjnzq-pgzua"; id = "jjnzq-pgzua";
path = "/data/tmp/aria2"; path = "/data/tmp/aria2";
devices = [ "thinkman" ]; devices = [ "workman" ];
}; };
}; };
}; };

2
modules/services/initrd-ssh/default.nix
View file

@ -17,7 +17,7 @@ in
port = 2222; port = 2222;
hostKeys = [ "/etc/secrets/initrd/ssh_host_ed25519_key" ]; hostKeys = [ "/etc/secrets/initrd/ssh_host_ed25519_key" ];
authorizedKeys = [ authorizedKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFx6OLwL9MbkD3mnMsv+xrzZHN/rwCTgVs758SCLG0h felix@thinkman" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFx6OLwL9MbkD3mnMsv+xrzZHN/rwCTgVs758SCLG0h felix@workman"
]; ];
}; };

2
modules/services/remote-build/default.nix
View file

@ -21,7 +21,7 @@ in
group = "nixremote"; group = "nixremote";
shell = pkgs.bashInteractive; shell = pkgs.bashInteractive;
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGYSzDdxqaNHmaaLqEvOK/vB65zvqoCebI3Nxzgg5smq root@thinkman" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGYSzDdxqaNHmaaLqEvOK/vB65zvqoCebI3Nxzgg5smq root@workman"
]; ];
}; };
nix.settings.trusted-users = [ "nixremote" ]; nix.settings.trusted-users = [ "nixremote" ];