From ba5e41547405eac96bee1fece6029956446e33be Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 1 Jun 2025 20:16:01 +0200 Subject: [PATCH 1/2] flake: update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index c1456ed..c2fa578 100644 --- a/flake.lock +++ b/flake.lock @@ -227,11 +227,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747900541, - "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", + "lastModified": 1748634340, + "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", + "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", "type": "github" }, "original": { @@ -242,11 +242,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748302896, - "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", + "lastModified": 1748437600, + "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", + "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748370509, - "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { From 62d5687a0f485dde1654e6659ff053ba8ed51bb2 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 1 Jun 2025 20:18:42 +0200 Subject: [PATCH 2/2] treewide: migrate workman from thinkman --- images/base-config.nix | 2 +- machines/core/users.nix | 2 +- machines/newton/syncthing.nix | 10 +++++----- machines/serverle/syncthing.nix | 12 ++++++------ modules/services/initrd-ssh/default.nix | 2 +- modules/services/remote-build/default.nix | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/images/base-config.nix b/images/base-config.nix index 0de2c90..96f432e 100644 --- a/images/base-config.nix +++ b/images/base-config.nix @@ -79,6 +79,6 @@ systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ]; users.extraUsers.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFx6OLwL9MbkD3mnMsv+xrzZHN/rwCTgVs758SCLG0h felix@thinkman" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFx6OLwL9MbkD3mnMsv+xrzZHN/rwCTgVs758SCLG0h felix@workman" ]; } diff --git a/machines/core/users.nix b/machines/core/users.nix index 131883e..0455088 100644 --- a/machines/core/users.nix +++ b/machines/core/users.nix @@ -23,7 +23,7 @@ ]; hashedPasswordFile = config.sops.secrets."users/felix/password".path; 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 AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIMHExVOrEevQ+bwrrW3cXCO7Y/SyA+7wG+b6ZvAWY4MJAAAAFHNzaDpmZWxpeC1wZXJzb25hbC0y ssh:felix-personal-2" ]; diff --git a/machines/newton/syncthing.nix b/machines/newton/syncthing.nix index 8d2b2b3..86f165b 100644 --- a/machines/newton/syncthing.nix +++ b/machines/newton/syncthing.nix @@ -23,7 +23,7 @@ urAccepted = 3; }; devices = { - "thinkman" = { + "workman" = { id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL"; }; "birdman" = { @@ -38,7 +38,7 @@ id = "djdxo-1akub"; path = "/data/computer"; devices = [ - "thinkman" + "workman" "birdman" "serverle" ]; @@ -47,7 +47,7 @@ id = "4hds7-gpypp"; path = "/data/phone"; devices = [ - "thinkman" + "workman" "birdman" "serverle" ]; @@ -57,7 +57,7 @@ path = "/data/music"; fsWatcherEnabled = false; devices = [ - "thinkman" + "workman" "birdman" "serverle" ]; @@ -67,7 +67,7 @@ path = "/data/photos"; fsWatcherEnabled = false; devices = [ - "thinkman" + "workman" "serverle" ]; }; diff --git a/machines/serverle/syncthing.nix b/machines/serverle/syncthing.nix index 1e70a86..1be5c59 100644 --- a/machines/serverle/syncthing.nix +++ b/machines/serverle/syncthing.nix @@ -23,7 +23,7 @@ urAccepted = 3; }; devices = { - "thinkman" = { + "workman" = { id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL"; }; "birdman" = { @@ -38,7 +38,7 @@ id = "djdxo-1akub"; path = "/data/computer"; devices = [ - "thinkman" + "workman" "birdman" "newton" ]; @@ -47,7 +47,7 @@ id = "4hds7-gpypp"; path = "/data/phone"; devices = [ - "thinkman" + "workman" "birdman" "newton" ]; @@ -57,7 +57,7 @@ path = "/data/music"; fsWatcherEnabled = false; devices = [ - "thinkman" + "workman" "birdman" "newton" ]; @@ -67,14 +67,14 @@ path = "/data/photos"; fsWatcherEnabled = false; devices = [ - "thinkman" + "workman" "newton" ]; }; "Aria2" = { id = "jjnzq-pgzua"; path = "/data/tmp/aria2"; - devices = [ "thinkman" ]; + devices = [ "workman" ]; }; }; }; diff --git a/modules/services/initrd-ssh/default.nix b/modules/services/initrd-ssh/default.nix index 7bfb362..f7d0099 100644 --- a/modules/services/initrd-ssh/default.nix +++ b/modules/services/initrd-ssh/default.nix @@ -17,7 +17,7 @@ in port = 2222; hostKeys = [ "/etc/secrets/initrd/ssh_host_ed25519_key" ]; authorizedKeys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFx6OLwL9MbkD3mnMsv+xrzZHN/rwCTgVs758SCLG0h felix@thinkman" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFx6OLwL9MbkD3mnMsv+xrzZHN/rwCTgVs758SCLG0h felix@workman" ]; }; diff --git a/modules/services/remote-build/default.nix b/modules/services/remote-build/default.nix index 0489087..e40f0bb 100644 --- a/modules/services/remote-build/default.nix +++ b/modules/services/remote-build/default.nix @@ -21,7 +21,7 @@ in group = "nixremote"; shell = pkgs.bashInteractive; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGYSzDdxqaNHmaaLqEvOK/vB65zvqoCebI3Nxzgg5smq root@thinkman" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGYSzDdxqaNHmaaLqEvOK/vB65zvqoCebI3Nxzgg5smq root@workman" ]; }; nix.settings.trusted-users = [ "nixremote" ];