felix/nixos
1
0
Fork 0
mirror of https://github.com/Stunkymonkey/nixos.git synced 2025-09-13 22:12:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: felix:f1b9c9edca30d0d0833376dbd4c2acd11ecdb197
Branches Tags
felix:master
felix:nixos-23.11
...
compare: felix:62d5687a0f485dde1654e6659ff053ba8ed51bb2
Branches Tags
felix:master
felix:nixos-23.11

2 commits
f1b9c9edca ... 62d5687a0f

Author SHA1 Message Date
Felix Buehler
62d5687a0f treewide: migrate workman from thinkman
Some checks are pending
/ Build Nix targets (push) Waiting to run
Details
2025-06-01 20:18:42 +02:00
Felix Buehler
ba5e415474 flake: update 2025-06-01 20:16:01 +02:00
7 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -227,11 +227,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1747900541, "lastModified": 1748634340,
"narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +242,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748302896, "lastModified": 1748437600,
"narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", "rev": "7282cb574e0607e65224d33be8241eae7cfe0979",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -296,11 +296,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1748370509, "lastModified": 1748693115,
"narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4faa5f5321320e49a78ae7848582f684d64783e9", "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
"type": "github" "type": "github"
}, },
"original": { "original": {

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" ];