Compare commits

..

No commits in common. "consensus" and "nixos-24.05" have entirely different histories.

6 changed files with 46 additions and 51 deletions

View file

@ -197,11 +197,11 @@
}, },
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1725103162, "lastModified": 1717196966,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -213,11 +213,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1725826545, "lastModified": 1717281328,
"narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9", "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -24,7 +24,6 @@
loader = { loader = {
generic-extlinux-compatible = { generic-extlinux-compatible = {
enable = true; # Enables the generation of /boot/extlinux/extlinux.conf enable = true; # Enables the generation of /boot/extlinux/extlinux.conf
configurationLimit = 5;
}; };
grub = { grub = {
enable = false; # NixOS wants to enable GRUB by default. enable = false; # NixOS wants to enable GRUB by default.

View file

@ -1,18 +1,17 @@
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFAvWjlQZyAveERD YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFAvWjlQZyB4MEY0
RlloME0vRXYwbWtqVFpOdS83ODFpcSsvQUNmOHA3Qm01Mi9rSEYwCnBvT0V3NzU4 aUltV21JME9tcFBhRzhJQ1VqUEtyaFZwT1Rsc0pnUkhTbnVxUm1rCjFXZUNtMVV5
YUVFUmdwUDBoQjlMa0V2SzBGbWJGT1QwL1Nqd1NRV2xabDAKLT4gc3NoLWVkMjU1 YzFwSzVwMlZmZEFLempSS3RyVXhxUXBPMDJFZ1ZCMnNyeVUKLT4gc3NoLWVkMjU1
MTkgUWQwZXBRIDFjNnRyalVlMCsya1JvQXdXUGlBdFVsaTVFK3hDaDFneXJTM012 MTkgUWQwZXBRIEhoOXN0NkVuaDdhOEhrcjh2ZzNTRUNwclFNQ29CeTBsMmRtV3Jy
dnFka2sKa3J5ZlBtekxGM01sK09SVnY1SmZEMi9HSUpONDI4ZFVudW9LbjRkaitU SFc1Z28KcGRJL1VIZnZaYm4wWURuU1VwSDVyQUZWMjlQeDZqVCtLRlZWTW5PSytM
cwotPiBzc2gtZWQyNTUxOSBaRDhsTXcgSnZ4djlnZlF1ZVI2UEhsSUl0dlRWTzJa dwotPiBzc2gtZWQyNTUxOSBmNVRoQWcgREIzQkNUcVY2bUNwckU5SjBYMVZFQkpF
bU9SZ0IwYXNkdzJ2ZEEvcHgyWQp4VC9waVdRK09aSlZkT1hNbTh5RUV4ck8rNjMr TG1FVVJmd1RPRFRpQjZ6bjV3SQpoNVA5TkJ5MWVoTzUydG85M2YxbWM3b0lPbDJl
SXpPK0cxME9VS01XaEs0Ci0+IHNzaC1lZDI1NTE5IGY1VGhBZyBsMm50NjZxK0RZ UnZ0U1BiejRQU2xIZlRrCi0+ICxuQXgnZC1ncmVhc2UgIXxMTFZpPXYKLzdCaWhl
eUowTVJnQVpDWHlodTJmSitPekFnMVArZVdscVRtVVVJCjNEV0laQXNmcjJaVWFM WXlXSFgrT0hYampkRkl0Z0dBQzhNR0pYR3hRNTdncDBJbGZKd2F1Y0wvM0g4bGJs
R0tDdzFWdFNBaFFjU3YzQzZWckdVS3RBWG1CKzQKLT4gUzJeVD4iKC1ncmVhc2UK NUwvUUpwL2Vycgp3ZjBGRXpRNVB5ZU50OWdacWx3blhSSnBBQQotLS0gejhLWElM
L0xsMEtLejZxVHE4U0VLbGhIYTlDS2IzQWVsL2FpTmppay9sZUxWK01BCi0tLSB5 ZVNxNG9jY2loek9PWStadm5XdVJ3c0N2Nk4wald6Y3BkcUV4ZwptbI7LcKE5OKmc
WWNJSVJOZUoxanlRbnRRQ1kvYzVrVFpSN293UWhuelZrRWVFQlltdllrCg3cGJL9 GZKvX5TfnEwLVTzTzN0Ns4HIZwwnErRxwlXDbbX1LnAxgcO0ZRXd1xAxXTsz/s53
MEIrfgtvsPdHOqpkp8TeeRVLIephesuve8S17Lujt2WPmigzf7fCQ1rc9/W/VMsT IycJiQkPPCYynSV3OcYyQmXUxqXI0/fNFURjBvUWwrlI7aKfh8dOTbi6AtbDam8R
g6tQhsdPeQTynPih1htXlweypUU8mdAMT49qV+TumR0SybuM0eff+emLK7juUQCw RdTw0H0os2NWH0p7KlqrVKo9vfkMekssfDS0OW/kFBj8tNKn82cP88pMqca7MwEQ
zoy8rZlsPnDI0zYuDpWsVYFdnkS3cm4YHd7CNlAyF+jWk2Z87C8BaGhPxWvDL92b uMZ5Bn8kow==
DwZpLuniZKBB6uew
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----

View file

@ -1,12 +1,12 @@
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFAvWjlQZyBFWmM3 YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFAvWjlQZyBTdmph
SGVENHM5NFRwbmMxWFcxNXppV25reUNpbnFxejhPbWIyWTdKMlEwCk42VG9zemQ0 NDNlY24xZXBSc2w2ZjN5K3l6YXkyNXhiK1g3djdwK3g4MmdrOEdZClU4UWt4Z0U2
eXNzMjRtdXFZZGtVSW5XTEFvQzBjN1ZaUzJUdGZzeW1uYkEKLT4gc3NoLWVkMjU1 NkRLYWxqL05vbEpQVkk2RXFRTlBWWHBQd2JjYWtZZFVIS3cKLT4gc3NoLWVkMjU1
MTkgZjVUaEFnIEpkVVJpZkdiSHRBMjdyMFBZRXNrQXF2RG9mbVRLcFVjSWpyOEYv MTkgZjVUaEFnIEl0RGoxVlVzKzhabkJuU010NG1yNEN6U2l0S3EvSHBvWDNIcDlm
L0tmQVEKdFlKbGx2ZElmVUxTcVdiZGkyVk1sMSswSnJ6VERXYWVLMWRDWTdwWU9j WG9jQTQKMExHeXN0eHVtRVhhMHN0UDZrNXl0MVlsUkJzaXdBeEU4cE5vTjVqSTVF
ZwotPiBiP0BeJk85Pi1ncmVhc2UgbCl0NGw2IHdOdjg1biBnIV89Wm83RyBFe31r bwotPiBuMFhTMy1ncmVhc2UgdVxmMG0rID1IMDx9IEB9RgpaQnNDaElQZ0x6K1ht
ZTtoCklFVk83MWQ3MnRPL1RTQm9PU3RDY1RKajZkR21RLzVoVUVXS2ovTEpHWGY1 WjYvWlNPUmcvdVExWFpnbk1HNWt0Rm5Za0dHTmdLVm9nZm8vNnhNdldLS040bUQ3
V0lNTWlsRm9IRktpTmwyYVFwZncKZ0ZDQmxuUDBMaFNHcmcKLS0tIG45U1prZUJX dUZXCjdCT1ZCZwotLS0gZk1paHJBbUlJRzJUU3dqYlE3Z1hwYXd2YmlHUmtCbENB
Wi9iOGE5UDBiNzBOTVY0V1FFaTBpOXN4V1NpQVc2bm82cW8KWN4G2p4FkRBeVkKt L2d3cGh0UldWbwpD4cbpEnC0tJAGBF7MpnYC9PsCg/JltTzUA6zbMDUWtsozxG1z
MR6puzAlFaXiQrE26RPrHepdfQz62+zu0eFKQd6+w/dwUMoyoElBCCZeWyiA 2PkX1DKolXm01W2qeTQl2p5mlFk=
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----

View file

@ -1,19 +1,16 @@
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFAvWjlQZyBGTW5o YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFAvWjlQZyBXTG1K
dWVTNjFIN1AwV01tVlV4Sy9NcDZ1QjZZdDVMTkE0cTJxOHJ2NFFzCjYyRXBYNVhB OE15S2ZkZXd6RTc5R3JZeGU0YjF2TVhLOE1jYW1TWDRFSFdadkVzCmQ5TXUvb2d3
RUQwaVM2cFNpMEEzZTNHWVV4V0FDTXdGQ0FHLzNOaE14KzgKLT4gc3NoLWVkMjU1 ZldYcEdhYnFuVzVLcXozakNDOXUrdFNweGpBRVF5cUVLU28KLT4gc3NoLWVkMjU1
MTkgUWQwZXBRIDZTQmdzdFoxQ24waHNXb2N1cW9Uc3NMcnNWV0VOSmcwVmEzVzFS MTkgUWQwZXBRIG0wNk1YYzdUSE1WS1RJanBJK1IvZUpxaC9NVHp0Z2JyRkJxSlEy
elJuZ1kKV1lWUm1LZUMzdzYxdDQ4VDBGdDRXNnNMbTFIMFl1WFdSZ092dm5hWXRy VnhJRW8KVUxDNTJ1cXNLRXFDcFZtMk9Lb2NFaVhsWENCSHhDbjh3c1dBMnlnRytm
VQotPiBzc2gtZWQyNTUxOSBaRDhsTXcgbzdQYlpmQnBQVHEwV3EwNjNDU1hCSTlu WQotPiBzc2gtZWQyNTUxOSBmNVRoQWcgajU4b1R2blEzaUovTkFJcHBkV01OWTVN
OWh5NDdrL0N6cDRPVUlyQndrTQptckpUNXR4YmhDMnJkR2FTK2Z6RzkwNFRjRjRP cVlROVY3V2szUTJkbnh1cnpHUQpZbVVXaGpDaWdNcEJhVjNxa3BOaThDbnEyWGdQ
cThwNElxMHRxbkp3QjA4Ci0+IHNzaC1lZDI1NTE5IGY1VGhBZyB1K0dXUXVuMC9Z R3BXL21Cb0FmU2NQMHJVCi0+IFlFOWEtZ3JlYXNlIF9Ud3hhIDh7IF80Pi8KMWhF
U0Vnbjg5U3J3eFRFOU9OYUNTLzlGYTE4aHZVd1k0Z0Z3CnpSQkswMjlScDBZV3ow dWszMTVpNDNaQU1KZUx4ZVhtc0xuVFBQUGVQSzUrUjF5NjdBd0xhbnJ0U3VveHJv
NkdDdmZsN2UraFlxd1pzQ2xLWWVXbVBXU281OGMKLT4gQi9JLWdyZWFzZSB1UiU2 TGRDWmdQVUlZVWlvagptUmYwRlNHSWxJYUEvZwotLS0gSGhiMkN3eWFRQnNnaWNN
MiBzIGI4RWVOdyAhbUJhVHRTXgpKSGs2Sk44WkNMSUlvWjVLUTdsOGJkM3pNNzVL NFVySCs5R1NGelg4ckx1S09HcDBaVGZUZlpJNApJ6FRxoquBSUxeI/k7qfrV1TFN
clVPR1hkOXM3Tk1aUUszUnViN2xPM3EvVEhjZGpmSGhQOE5CCk5FWVdzTkx6SkND KjENnVJPTQ+toUC0nsZnsseJbcudpbZbkihaObqqAsDuB2gvWiyNMuBbDLAGgjRz
QW9PU1pyV0I4Wm9Jdnh4RQotLS0gQ2JRYnA0Y2I5a1ZpZStidFBtWWZyditpZ25o oYJTSO9LLXLINo/oQOdVaASuviMrtZy/zOVYkQCKdlUo4EouFLYnJ2k6KWUCUXcp
Mmw2KzZOY1dEMDRZcUEyTQrRvJW1UGMHGZbY6U8p4nqv0JPPBJjAWd6JWMll0bio CrMAZv/DU/uetOr1JYKaRxsvIn8j92PHOkkuh7oGb7UpXpxlrRWDiemTe3qfiw==
b413jw7QNzFVsSeVKLN+ggneRsCYi4ax4Zwq4iZCn7+3C4xB//SyLmmlmnnW+0tR
odrfE0r84I12AK35SKZjLQBw5osOiYB9lSbloZTMHVguvKjwqcg1V3eX6909yeou
urCplU5qLT2XFrtLSWGtax3D49lOezWwoLC/uZPm9MX97g==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----

View file

@ -13,7 +13,7 @@ let
flemming = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK16f3Fjj0BY9vjtXahezMAP3I329hHEQXCceRTkr+Yu"; flemming = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK16f3Fjj0BY9vjtXahezMAP3I329hHEQXCceRTkr+Yu";
pred = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMK5BOK1ldtZ+SV4QxfNm/PfOLOWv3/VHf/JbdMMoMzw"; pred = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMK5BOK1ldtZ+SV4QxfNm/PfOLOWv3/VHf/JbdMMoMzw";
toscano = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGWcukRkNUQUbgXQle8q9xszDZOnDf3BVpPSFgycJVVE"; toscano = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGWcukRkNUQUbgXQle8q9xszDZOnDf3BVpPSFgycJVVE";
systems = [flemming pred toscano]; systems = [flemming toscano];
in { in {
"root.age".publicKeys = ops ++ systems; "root.age".publicKeys = ops ++ systems;
"fiscalvelvetpoet.age".publicKeys = [fiscalvelvetpoet] ++ systems; "fiscalvelvetpoet.age".publicKeys = [fiscalvelvetpoet] ++ systems;