From 64a92b3e87c304098d76ce76ee3fbd530e9a1e77 Mon Sep 17 00:00:00 2001 From: KoenDR06 Date: Fri, 7 Nov 2025 16:21:45 +0100 Subject: [PATCH 1/5] Welcome artemi --- flake.lock | 12 +++--- flake.nix | 1 + machines/artemis/configuration.nix | 13 +++++++ machines/artemis/modules.nix | 60 ++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 machines/artemis/configuration.nix create mode 100644 machines/artemis/modules.nix diff --git a/flake.lock b/flake.lock index c8aa4ac..f81e1d7 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761597516, - "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "lastModified": 1762233356, + "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1761078382, - "narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=", + "lastModified": 1762274591, + "narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=", "owner": "pjones", "repo": "plasma-manager", - "rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c", + "rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 84c8175..833aa7e 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,7 @@ "luna" "terra" "solis" + "artemis" ]; systems = [ diff --git a/machines/artemis/configuration.nix b/machines/artemis/configuration.nix new file mode 100644 index 0000000..9470c45 --- /dev/null +++ b/machines/artemis/configuration.nix @@ -0,0 +1,13 @@ +{...}: { + imports = [ + ./hardware-configuration.nix + ./modules.nix + ]; + + horseman.username = "horseman"; + horseman.stateVersion = "24.11"; + + networking.hostName = "artemis"; + + networking.extraHosts = "127.0.0.1 koala.rails.local"; +} diff --git a/machines/artemis/modules.nix b/machines/artemis/modules.nix new file mode 100644 index 0000000..f910f2a --- /dev/null +++ b/machines/artemis/modules.nix @@ -0,0 +1,60 @@ +{...}: { + imports = [ + ../../modules + ]; + + config.horseman = { + catppuccin.flavor = "macchiato"; + + users.default.enable = true; + + base = { + nix.enable = true; + locale.enable = true; + secrets.enable = true; + }; + + boot = { + loader.systemd.enable = true; + greeter.greetd.enable = true; + greeter.greetd.session = "Hyprland"; + }; + + wm.hyprland = { + enable = true; + + config = { + monitors.displays = [ + { + output = "eDP-1"; + x = 0; + y = 0; + bar = "top"; + } + ]; + monitors.bindWorkspaces = "interlaced"; + }; + }; + + hardware = { + audio.enable = true; + bluetooth.enable = true; + wifi.enable = true; + }; + + network = { + ssh.enable = true; + syncthing.enable = true; + tailscale.enable = true; + }; + + apps = { + dev.enable = true; + visual.enable = true; + terminal = { + enable = true; + zsh.enable = true; + }; + }; + }; +} From c885861db08108727bac6876767ad1da54eee721 Mon Sep 17 00:00:00 2001 From: KoenDR06 Date: Fri, 7 Nov 2025 17:27:34 +0100 Subject: [PATCH 2/5] artemis key --- secrets.nix | 3 ++- secrets/ssh/config.age | 32 +++++++++++----------- secrets/ssh/id_github.age | 47 ++++++++++++++++++--------------- secrets/ssh/id_github.pub.age | 36 +++++++++++++------------ secrets/ssh/id_personal.age | 46 +++++++++++++++++--------------- secrets/ssh/id_personal.pub.age | 32 +++++++++++----------- secrets/tailscale.age | 32 +++++++++++----------- secrets/wifi.age | 38 ++++++++++++++------------ 8 files changed, 141 insertions(+), 125 deletions(-) diff --git a/secrets.nix b/secrets.nix index 577fb6b..501c83b 100644 --- a/secrets.nix +++ b/secrets.nix @@ -4,8 +4,9 @@ let luna = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFu+XwTX1vF8Xqlna99Tu50TBT0cmOatb2LLwnC/33DU root@luna"; solis = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDKepQ6sJahN0VQTMowIiga2WZBCaNBTadca+OxCV6T6 root@solis"; terra = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN6Mog8ujGXnEZ3lXm4zrYclh/0xx4LhZV2U5zqqxALE root@terra"; + artemis = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHDZfBvo7QMA+V/Taxk+xU6jBDzVEz+1pJGmHkCE1rOH root@nixos"; - systems = [luna solis terra]; + systems = [luna solis terra artemis]; all = [horseman] ++ systems; diff --git a/secrets/ssh/config.age b/secrets/ssh/config.age index f4c18ed..bd8d3ae 100644 --- a/secrets/ssh/config.age +++ b/secrets/ssh/config.age @@ -1,17 +1,19 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBabWV3 -aE9rRCt4YXpzYUFudmRNeFU5Q1kzNUtGcnZJQk5RLzBiNjJQTUJZCmJva01DcWNu -elpVMnRrR2Yyb24yUXkzaG94V2ZmcHI5M2lBRUdad0ZQam8KLT4gc3NoLWVkMjU1 -MTkgZ1BJZFpBIEc1clgzSk4ydjBwMTFsd0V6b0x2Z3ZNeEJwbEJaME9MdnZoRWtJ -bHJ6aFkKYVluSEM5dUZEWEJYbkFRMEJaOEpaWTZpcCsvV0tnSmIweVAzQVczNU5v -WQotPiBzc2gtZWQyNTUxOSBkYk9laEEgditNUVR6YzUxdzlTSjdVWmEwU1I5UFpX -WUIwbmVyUXBoZ1FMR0s3Wm8zQQp1bi9NbHR1eEllSDhoSGF4RnFtY21UekxBdXhX -TFRJWkRjYlZYSjJzYXMwCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyBXSlhsa08vNnpM -K2hsbDR3ZWpIK0d0bFN4RDBOR0hTY3c0STFBTzNYN1VFCmo1RVo4WGVGVmdvWk9X -dmR2OFYxRU96YmxReU8xSkdOZzhjMGp5d3BPYkUKLT4gMSktZ3JlYXNlIFZbK3oi -IGIiJj4/IG1RWjgjRyBTX3RsdQp4eElOL2twb1I4b3FxcmdTd1c2VlFRRzJobXJ2 -WGgzZEROMGVvek1aaU1keCtDOGg3UTlpM0VtbUxsd1p4STAKLS0tIFRmL2VoMUNM -bjB1aUp2UnFZVHpRamxBOGtXN1BDQW5IRjI5cVo0SEFraVkK8l69jhaN/CXcnvWq -wtdemXDqSpL9VYlnsjQxlmwJXg9jh0f1MA5TcSeqVkHNKPhDJjdTMkr4G/mWCzv9 -J0Ml+JlyPh2viyGMQ4jpxLeBN9HlKfoMEp/tlpsFJZ0AJrUrQe9gLjslBg== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBsOXZN +YTBqZGltbEo4c2FMcU5XbnFtaE1aL2p4NFpWMmRSY2pWQWtNbDFvCmE1MkR1L0cr +dXBCZFJ5clRaMnQxZ0piOFd0MjA0MTVGTVFPQzhsd2c1dWcKLT4gc3NoLWVkMjU1 +MTkgZ1BJZFpBIFNFRkExWk5SblNFbmV3bnRjdmlsb0R5OHZXbk9UcnFyU1hYK0Qr +YVFwRVUKR0ZkNktwWm5SbjgyM2ZsME9GOE1SQVdqWVkwTkZ6UFJjdHlaTGwycWNI +QQotPiBzc2gtZWQyNTUxOSBkYk9laEEgYk5GeGE0ZWVtOUhsaFdyZC9RT1pTQ2dR +Y2s1cHlQYU55OEJ5VDMrcmhTTQp3NDk5Mm5qR3h1TFoxNm5vaVVUR1ZMaGhvdlIy +dzVUa3kvQzdyWWl2K2FZCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyAvQ0NkaHREN0tD +ZzZMdUtaQytyUEdDOUZvZ2JNM1c4Y1ovRDF6UGFtc1MwCk85TG5NQUp2MEk4bWg1 +NHgvUktuUXJLU3U4TGdJU1VHazFLN1dPdWNvMnMKLT4gc3NoLWVkMjU1MTkgV3lJ +RnpBIFROWnlTeU8rTnpuenNTbDMyRnREREpqRk40VFdZeHoyOUxGdFYwTDI5a1EK +U0U1Y0ZWMzQ4RjluTXNwUGpkVTM5ZkZxNHU5ZlJaMnpxYXpNMlRMR21QOAotPiBV +eCg2LW8tZ3JlYXNlCmdqOFJibTdBZk50Lzl5SVk1SVBxL1V0bmU1K1YKLS0tIDFM +czUxQ0c5RnFSVkdIUGRoZkZUV3loaGZ3cFFMVzVyazdrMWtaZWxMTVEKA9f56ZsQ +q9I8pqE3hPWYAH9Z711+OIozWmBYQxLkL5pt+ZJBtgXrfU8lC1BqzG5mH5CUkIYb +W2p32i/2AmjLkMzXmUU35BiI1ixZ6rBxsY6E6dx5PVC0XXK54CGmPpi0qnLaFEvn +mQ== -----END AGE ENCRYPTED FILE----- diff --git a/secrets/ssh/id_github.age b/secrets/ssh/id_github.age index 89b95ca..d24fd58 100644 --- a/secrets/ssh/id_github.age +++ b/secrets/ssh/id_github.age @@ -1,24 +1,27 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBMWDhT -cWJENVAxdU0zaFRqVW9tUlJVSWdxRDh2R2dvdFJzaCtFVVkwWEFZCldWTXNya3JN -UHlTcmFraEJPZisyKzdXR1JaN3V4SHZyZ3BkRHVKaW9kSFEKLT4gc3NoLWVkMjU1 -MTkgZ1BJZFpBIDJpRUJVREs5am84Q3FxbDAzaERxeUpnQUIrMlFlR25YZUF5VTlJ -Wjd3amsKc1Q0YnNydXpEMjE3ckhGMTZONlh2MmU4NS9CT21DZnkzTmowU25nbGpW -QQotPiBzc2gtZWQyNTUxOSBkYk9laEEgbDQrRHlqbnQzZUJBVjBJNnhhWXpQYXAr -a3pmMWhRRlpDNHcrSlA4S0kxVQoxTlRwRUxGenJaazFXUXd0WHpWM0ppaU8yVG1C -RXhRVDVOQnRScDgwdVFjCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyBYQTMrZHNJM0JB -N3B1VWhOLzlRM0ZIMDlCMHRxL1ZLbjlLOFE1WDllL3lZCjljSmRJNmpIYlZvSzA0 -dFhYMFlUL3l6WVhLNHU0MWNHSHI3cmx0OXR3VU0KLT4ge3hzLTpUTi1ncmVhc2Ug -aH1SKyB+WDUqa00gfnVdOQpqN1JLZ3kxUkZCTlhkOVZrMmtNc0g5eUdBWmRuL2pS -b09QajVMbHhBVWtnaXJJOWpHbzhFb0d3R3BZRVh5ZjNoClR3Ci0tLSBuanp0aGZB -RU9HYmZGRGZaYXBORFFabzJicG1oandodFlyMGFBenZIL29BCmGiBNEQPiEtdp/i -zfwN0kRj6+yF+K/2Lo69KDfVb/WJYc5EfsPqNa85TL1BchaqMJa39Z2ANykczRMk -6D0LNgJlSFT1Z8vJEtaEJpS4XPddBIEmuqA1m7CE9JX+SdaArLaWnA7A/8+fex+8 -misBzGcNOjQ4BWMuytPCcUx9xPYzNLlg17uIM/IgE0kgwbRAisSuE0R/bTApkffj -7eV7j8jAifQvICruNCpUNlewaYnQZZJrbQxX/EzxXhnq/clvjOGPmpLPPy8iCHoZ -YJi/Ga71fR1OrgLh1SV0z11WkyD6V5n8T3eFfG5AyLUCPXDmI2bx4jEvyBgGAL3P -kKbh+Kzd+B5mP3nYtL+jB9cqsHplV06OMyHcn01r1p7558qRA2+iygM8MyOf8ubF -a8MGMohuckA43duhdiTBhH+vkNPU2J92duKE0SAe2x1GU4XBjiIZks7E6NYDkAXt -U62zNxjbLfR2hsibpd38DQi9GA74/DBA72Fix76SNB+Q339hM3umPSJP41iPk1fH -mkKHuxbF1/dXPl38yquAEA/9u8T07Vg715ydAeFkT2BrVx9x +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyB2TC9a +c084ZG56bERPT3VYSlN6cUludnJwdjQwZEVsRzdoUXdpSUVWRUJFCmxZc2JETEJq +Y1pkdStMSXhTa1VoR3pDVmJRbk9pRVYxR0VIM1JDTG5aL0UKLT4gc3NoLWVkMjU1 +MTkgZ1BJZFpBIFR5d0lxeURTbWJFQXhGVDhQQ2lVV0xndG9ZbVdLeEljMVpwVkNR +aGtzRGcKdWQ5SHhoYWtrM1poSis1dlRoUHlIQmwwc2hLSGdQMHZzTkZzY3R2dVhr +cwotPiBzc2gtZWQyNTUxOSBkYk9laEEgZTdzMmtLSHEwd0ZJV0lTaG53dGtuU2Q4 +VGorZHZmUHlzZVBFemZ0SCtURQpMYWRjb3NUbE1RaStxV004T1BJZ1BseG44VU95 +WUh5QnJKY28zM2JacTE0Ci0+IHNzaC1lZDI1NTE5IHR2L0N6ZyB6UGZlSkpUOFYy +VVVpM05pZERYVE44aDVoK0VzN1lBMU04TEZmcy84OUVZCmliMXpDTVhyYThXNUt0 +QjZCY0hzZllucHlGOG16UE1xUUhyLyszN2JKRWMKLT4gc3NoLWVkMjU1MTkgV3lJ +RnpBIDZoMFBCc29QSFFnaGJZNUFMN2tRcDg4QzdibThnK0dtMklTTzUzdlR0V0kK +NW9ib2ZuWnppaEN0Q2dRVVJrWU9iaDk2bElZVnFYWVhHQW1CQVUrMjNMUQotPiAh +WmAyOXEtZ3JlYXNlIFMoLyxkCjZmTjd1L0lYa3B0THFWNkdqOTIreGxseHkyMUl2 +QVdhZXNuUjczbjNJUzhleFhENWp1T0IwT3kvamxmeGZvOFIKaDVuZXBlVkorSFo5 +M1NoaW5YcUNEamNaR2xjYUZmNkRhZUJGMzZFNWJaNmt0NUdrU29YNEJXTQotLS0g +eU5POUxDdmdVSTlOcDZ5TmI3MDJjc05YbnBlNWkzRlRLUklyaURQSG83TQoGKkAA +jPHg5N7uwUZACbRhg/0Emuu4q53cGhewnJYeqIWsuic8OsBdmlWsRJHsmpB4ygiM +nSXUxauZ1kvAb6ujBeHAl1mNPf4Axl9joZby1WnaO5MYqK5GwXzo09taagDTfbIg +Wvsv+i0HfrJmUHz684GlZxUWXghlSuNlVVizmad5mcuCHHClC0YW+U3qQQ/A4HHw +WWocC0bb0cE9GGJkSsSb2lBMYj51EGNZ4H+GnAw6cfZYhaKtQt0b/VtjS68gFzTl +yxTyhgFTB4neEjGk8N7YohkpcGgPfY1jQsP2ZAcpWW7JX6lEPFvob3MwUFOOAhTf +DeqFg3ghPsGDqluOZDipaVZTqP9hct5LW050nVW4onTqlhldqXegAmhpFC3esONC +glmQ7dxn6tZOQ6a7JrlJ6Al6qkJmgRE5yYA3SWEnj7ZvgSG7057HsRbdlXfUTRJG +V451IOOswZJMGabHUCkwUc1r49c3dS0GSr41hCK73i7UtcKrqGQ+y29oxMbfYXP4 +nWipP6jOsn7dPRXbvnusM5rPOEmAv3+efH+Jx2oymN4Ds5vdBUBmJVkGPQ== -----END AGE ENCRYPTED FILE----- diff --git a/secrets/ssh/id_github.pub.age b/secrets/ssh/id_github.pub.age index 50354fc..2c23bb0 100644 --- a/secrets/ssh/id_github.pub.age +++ b/secrets/ssh/id_github.pub.age @@ -1,19 +1,21 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBpeU9L -L0F3R0RhYjZuaUZEVVA2dklhWEFSSjBoL0FDQko3ZDI3MWwrdVdrClZJMDBGV1M4 -aTFSSWhEUE5TTVFaekw3ODZ6c0tqY2I5TTVDcVlhUUZQTEEKLT4gc3NoLWVkMjU1 -MTkgZ1BJZFpBIGx4ckViVkE2STYxRVdvZ3JuSzYwa25UYU50YVdhRHZwQUlKM3Rr -UUpMWDgKTXNueFpjVzdzWnROYnNIcGt3Z2NRUWNjN2d3SUFZQWVVOTF4S2RKakZW -bwotPiBzc2gtZWQyNTUxOSBkYk9laEEgdWdZSFJTdWhaK3VqRUtRb2pKbk1vb3c3 -T3IvcDdPVXU1clNEL3ZuTitSbwpVS3BpZjB5S2h2YVdWaTJDazJqdjYvVmdnMTBG -TXZhMkpPM2hVN3Z6eEF3Ci0+IHNzaC1lZDI1NTE5IHR2L0N6ZyBJbHpaU1FRbnZR -ZUZpdWtUS0ZBdzczMmdtalBINWZDWHVBcVNDU3Q0MlRjCmJoZXdNSXNwanJBNHpZ -NkVLdGo4YnZadVp5Z2VSbU1sRVJoQUhhYkF0UUkKLT4gX1FZfjstZ3JlYXNlIEBl -Zlx3SWJ5ClJ6K1VkTU9CVW5ZMkJSWnBNekxud0VyMEhwVXNNYXViWVRTTnFOU1pi -eEhoOWRZbVk4RlM0T2lNNDl1elE4cUgKSUtDTnFHVVlTWnk1NnFIUG13b3NCb3lH -Y1NOck1ZMUl4UnhibkFvOE1KZ3d2OElLNStOYW9wN200YXpyUWxCeQoyR0hmCi0t -LSA3TjNNM3p6MDh6YWxTWXJWajdKeWZYV0lyVWhRck4yckRlUDRSMXdSWldzCsOk -R4EXzmAvYddz7BzuJ63FxFY3rSfw4lmxkL7KCyN86k6b1rrcG/YL1o8jsUe9A91D -o0PgV3tHulv4DXC0eG5Rtjti/Twt36P1zSD832zHrjJk3DwXDt5RwqbhlJpU0EoB -4eeZUQIokR2w+ZOYkm8j +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyA5Q1A5 +c0ZLMDFwTTM2am04YUYvOHFDOC82TkdFM3hnUy9VYU9USHQ3OUU0CjJiRmUvenNK +azVLdWt6b0FaTzh2RG5SUzFwSHJwdVJTQU0vMjJaZkhKMVEKLT4gc3NoLWVkMjU1 +MTkgZ1BJZFpBIFZTSXRwMWZyS3F2Rk1rMURWRXBnODcrT0VQMmZsU3A0bER6eWc5 +Wm1YU1kKeUJlNG1tMmV5UnVOdFQwL2tJRVNNdS9UZE11UGhjelE1YlpYaCtDYmZy +cwotPiBzc2gtZWQyNTUxOSBkYk9laEEgNHJyMFZzTnptOU0yU1pQb1FrbzBLNEla +dUIxZ0I1WEpFR1RzNGZZcGtGTQpNemRVN2lMSkY4aGczQTVJdFpZSXRiTGJYQzBN +ZVhOcG9NdDB2QzRsSjhBCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyB2bG40cTRYWEhu +M2NCYnBtejAyYWpCZkJkbkNzKzBLbHpUZk11ay83TXhzCit4eG8wTDZTbklsQW42 +VlIyak02OUpZUVRwYnBaamk4eXd4eTduOGpNbFkKLT4gc3NoLWVkMjU1MTkgV3lJ +RnpBIGZYMm1SN1M1RFY1bmdEY3FoU2F6b3hwU2psNzk0SC9CWGh0UW8zaVlTWEkK +WlJ5Z1hoNEUycHdrY2hPZyttOUM4UVhwclozdEtVUXdUdm5zRkZWTVhVcwotPiBq +LWdyZWFzZQpVVk51ZEVRRXVFTldsR05admRtNnFrMjR4MUhhdjZuODF4OC91bUtN +NlJRbWZjM1BVSXFXcDZnTjdyUDRNczFqCklUVVlSeVRxS1ZlZkJwb2VVTmlEcEZp +V1JlT1RBc0Fvc1RWejBhbmxhZU9NTi9oN2FUYm9tUQotLS0gSnF0UXNYU1RsQ2Zw +TFE1NkZRSlAwV1d4c2h0QmdnUGtiYlk4S2lNOTNHbwpMF18zewdWEyF6/z3LSzr2 +yGjmmBgyN3VkeT5BJX4UuqgljXW7mGjy/KBLFOvK8GN+AS+cYV/rARGIlbAL84xd +psHXrZIbZdKgUCcXhRRPPeIsheWAXaQfIoRQ1FS9wIFcYl2p0L70i38Lad4AQ7nF +Xg== -----END AGE ENCRYPTED FILE----- diff --git a/secrets/ssh/id_personal.age b/secrets/ssh/id_personal.age index cfeabcd..58227ac 100644 --- a/secrets/ssh/id_personal.age +++ b/secrets/ssh/id_personal.age @@ -1,24 +1,26 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyB1MlJr -Y0hUb0o3L3hSQVBnU2VhS1Qvc0FseUdnT2ZmcUpVaXdUVXN5c1NNCjAxSExySlBY -T2NQczJrK3lrL3pqdGxSQzRyQStXOFBDaElnQ0ZKVlRmKzAKLT4gc3NoLWVkMjU1 -MTkgZ1BJZFpBIDQvek9ITUp0aDVKUEpPV1A2UzhjTWxJSnRYU3Q2OExDaDZvNHRU -dlg3bjgKeWhVQjY3MHJIbWpJY0hPQWtzMWJhb1BYcWFKZndYOXlQMGxGa24rSTRt -awotPiBzc2gtZWQyNTUxOSBkYk9laEEgeThuekZkYVBkbWRGNVJRWUE1a0tlYmFO -bXdNOGVGdTRPOWFxNlFvdXhHawovZmxmeG1aOXZLdXdQaW9ySnQ2WkxkTXgzNk5u -ZWp5ZE1tYU9rdmpQVlVrCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyBSOTdqZTRObXNt -bkNMWTdiU1cxeTFhcnZMbG1XTGY1aldQTGc2ckVXV2lrCllTcmRlRlRLb1dJSUo3 -ZjVLcGNtdXlvQmMwekVyeHNONHV2SVJXQWJWMlUKLT4gJmBKKm5mXi1ncmVhc2Ug -U0l5QmIKbWNXcGtkeFJlaGZKeXVwM3BNQ1VSTzl4bTVqM2dtekRYNStpakNmY2FP -d3hkcW1pdklvaTVyL3FGTGcKLS0tIGJDVmd0cjlaeEE1RFZFL3VZY3lta1BoMmN5 -a3BDam90Yk9mNHVJenFpTDgKzvmuwV4ExsGpuWwkYSO2ZYmfhrpai2L56DAysqDy -mSRkDZLsQ/G2QRVKK8OpilI9BHCXvWjQx+w+/a86wwf74kaqxeHBhE3JFcGVs4ct -Yr+4iwWAq1y3fdWZXVWWeQJ7hr9Qnwosx/XNoIQUz5R9QOaTwnvrO8Kekm7J014U -/+sfnPTsMuz7AvlvoJn4MvEHQb/8oT15zlxf9KDLtPxWm5ofACLV3Gh+Cki38TAk -LfN6OvsTDna2JS6H+GAUax+ZBz1sKV0/s2V53ubADKvb0uMP+UVpQshxKpMOat6S -LXeqToGHyaa9O3nlQzoIp8TTUt33n7fRHGlR/oPyOEzGRFFnHqDtdF/ioajOu6T3 -gpyISvLXcG12QIZAUevEse1fhXx4eb2Ydf7SPCDd2Rj0gBJZEiC0I9xc6y+gB/1H -X3u2/KYQqUKRsXLMPiJ+pmXjTvzeKl0YgyNeuocVuVKZKDahiJk2vOIkykNrkLNW -DhPspLOCSlBHFgqIv9sOrOiFfuvkYd0xl547whMFaTBcIKfRKQa6B/jWIn2FYizX -gqrOqqOCMV0x8vftIq4sPQug1sLwLY/XqFpES2M= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBncTBo +ME4zOU5SVGpKSjc3NEZqUzR5SjROaFJCSENBYm9LVDFvTjJES0hJCkRBUFpMREw0 +TlVmRDdBa0l0b0ovT1hvUVd2UTdwOGpiUVFYcFUzWEQ0NXcKLT4gc3NoLWVkMjU1 +MTkgZ1BJZFpBIFllYzVRYnd3YjlxSzRyS3h5eEZjU0lVWHpxZGczclhaaktUcm00 +dGM0UUkKZERMK0tYT1VhTEF3QktZbTVEdWt2RWxVMFVQMVFpZkhQSTJ4YUFhTkZw +dwotPiBzc2gtZWQyNTUxOSBkYk9laEEgazVlbk1FYmhhdmR0bkRlbWtDaEd1Z0Zn +Zis4Q0xGSzd6Wi85MW05cHYzZwpQV21qcExPbWRDOUlrU2hvaUh4YklaOXVmdWJX +bzhmdXFCdGV1RDI2Ti9BCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyBSajBGSGRWbU0w +WlVxZnNYazNtQmFFR2Jla0RBNUNFUnRFZENwMGFtd0JNCkJRblZCeGtya2cvTmxa +K0RuelpvbWZWdVBJOFdiS3R5RG1qdzJxeUlsdVEKLT4gc3NoLWVkMjU1MTkgV3lJ +RnpBIHZzY0tzaXlBRWZyRDR2MUZSMFgvYTA0cGllaHR1WUxBSXpkMlFtMThmd00K +dUtkSVNUQm8zbi9GT3M3bXFLUUthM3NUcWM0V3d5aExHdm1ZS3ZWYTJ1cwotPiA2 +alEtZ3JlYXNlIDdNWUg/RUQlCnFTNm9MTlNXb3FLakpBcWlscUNVeW1nVVE3awot +LS0gOURSUzZERTlGdzkreUExaHk5RFAzaGNMV0k2RjVSb25IUzh6blVDVVVIQQrl +HDwWLbRpsBicH17st/NUKu6y3qE6Wi8G/ZwDgdU+1U1qYGunChXVHbQKhUrTwQtz +3xFk4hltDVqtaxilOATK/S/QspS4nXF0d9YtQCBeb/tl9TxC/ZPSaXkbtK7UT6TY +HSOZuEgW/hhVMqkDmxznzyhEPyg1fYN/cNb08EhfMC8cRQm7zJBii7EY/OddT8ee +o5majAycxpang+aghdE1lccnZzHBkMTMJyBhsRDfehnkp8dbpbxgRoLpnLYdG4Zt +9sFp1sVqSpUgaByDu6bxbiB7ZsiGUqI/+X8xRpcSu1RfLSfWFS632FyZrN/0QetJ +8yxT/ODfq1yq3h3mgBHgkxg3YTNIoJH9XY8Wr/dr+/PDg9YWfa/TEXw4xkFkab96 +vyfwFT1pJ98OhA/fuyXNUOBja6UojWNYnnE9kcA5jZR1pwDU5xtGniJPkMsIpKfz +BBZbUOUvk+pjOTMUBm/comv4KtVUqCVD13LZApmcpQN/1Kum6asapsuYpKPDPgxd +PpT9QvH1KCIEevC7ntEyNWcLlPnGiz4vMDGZWaaVD9N0jsf+kXscOzkvEAqkS5b4 +nEA/Z5kP4NP0Bg== -----END AGE ENCRYPTED FILE----- diff --git a/secrets/ssh/id_personal.pub.age b/secrets/ssh/id_personal.pub.age index d0da8b3..0bcbb49 100644 --- a/secrets/ssh/id_personal.pub.age +++ b/secrets/ssh/id_personal.pub.age @@ -1,17 +1,19 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBmbkJq -UklUejVZRjYwUEE0Sk1XM1VWLzl1aFltSFo2enkxOU1XWFRTcGdvCjU3ckk2bktz -YzNHaVZCU2p6cEF6QmsvZldGd2NwV1Z4dW4vQlpnbDZaaU0KLT4gc3NoLWVkMjU1 -MTkgZ1BJZFpBIDQ2REw3Y0xPbjNudFJDU0w5eUZ2OFE1aVdJbE9nYVF0YWtPTDVz -Zjc5eVEKdVBXYng3NjkyM0lIZStOZEVERFVXN0grbU9sRjZ1TmFONVBGSlZJdFFj -TQotPiBzc2gtZWQyNTUxOSBkYk9laEEgc0hTUUR1TVVrNUtZS0lxSGlCUENtbXRJ -a3M3aFdNcnF2SmMvRWJFVzAzMAppQWRodzFZUjc5WWxaZElTRFNGWUU1VDBrZndK -c0NhbEY4M0lSSjJJbHE4Ci0+IHNzaC1lZDI1NTE5IHR2L0N6ZyBUQk9uVWE4Mm1u -YzEzSVRIeVdKYjJhVXphOEUvNEJDN2dGMjhSNlUweXhnCmF5am9ncTY3bEk5QVJD -TCtoYnV5Zk9qbUdqaytOeVlSMWhYNUdQSXZSUFUKLT4gV3ctZ3JlYXNlIEItNCBe -TFUnTFNKCjlEc0orajB3UXFzQ0ltY1ZTWUZrNGpSdGtnWWxYZlE5R29nc3BWdXgr -Ujdyc2p3a2s2T0VQbm5HcGdUUU1MM1AKaEM0dnJnCi0tLSBiOXl4bm1SenQwdm83 -dlYvK29sem5MVnNRQmo0YlNxVnBVcWRTZjllM2prCu1LuhQBXxPm67szbQ9xj6LC -mo7SVe5on7AqoaZXmHxYzefo2+ZAjiOUukkGqWmNFkt3dWLkiuQs3FzQGDZUTS2V -TdOw97b9GpfpISILkBDOhqcUDQsfjVWkcrwLzjhPmozoOd8UrREtvMye24IM6QlK +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyAxazJu +Zk9nNEVQc2xLbGhKTUo2emtwQkJkMG5rNHJZOXVZaWpMNWdZZ0c4CkxpYm0xck1o +Qm40L3pSd0xhOGJucXNvZ0pYNGJwNGhCVkZGU1RzaVQvRE0KLT4gc3NoLWVkMjU1 +MTkgZ1BJZFpBIG5wbk1nYTBZUW9EUHBXNW1WRlJNdkFadlpzWkNhWU1SWXNLZHNH +Y2Z5bDgKNTBlQnpPNE1zc3pwYzFzYnVXMytGOVlRcmFEOU1lMTVTbGdDQ2ZJM3E0 +cwotPiBzc2gtZWQyNTUxOSBkYk9laEEgbkYvZVVMSUNyTmwyVEdEa1YwK3B2akJU +NTRodGZYUkxXdU5RS0dhekxBZwpuTzd2elhmQUUzYUtQcGo4Wm5MS0N3KzRUbHJ2 +TGxURTRsY3J6ejY2N3dRCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyBaT0hlaSs5clZD +QVdKdk9FQWpUNG54WklnRS9xeFdrS1M4T01WMUV4bGxVCnYvelZvNkhESmdFTXJP +Y1BpU2c2RTNHSzVZZXZ6MEZuU3Z3L1dYWWQ1YU0KLT4gc3NoLWVkMjU1MTkgV3lJ +RnpBIGFCVXNuNzk3UlcyQm94SVkxM01GWEpNNmFWSTNPekN1a2YvUnd3S0ZPWDQK +UXgxTVBua3VsTFRxMmNRZWQ1Zm11RnVFZmxvSHJ0U3l2L1R1VFBXMmFVQQotPiBh +SFFcakwpJy1ncmVhc2UgSDdPMV9eeTggIklmJHAgQApQR3dpenFqUFJRCi0tLSBl +RFlyTU9lVWd0c0RRb01yc3FkbzBnRThSejBKbExsTkVjT1RkT1FTY0ljCnmQ5Seb +SCMmBvMRRKIeeFCN/lwu75WBiiU2nQ8JsSwug+oFhIlGRgJrvGXxkYoIIplQnp3R +oJzEzgqDLrWnBrm/Qs7mUtPD5ziCP6nZA08yklZ5vGIzULg1kGtfzDpm667n4gcu +qE7EsmUlZffkudX2 -----END AGE ENCRYPTED FILE----- diff --git a/secrets/tailscale.age b/secrets/tailscale.age index 534a150..574f211 100644 --- a/secrets/tailscale.age +++ b/secrets/tailscale.age @@ -1,18 +1,18 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBHdmFp -aGt2TnVZWGk4ZDlRMXlyM1NJL3VLeHkxL2dBY1NSdjZzT2JvL2pZCm1raXNFZjJl -WkVzSldvTGpIV3pTdzFSWHJTQUo1ZnRiYVROUG9Hd09nYWcKLT4gc3NoLWVkMjU1 -MTkgZ1BJZFpBIGllSHd6NEFQcU9aYU5oM0xVMzVqME9KT3ZkYys5dkQ4Kzh6azha -VThYME0Kdm1wMHhRSmxNRVo0K2k4UzBtZExSWDFLdmFuOGZPbGhqTGZNM1kxcVRL -WQotPiBzc2gtZWQyNTUxOSBkYk9laEEgSkhMdExiTnY0NGpZR2x2NjhmKzIvc01x -ZnpzRU5YZVZVeEhnMG10NHJRRQpONU1YN2w3SFIyY0xPZ1ZXNHNoMDRMZkxlZVpF -aUd2Zzh6OVVldjdyVWR3Ci0+IHNzaC1lZDI1NTE5IHR2L0N6ZyAwZ2IyelI2RzFN -ZGtIdEg4TXFONUIzR2VITHR1bTVvbHB4WUdTNWR6SUhJCllCSWkrcW4vOXJZSTY2 -d0hpOC80YXF4dm5keE02TVYvSzN2ajFITnJOdjAKLT4gWCM6Yy10aDktZ3JlYXNl -ICggSApxZ1R0S1pEQXdaZ2MwSHRiRTkyRXVJQjB3bDJvTGhwcE5uckJ2Sy9nOVRq -dlJWVGp4R2RMY3doemhDbFcxbWw0CjJrNmovczcza2ZoSFJXUy9oOW1aV01ZcVRN -SGZtSklta2xoNDJBCi0tLSBjZk5uRDIrOWZ6dHdxMnVTZ3dhbzZjY3U5TW9DUEVH -YmVXc3NUaU1lN2ZFCmYpi22O2zbgqVI5VxYf7kCwrSBISM4s0TzeQnxB/BoJJeXn -syVCHBeqWlPxM4fz4+sDjHeL9hNybdcdmHdXbZ5sQx5hmsaVtm6EkoyRB6U+l+1Y -zvVETA5JGEYk0xA= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBQcUEv +c0phVCtQb1hpa2k4cTFUakpmaXVVNUhieHBya2M2dFRmVlJVNWtJCkpzRWg1Z1Ns +bFNnSytmb0ovSlplbkRGNFFCT0orUEo1UWp2WEkvVCthSGsKLT4gc3NoLWVkMjU1 +MTkgZ1BJZFpBIHdtNlA0MFQwOWorbXVJenJrVkozNG12UjVXWU15akFwTEZOaEtJ +R1ZLRlUKa0VlZU0xUXlsS0o0LzhkRXhVZG9LVUFvSUlaNGRHU2M2NlVNYTU2VjFy +cwotPiBzc2gtZWQyNTUxOSBkYk9laEEgYUhwcTdtREZ4K1BKc1RDQVV1MGNUMkNa +Rk9RcUd3QmU0UGNjSUprOEZ4MAoyaGE0b29SOFFZWFFXT3IwL2hxcG40U2p5TmFO +Zkg5N0ozaU41MS9SQURBCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyA4T0pFeENjbWFF +NmJXWDlWdW5hVWdQdzBJbUdFS3Rmdmx4UDY5TEEwWkhJClgzVWlMZ3g0WGhqbVNp +eEYvRG84Ym9qUmZXb1VVZGtEa3I2Yk5oVmQwUHMKLT4gc3NoLWVkMjU1MTkgV3lJ +RnpBIDhVbXRGVzFYeTY1ZWFNbG9TZEV1dGk4S0c0UU5TejRUclNaY001L0ZGRUkK +SzBJZ3JHamw3emQySGhHNGdkZ3lNYnFVQzdEdzhXUFZ0K2xVcTZqaSt4NAotPiB0 +fW5VMkktZ3JlYXNlIHhHU1BlIEBKIG1PfmE7YQpsOHd4VmR3ZgotLS0gZ1pwZmJL +YWttZE1ub0dHZU9HZW50ZHJabms0TUt2TWpsRnFFcDN0Y3lwYwrw5I7QMzXpVBIu +RjMKomaYUiNRVzgmSoajFNgoUxRsPs9dhH8qnXHnTSvHgvvH/IJum3yZBcdG1hMg +JJSVw9+Nk0iMqtZv64H0TGGw0vR7RgJqolAf7yFJu90PutJo -----END AGE ENCRYPTED FILE----- diff --git a/secrets/wifi.age b/secrets/wifi.age index 6a15947..4e8dcfd 100644 --- a/secrets/wifi.age +++ b/secrets/wifi.age @@ -1,19 +1,23 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBHNGdu -TDliOHRJR3B3WTFHUXhpbFBxSVp1MDduVVNLQktjdjhLM292ZmgwCnQ3RUFBeWJH -bjA5djN1NTVydXpUOEFHL1VsM0FhaEVQTjg1eldvQlREelEKLT4gc3NoLWVkMjU1 -MTkgZ1BJZFpBIDhEK0Z2WUFpVE1aVEJISEFESWQ2TjluQ080R3ZObE1CWTRXWmkw -WkJjV1EKZUt5dnpVUmNVd1JtNmdsVzh5Y3d3djZMRlFnc3ZlQUlQbFlHYWg0UFky -WQotPiBzc2gtZWQyNTUxOSBkYk9laEEgb2I0aTZFdkZUYXVDbkdQT29HcVNSdjhH -Z08zV2VTMjVpNGorZjd2MWFSRQpqVkJJQVk4NkljNmxCYWdCelBDYUZDcnFWOEdO -T1dhWllUenFtOW12TFBJCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyB4YzkwWXpXZnhw -MGFTTW5wTUJ6UmV2SmZZdjFaSXNjMTVJTjJEaEtaRjJNClpEOU1YVm4vSThMbEYv -aHA3K2x2S1dTUERYZnVIKy8waG02L3FGendwL28KLT4gYG18MV5Tey1ncmVhc2UK -YlZPdmRuU2tDeGt6eXpwNXZhaEhON251REZOaXFJazFtRGRuV2NzYjZmekplMWVn -dW9hdUN1M0N4Q2VSSGM2cQpWOFA4YjJxZTlnCi0tLSBBbi84Yml2dnNoMm1DYXBI -N3RzWjVPY2lxb2trRE5QZG5VL0czaCtzMERjCgkjWp9LRs8RgbbmrI+TgcmDQHkj -cr25FwOVncZeyEiksdtZpywcltiPjVAT3ufVg2NqmHT8hctsnFbOGYxiT1V1EQ4z -B90Co+nYN8HjCf3ud4bErO/02AQ+I3nUlgS4sgZUz5M3Z9njNqHk8pVQjiZ8CyTZ -1qozgdx9E/G/2Lr5JD61lG8UfkUBGfPDDnY1qqeL0cHye/hLyHb8i0/wJk+337oy -TeccmhkqYkO/X+wJW7nZ/DrThmQ1LZhboZV6+aU= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBhZU5D +UGdQNDI4cFVtQkEwSjJ3Smw1a0NzeEp3azJPK0I3S0FOUnZXOGxJCnBWcjhJRWRW +ZWV6VXBkQ0J2aHplTURleC9ySGk0YmZZdFpLVllNVzY3U0kKLT4gc3NoLWVkMjU1 +MTkgZ1BJZFpBIEZMVEQyTGRKdi92WFhlbzVXYjJYOWtaVEc5ZEtsSDJHUU54UStE +M0F6MW8KTzhCYU9YaXNEd0w2NXZuczA5bzI3d2kwalBuWXJDMDd0bEtPRHMvYTd5 +NAotPiBzc2gtZWQyNTUxOSBkYk9laEEgaGdmcUlLUk8xNEw2UUlaMENlMWJLUzJr +N3hLaHE1WkxPZmh0bXpnTkdCTQpXc1lsMzlocXdoZzNLaVViL3lMa3haR1dqUzgy +UklDakJBTWxUTGVJNXBFCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyA0ZUJIb1dMRnJE +dUtPeVJmQlZTOTZJMy9mTWh4dllBM0YrWG01T0FMMUV3CnJtTUlHY3FZNEp0VzIr +QzVvaXhyOVB4UTVYNXVubENqSmhwdmFNRHNtL2sKLT4gc3NoLWVkMjU1MTkgV3lJ +RnpBIEp3elhFbUkxeTJkSlhJQ0dMcWZ6SDZ6VEZGb2RaQzhGdm92cmNCLzBGeDgK +Ymd0bnZaYTYxWG1hTDZiekNDNHQzZGVyOWJ0dkVUbFpjTGtsZ2t5aUhhawotPiBP +c1EtZ3JlYXNlIDBhTz57IDd1WlsgY1AKRWQyMFg3eFFQdU1vWEJDR1Yxbkltbmdp +S1ZvVWx5N2dlNy9xTCttQ3RKTlRmUGRwOVMySVE4NlN0RXhTZUdRRgpzNFZjSkRw +SmRFUG8zeHdGbTFIMCtHRGNBN3J1QUI2OG81UDYzTkFCaXZFR2hLUXdBbExta1hV +a0pzR0FlUQotLS0gMmozSGVpZUVHMjAyVHN6dWNtd0pHTlN1OFBhVUpjZnNRZkti +WkppRlhERQoA/UmSpvSwxDg/rkJXI5LUafEFY92ZxkerFeMhjqcPG8F2YKnKbnAb +Kpk/pHIQV2Ls9qhtW3cOCTV/ajmzqMUxBcTmXCkBajp8hwyn8XJi1IGpfmVF3Ft5 +8Oxv9ySKHiyeHHEO/f0/i8RcJZsihmjbeSgd8JaV1pmX9vzk/ZykvOsfd+QXvPMC +rIR7vmXJlA+TtPZuvUAWIe0LC9RIGYVHxChY/5ig1Zc+Dgr5fP1fVGIlg8WXOz0v +DsQwayz2LafK -----END AGE ENCRYPTED FILE----- From 9154b4beed730b2b5bb4fa8e67020fe47de672dd Mon Sep 17 00:00:00 2001 From: KoenDR06 Date: Sat, 8 Nov 2025 00:12:21 +0100 Subject: [PATCH 3/5] merge --- machines/artemis/configuration.nix | 2 +- machines/artemis/hardware-configuration.nix | 38 +++++++++++++++++++++ secrets.nix | 3 +- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 machines/artemis/hardware-configuration.nix diff --git a/machines/artemis/configuration.nix b/machines/artemis/configuration.nix index 9470c45..3ea23d7 100644 --- a/machines/artemis/configuration.nix +++ b/machines/artemis/configuration.nix @@ -5,7 +5,7 @@ ]; horseman.username = "horseman"; - horseman.stateVersion = "24.11"; + horseman.stateVersion = "25.05"; networking.hostName = "artemis"; diff --git a/machines/artemis/hardware-configuration.nix b/machines/artemis/hardware-configuration.nix new file mode 100644 index 0000000..d4c7d4c --- /dev/null +++ b/machines/artemis/hardware-configuration.nix @@ -0,0 +1,38 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/f2fdf24c-c97d-4325-906c-17c03be347fc"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/23D0-B050"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp192s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/secrets.nix b/secrets.nix index 501c83b..e131f6d 100644 --- a/secrets.nix +++ b/secrets.nix @@ -2,11 +2,12 @@ let horseman = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPpt0NisTZPYDdumMXhxaKv3JygSE0EKE6OiYw4A8ot7"; luna = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFu+XwTX1vF8Xqlna99Tu50TBT0cmOatb2LLwnC/33DU root@luna"; + artemis = ""; solis = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDKepQ6sJahN0VQTMowIiga2WZBCaNBTadca+OxCV6T6 root@solis"; terra = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN6Mog8ujGXnEZ3lXm4zrYclh/0xx4LhZV2U5zqqxALE root@terra"; artemis = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHDZfBvo7QMA+V/Taxk+xU6jBDzVEz+1pJGmHkCE1rOH root@nixos"; - systems = [luna solis terra artemis]; + systems = [luna artemis solis terra]; all = [horseman] ++ systems; From 038ac46a4907f843c0c31e176f367f8cdd38f1d5 Mon Sep 17 00:00:00 2001 From: KoenDR06 Date: Sat, 8 Nov 2025 00:34:35 +0100 Subject: [PATCH 4/5] rekey --- machines/artemis/hardware-configuration.nix | 42 +++++++++-------- secrets.nix | 1 - secrets/ssh/config.age | 34 +++++++------- secrets/ssh/id_github.age | 50 ++++++++++----------- secrets/ssh/id_github.pub.age | 35 +++++++-------- secrets/ssh/id_personal.age | 47 ++++++++++--------- secrets/ssh/id_personal.pub.age | 34 +++++++------- secrets/tailscale.age | 32 ++++++------- secrets/wifi.age | 39 ++++++++-------- 9 files changed, 155 insertions(+), 159 deletions(-) diff --git a/machines/artemis/hardware-configuration.nix b/machines/artemis/hardware-configuration.nix index d4c7d4c..549dd9b 100644 --- a/machines/artemis/hardware-configuration.nix +++ b/machines/artemis/hardware-configuration.nix @@ -1,30 +1,34 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/f2fdf24c-c97d-4325-906c-17c03be347fc"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/f2fdf24c-c97d-4325-906c-17c03be347fc"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/23D0-B050"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/23D0-B050"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - swapDevices = [ ]; + swapDevices = []; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/secrets.nix b/secrets.nix index e131f6d..dfcc6c1 100644 --- a/secrets.nix +++ b/secrets.nix @@ -2,7 +2,6 @@ let horseman = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPpt0NisTZPYDdumMXhxaKv3JygSE0EKE6OiYw4A8ot7"; luna = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFu+XwTX1vF8Xqlna99Tu50TBT0cmOatb2LLwnC/33DU root@luna"; - artemis = ""; solis = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDKepQ6sJahN0VQTMowIiga2WZBCaNBTadca+OxCV6T6 root@solis"; terra = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN6Mog8ujGXnEZ3lXm4zrYclh/0xx4LhZV2U5zqqxALE root@terra"; artemis = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHDZfBvo7QMA+V/Taxk+xU6jBDzVEz+1pJGmHkCE1rOH root@nixos"; diff --git a/secrets/ssh/config.age b/secrets/ssh/config.age index bd8d3ae..9d25cf9 100644 --- a/secrets/ssh/config.age +++ b/secrets/ssh/config.age @@ -1,19 +1,19 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBsOXZN -YTBqZGltbEo4c2FMcU5XbnFtaE1aL2p4NFpWMmRSY2pWQWtNbDFvCmE1MkR1L0cr -dXBCZFJ5clRaMnQxZ0piOFd0MjA0MTVGTVFPQzhsd2c1dWcKLT4gc3NoLWVkMjU1 -MTkgZ1BJZFpBIFNFRkExWk5SblNFbmV3bnRjdmlsb0R5OHZXbk9UcnFyU1hYK0Qr -YVFwRVUKR0ZkNktwWm5SbjgyM2ZsME9GOE1SQVdqWVkwTkZ6UFJjdHlaTGwycWNI -QQotPiBzc2gtZWQyNTUxOSBkYk9laEEgYk5GeGE0ZWVtOUhsaFdyZC9RT1pTQ2dR -Y2s1cHlQYU55OEJ5VDMrcmhTTQp3NDk5Mm5qR3h1TFoxNm5vaVVUR1ZMaGhvdlIy -dzVUa3kvQzdyWWl2K2FZCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyAvQ0NkaHREN0tD -ZzZMdUtaQytyUEdDOUZvZ2JNM1c4Y1ovRDF6UGFtc1MwCk85TG5NQUp2MEk4bWg1 -NHgvUktuUXJLU3U4TGdJU1VHazFLN1dPdWNvMnMKLT4gc3NoLWVkMjU1MTkgV3lJ -RnpBIFROWnlTeU8rTnpuenNTbDMyRnREREpqRk40VFdZeHoyOUxGdFYwTDI5a1EK -U0U1Y0ZWMzQ4RjluTXNwUGpkVTM5ZkZxNHU5ZlJaMnpxYXpNMlRMR21QOAotPiBV -eCg2LW8tZ3JlYXNlCmdqOFJibTdBZk50Lzl5SVk1SVBxL1V0bmU1K1YKLS0tIDFM -czUxQ0c5RnFSVkdIUGRoZkZUV3loaGZ3cFFMVzVyazdrMWtaZWxMTVEKA9f56ZsQ -q9I8pqE3hPWYAH9Z711+OIozWmBYQxLkL5pt+ZJBtgXrfU8lC1BqzG5mH5CUkIYb -W2p32i/2AmjLkMzXmUU35BiI1ixZ6rBxsY6E6dx5PVC0XXK54CGmPpi0qnLaFEvn -mQ== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBmMWtF +czZHSVgrS1dqVy83RmNPZXFwdUNrUjh5dG02WDZqUEYvem1iSEJVCllXVVhZOEdQ +c2JuRGpnbW1LVlQvcE1SQUdqY0FTSUFhcTdCcVdhZTBValUKLT4gc3NoLWVkMjU1 +MTkgZ1BJZFpBIGxhcVZ0aWNzWFVOK0I3UjBjWDF3d0NjVGE4UHJOUHRtNkNJU1B2 +ZllpQ2cKRU9GbE5JQmJtcU9uam1hL0YwVHFDdWN4cHo1TndkR2VsTCtKL0NLKytj +OAotPiBzc2gtZWQyNTUxOSBXeUlGekEgKy95NXFuUnVKQkNMU0RhdTY1VzZzZlI2 +YzVwV0xiemhUTXpIN1pKSVBDQQo0MEg0cVNtam0zK0ZzZHUxamxzN1Z4REQwQUo3 +N3dHaWQrdjBlZ20xM05rCi0+IHNzaC1lZDI1NTE5IGRiT2VoQSA2a2l4NFZ5THZm +NzJjOVR1MnlobXNkbDFFZktibkpWN25WcXZRdS9LZEJjCmFoWFF5djZwaUdRWWUy +ZzNSd0Q4ZThhQTlWOW1iNDhxOGs4bzg0elRkNGsKLT4gc3NoLWVkMjU1MTkgdHYv +Q3pnIEgxOW54QXg4bUt1dWl3T0V6ZzRqcVpRenhZS2NJc3ZJRmN3UEp3OU9Vd2cK +UXlDdkFEdTJ0RkxVVnhsL0NwQk5WNk5rWG1JMEdtekpUbzNPZitlWWhaOAotPiB4 +Y35GLWdyZWFzZQo1c0RubExLSHQ5ZENCYmxRQjh1eHY4ZUVDbVY3N2tTRE5ETGZS +Qy83S0V5RURWN2ZmNUZLN281Qnc3alFONit3ClNkVjZEU3p3Ci0tLSBVSHBsK2tN +aU1JSE8weVpUTlpkNFkyVWZLcXlOSFF4SVZ5bVdPa0NZYkUwCoFFwl634ek0QOzV +axg3XTEOnk/T12up1ePuU9suh3HbUbo9uTuFj61mh1XVmje5JcShrBmzBW3zyGhG +32JDANj3qdpBogGlzsv/pRwsvRUBuW2ab1JSIGZTR3mwBPWyPYxmStMuvg== -----END AGE ENCRYPTED FILE----- diff --git a/secrets/ssh/id_github.age b/secrets/ssh/id_github.age index d24fd58..21c1b7c 100644 --- a/secrets/ssh/id_github.age +++ b/secrets/ssh/id_github.age @@ -1,27 +1,27 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyB2TC9a -c084ZG56bERPT3VYSlN6cUludnJwdjQwZEVsRzdoUXdpSUVWRUJFCmxZc2JETEJq -Y1pkdStMSXhTa1VoR3pDVmJRbk9pRVYxR0VIM1JDTG5aL0UKLT4gc3NoLWVkMjU1 -MTkgZ1BJZFpBIFR5d0lxeURTbWJFQXhGVDhQQ2lVV0xndG9ZbVdLeEljMVpwVkNR -aGtzRGcKdWQ5SHhoYWtrM1poSis1dlRoUHlIQmwwc2hLSGdQMHZzTkZzY3R2dVhr -cwotPiBzc2gtZWQyNTUxOSBkYk9laEEgZTdzMmtLSHEwd0ZJV0lTaG53dGtuU2Q4 -VGorZHZmUHlzZVBFemZ0SCtURQpMYWRjb3NUbE1RaStxV004T1BJZ1BseG44VU95 -WUh5QnJKY28zM2JacTE0Ci0+IHNzaC1lZDI1NTE5IHR2L0N6ZyB6UGZlSkpUOFYy -VVVpM05pZERYVE44aDVoK0VzN1lBMU04TEZmcy84OUVZCmliMXpDTVhyYThXNUt0 -QjZCY0hzZllucHlGOG16UE1xUUhyLyszN2JKRWMKLT4gc3NoLWVkMjU1MTkgV3lJ -RnpBIDZoMFBCc29QSFFnaGJZNUFMN2tRcDg4QzdibThnK0dtMklTTzUzdlR0V0kK -NW9ib2ZuWnppaEN0Q2dRVVJrWU9iaDk2bElZVnFYWVhHQW1CQVUrMjNMUQotPiAh -WmAyOXEtZ3JlYXNlIFMoLyxkCjZmTjd1L0lYa3B0THFWNkdqOTIreGxseHkyMUl2 -QVdhZXNuUjczbjNJUzhleFhENWp1T0IwT3kvamxmeGZvOFIKaDVuZXBlVkorSFo5 -M1NoaW5YcUNEamNaR2xjYUZmNkRhZUJGMzZFNWJaNmt0NUdrU29YNEJXTQotLS0g -eU5POUxDdmdVSTlOcDZ5TmI3MDJjc05YbnBlNWkzRlRLUklyaURQSG83TQoGKkAA -jPHg5N7uwUZACbRhg/0Emuu4q53cGhewnJYeqIWsuic8OsBdmlWsRJHsmpB4ygiM -nSXUxauZ1kvAb6ujBeHAl1mNPf4Axl9joZby1WnaO5MYqK5GwXzo09taagDTfbIg -Wvsv+i0HfrJmUHz684GlZxUWXghlSuNlVVizmad5mcuCHHClC0YW+U3qQQ/A4HHw -WWocC0bb0cE9GGJkSsSb2lBMYj51EGNZ4H+GnAw6cfZYhaKtQt0b/VtjS68gFzTl -yxTyhgFTB4neEjGk8N7YohkpcGgPfY1jQsP2ZAcpWW7JX6lEPFvob3MwUFOOAhTf -DeqFg3ghPsGDqluOZDipaVZTqP9hct5LW050nVW4onTqlhldqXegAmhpFC3esONC -glmQ7dxn6tZOQ6a7JrlJ6Al6qkJmgRE5yYA3SWEnj7ZvgSG7057HsRbdlXfUTRJG -V451IOOswZJMGabHUCkwUc1r49c3dS0GSr41hCK73i7UtcKrqGQ+y29oxMbfYXP4 -nWipP6jOsn7dPRXbvnusM5rPOEmAv3+efH+Jx2oymN4Ds5vdBUBmJVkGPQ== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyA3T0dh +U1c1bHhtZWpCUG9ZNW84QjUwUXNSYkdCR1JLeDBsMFIxSkY5YmtNCkYxczQ0VU9Y +amxxTVVKUWFDbHFvQW1WMzZ4RlQ0Q1pObVBpeG4zSC9ZR2cKLT4gc3NoLWVkMjU1 +MTkgZ1BJZFpBIHZoTkp3RXhZN2RWbWRFODQ5Qjd0NjNOdDBDYWlWemozaEFZdDJn +K05Ja3cKNGpEVFg0Y0RnbWpDYXBjVm5ZdjZzSmRONFJHVm0zZEs0aURDUS9sTG1U +NAotPiBzc2gtZWQyNTUxOSBXeUlGekEgVXNyWmJWSWo3ZEpyMm9RSUh2U3RrNHRj +Umx4UzJmb2l3OFNMcGk3TXJBRQp6Q3g0NDhlU1piRU96dnRscjkvczFrV0tsQTJi +NWt6TzdNOFp0OEQrd3h3Ci0+IHNzaC1lZDI1NTE5IGRiT2VoQSBnNXg3L2czK3N4 +RkxEOEJIWE5GYXRFYjRrdkVJc3UwemxWNHJtYW5Sc0U0Cnd0dGpEOHZKSmNJc1NB +L3NiU0I5MzhUVXI2aWxoaXRXdEczWUxKQnZSRmsKLT4gc3NoLWVkMjU1MTkgdHYv +Q3pnIHJUV3RROFFJU1Y3Q09CL1ZZelM2dXE1QVBuNFRWTXc4dHpmUm1uVjh1U3MK +ZDd2bkJiTzBKVThwTnM4NVB4cVVjVk5IVWZPZFpRckhYVDEwWWFvWVdLMAotPiB2 +TVF6LWdyZWFzZSB7IyAuL3ZXJUEgLztLUTBqCllaVTNLaU5RbkNqazVGMXkrWG1P +eHNaZzF0b1FLdGZTNXBlTkxRbDhUSXJyMjJuRml5SUZEczNhcDVHa1JKdm8KVXk2 +S1VTYi93NllCMkJOWlFMakdPeDloNFc0VHNzcW5FZkZXQnlJTU8weTYKLS0tIFJl +am82aStUcFQrd2dPVFZQVG9ieWk4akN3bU9yaU1tRktrVEUzWG9JMmsKOvYWV88D +57oeykksyDLaYhO4isfg/x65OKD3uL1VXgDAXhB+QXEJE8c99vZIHqlReFcS8rXn +6mCfCGbY25GBX7gX5KosQYT2kgWBT7Um8Ib6qLf+fYpTcSR2GFoEJ5bHDTd8r2ht +smBjjXq43F8OzRNiuYlwnhDXxgbSDMBKmG3S72YKQ55yDbWj/sA5mJ+2089tkzJ7 +uomz8inVubelSxXHb+S2Ba04IcDf04O8Nfpt+avRgCEzFt20RMUiuJ/jOZzFvrY2 +lLUAl1Alc7bfuPnllKGyzhDX2qwUtKbVJM8Z8SFtVH3sjOGhMJJmSQLCY1yvbPWH +TXDLhHTFXcV+QaufR5G0T7yh1YSIrYhPY6g9uJjNbxckPtTqRFweWy4w3voUFjHE +Wyoer8niPGWVR5ntd+vgWtSruPMP5DTYJvJGgoxSNRVCWi8tQl2Csij/MpYnMoIn +aNqKYh9W6pAZCqUZUAd8Qat/5B6v745eV/KMx3oap6W2lPPL5DbU1J1ELkPnZGUB +ET/xvt++BKKOKw/tkMr0/Lz2J+Y411ge5heN4UiKx0yndAQLool+UG0= -----END AGE ENCRYPTED FILE----- diff --git a/secrets/ssh/id_github.pub.age b/secrets/ssh/id_github.pub.age index 2c23bb0..6a50e22 100644 --- a/secrets/ssh/id_github.pub.age +++ b/secrets/ssh/id_github.pub.age @@ -1,21 +1,18 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyA5Q1A5 -c0ZLMDFwTTM2am04YUYvOHFDOC82TkdFM3hnUy9VYU9USHQ3OUU0CjJiRmUvenNK -azVLdWt6b0FaTzh2RG5SUzFwSHJwdVJTQU0vMjJaZkhKMVEKLT4gc3NoLWVkMjU1 -MTkgZ1BJZFpBIFZTSXRwMWZyS3F2Rk1rMURWRXBnODcrT0VQMmZsU3A0bER6eWc5 -Wm1YU1kKeUJlNG1tMmV5UnVOdFQwL2tJRVNNdS9UZE11UGhjelE1YlpYaCtDYmZy -cwotPiBzc2gtZWQyNTUxOSBkYk9laEEgNHJyMFZzTnptOU0yU1pQb1FrbzBLNEla -dUIxZ0I1WEpFR1RzNGZZcGtGTQpNemRVN2lMSkY4aGczQTVJdFpZSXRiTGJYQzBN -ZVhOcG9NdDB2QzRsSjhBCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyB2bG40cTRYWEhu -M2NCYnBtejAyYWpCZkJkbkNzKzBLbHpUZk11ay83TXhzCit4eG8wTDZTbklsQW42 -VlIyak02OUpZUVRwYnBaamk4eXd4eTduOGpNbFkKLT4gc3NoLWVkMjU1MTkgV3lJ -RnpBIGZYMm1SN1M1RFY1bmdEY3FoU2F6b3hwU2psNzk0SC9CWGh0UW8zaVlTWEkK -WlJ5Z1hoNEUycHdrY2hPZyttOUM4UVhwclozdEtVUXdUdm5zRkZWTVhVcwotPiBq -LWdyZWFzZQpVVk51ZEVRRXVFTldsR05admRtNnFrMjR4MUhhdjZuODF4OC91bUtN -NlJRbWZjM1BVSXFXcDZnTjdyUDRNczFqCklUVVlSeVRxS1ZlZkJwb2VVTmlEcEZp -V1JlT1RBc0Fvc1RWejBhbmxhZU9NTi9oN2FUYm9tUQotLS0gSnF0UXNYU1RsQ2Zw -TFE1NkZRSlAwV1d4c2h0QmdnUGtiYlk4S2lNOTNHbwpMF18zewdWEyF6/z3LSzr2 -yGjmmBgyN3VkeT5BJX4UuqgljXW7mGjy/KBLFOvK8GN+AS+cYV/rARGIlbAL84xd -psHXrZIbZdKgUCcXhRRPPeIsheWAXaQfIoRQ1FS9wIFcYl2p0L70i38Lad4AQ7nF -Xg== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBTa0tJ +MTIxakY2QjBVS2puYURoNTRmRE9XUXcycFV4NXQveXZEdjFvM0hjCkZ5MkgwRXJO +N2Qrb0RqSFdTWjFoV0lYaFhvbEVSd1MrN1VJSElLMDJEN3MKLT4gc3NoLWVkMjU1 +MTkgZ1BJZFpBIGRxajZId1hkS01WSWFaaGVTbzk1T2RtUmZHMzVRQWJRVzFWL3N0 +cm5oV1kKS3lFRzNjbEFVZEpqWnVOWE9zeVVXMjI0Ymh1YXcrdjFkbmsxSDZZdnhr +RQotPiBzc2gtZWQyNTUxOSBXeUlGekEgUzQ5L1k1dlN2S0NnWVphZURrQXN2dzli +MmsrMEZHMnd2dFpxcEQ3eWdSMApLSWM3MUtoL28wWE1tV1lxUVlrOEV1Rm4xZ0Rj +RlN4Q0I3OEdrQ2JhSXdNCi0+IHNzaC1lZDI1NTE5IGRiT2VoQSBMUzFybmNFejQ5 +TGxTNkh0bDVkOG0zeGxONGtnekFralVPS0k1ZkNCMGw0CktRRnI3cTZKVkdzVCs4 +TGw3MTRKa210L1BHL3EzOTZQU2RzUEFkWXdFbUkKLT4gc3NoLWVkMjU1MTkgdHYv +Q3pnIEo3SDlxKytENTEzckZYOHlsNG1NbEZLbUJTYml3VTZkT1F3VSt4WitzR1UK +TjdXcFBNeUZvWG5MaGdESnJzZDZHaHVGU1VkNjgrVWsvaTYyVUF0OGdhcwotPiBf +NyotZ3JlYXNlCjg1RWl4bGtuM3lTbgotLS0gaElSVFdYUVpKYUxyYTVha3h4d2FS +dGF2Q29QNHByOGxxNFgwSjMxSTFiNAqOKcR8YKAtvuT/Pvr7I1lxM1+JEmMrvH+C +aaMN4vzB6VRafAK5auauUO0f06bPd9MaL82qG6Gcn+3EONjlJUfVw5ES5mUFkHsF +QOmd57N2cLy1n9MY3tcZazyt3+2APQo1NkK/cq1m1BTGSRxqDUzTsg== -----END AGE ENCRYPTED FILE----- diff --git a/secrets/ssh/id_personal.age b/secrets/ssh/id_personal.age index 58227ac..c9d4db9 100644 --- a/secrets/ssh/id_personal.age +++ b/secrets/ssh/id_personal.age @@ -1,26 +1,25 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBncTBo -ME4zOU5SVGpKSjc3NEZqUzR5SjROaFJCSENBYm9LVDFvTjJES0hJCkRBUFpMREw0 -TlVmRDdBa0l0b0ovT1hvUVd2UTdwOGpiUVFYcFUzWEQ0NXcKLT4gc3NoLWVkMjU1 -MTkgZ1BJZFpBIFllYzVRYnd3YjlxSzRyS3h5eEZjU0lVWHpxZGczclhaaktUcm00 -dGM0UUkKZERMK0tYT1VhTEF3QktZbTVEdWt2RWxVMFVQMVFpZkhQSTJ4YUFhTkZw -dwotPiBzc2gtZWQyNTUxOSBkYk9laEEgazVlbk1FYmhhdmR0bkRlbWtDaEd1Z0Zn -Zis4Q0xGSzd6Wi85MW05cHYzZwpQV21qcExPbWRDOUlrU2hvaUh4YklaOXVmdWJX -bzhmdXFCdGV1RDI2Ti9BCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyBSajBGSGRWbU0w -WlVxZnNYazNtQmFFR2Jla0RBNUNFUnRFZENwMGFtd0JNCkJRblZCeGtya2cvTmxa -K0RuelpvbWZWdVBJOFdiS3R5RG1qdzJxeUlsdVEKLT4gc3NoLWVkMjU1MTkgV3lJ -RnpBIHZzY0tzaXlBRWZyRDR2MUZSMFgvYTA0cGllaHR1WUxBSXpkMlFtMThmd00K -dUtkSVNUQm8zbi9GT3M3bXFLUUthM3NUcWM0V3d5aExHdm1ZS3ZWYTJ1cwotPiA2 -alEtZ3JlYXNlIDdNWUg/RUQlCnFTNm9MTlNXb3FLakpBcWlscUNVeW1nVVE3awot -LS0gOURSUzZERTlGdzkreUExaHk5RFAzaGNMV0k2RjVSb25IUzh6blVDVVVIQQrl -HDwWLbRpsBicH17st/NUKu6y3qE6Wi8G/ZwDgdU+1U1qYGunChXVHbQKhUrTwQtz -3xFk4hltDVqtaxilOATK/S/QspS4nXF0d9YtQCBeb/tl9TxC/ZPSaXkbtK7UT6TY -HSOZuEgW/hhVMqkDmxznzyhEPyg1fYN/cNb08EhfMC8cRQm7zJBii7EY/OddT8ee -o5majAycxpang+aghdE1lccnZzHBkMTMJyBhsRDfehnkp8dbpbxgRoLpnLYdG4Zt -9sFp1sVqSpUgaByDu6bxbiB7ZsiGUqI/+X8xRpcSu1RfLSfWFS632FyZrN/0QetJ -8yxT/ODfq1yq3h3mgBHgkxg3YTNIoJH9XY8Wr/dr+/PDg9YWfa/TEXw4xkFkab96 -vyfwFT1pJ98OhA/fuyXNUOBja6UojWNYnnE9kcA5jZR1pwDU5xtGniJPkMsIpKfz -BBZbUOUvk+pjOTMUBm/comv4KtVUqCVD13LZApmcpQN/1Kum6asapsuYpKPDPgxd -PpT9QvH1KCIEevC7ntEyNWcLlPnGiz4vMDGZWaaVD9N0jsf+kXscOzkvEAqkS5b4 -nEA/Z5kP4NP0Bg== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBwSHkr +TVdRMm15RmtBTFdqMEp0c25tdDE5OGRnY1FBckhPWm8xUXNJVHpNCjNBdjBMQUhz +cHd6Y3JvK0pGOXZoam9oMG5xYmt4dWxrcWl6aFl5aWxpOGMKLT4gc3NoLWVkMjU1 +MTkgZ1BJZFpBIHdkNE4zenNwOTgvNnU4OEZ1ZnNuY0Z1RThqRDVaQWtCemJHUEQ2 +cEEzREUKVVVpQzJKWENJNjhZdkJCTFVWNkZPZ3paOVVSR3k0R0hwMWUxSDZqT2tl +QQotPiBzc2gtZWQyNTUxOSBXeUlGekEgd2l5Q2VCWXpXQ2UrdGR3N3FlajZOalpF +ZDc4SlpkVGtrZHY3NkUzYWhSWQpTU3hDWVJrUTJBR21KaUNla1Y0Vk9NRjdBckZD +enF1VnN2RVdyY0o5TVQwCi0+IHNzaC1lZDI1NTE5IGRiT2VoQSA0d1p3Q3NwVlRW +eW9mbXlzeStDOHJ6RkRhYzI2UUF1RFR2TjA4L0RxdWxvCmhJVnRTMFlDUXZRdlpq +eXlXQVhuaUxEMzFXMkljWTVUQWMvODdidC9iVjgKLT4gc3NoLWVkMjU1MTkgdHYv +Q3pnIEhtOGFORkFmY2VzclpuUDhsbW5LZmZSd0NUTHhmVWF0dFVrS2JFaUY3R2MK +TGhsSHFwQmxIZDZYb3ZmR001Ty83Y3B4cDhQbVdyRHlYbmlEUDhzeGx5WQotPiBH +YVEtZ3JlYXNlIFYKeW5FCi0tLSBZWlhRc2wrYTlLY2F4WGVrSVM2dTV0aUhEKzRP +Y1VUNlk1RWZTVmg3NUVNCmR5TpHEH4ReWh68F0zgcnItnwTAXlnvWmG8a4MRAgq6 +3/1gifhALTDatHTClySgNwNS5zUQfDBP2zHhzczf3ZD04wslAzsdH105u9uu8sbw +uis3B7sV7QeSDo34xAzYYFCxc/KbDBK+VDwbca6frzPWJ/Kud6qBD9tI/Y2n4OTh +krVgVaHwiV86Kl685Wvo+qD37fLESZnjWyRmLt4HXKo3MtdHDc+WEUGHAw9B27KK +GGoJ6gDWkmzu5aErEHvRWHZAiyAFK38HrLySdfZusBi/xIpZrvxZyknDFVMQUxeM +rkFtswSh/IpItWC6VCJmNr4drVMWY+86QdCtKdGHhWTXy1I58VPRAhwHJKBx+jyB +jji2xzvLbUw3/H3st0cGK8un12j95d8wibTq+oVEaF9wkMh2Y55jqLXYro6vv5sf +pg5N1OxeZTTsWGkobDdrNbSylxwXYnNr/2CfhiQMtqXFQ5YWvjHuD2em8vzKIFil +aIGplN+6iDn2VUFtCrqmK08+ogXfsz6OtJKR9zkDLa7L6r1uHOJYnNvGc/FCdELC +oZPeISB7CZ+VLQZBNhE8ZhxOJVhKimeIChOr -----END AGE ENCRYPTED FILE----- diff --git a/secrets/ssh/id_personal.pub.age b/secrets/ssh/id_personal.pub.age index 0bcbb49..13529d3 100644 --- a/secrets/ssh/id_personal.pub.age +++ b/secrets/ssh/id_personal.pub.age @@ -1,19 +1,19 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyAxazJu -Zk9nNEVQc2xLbGhKTUo2emtwQkJkMG5rNHJZOXVZaWpMNWdZZ0c4CkxpYm0xck1o -Qm40L3pSd0xhOGJucXNvZ0pYNGJwNGhCVkZGU1RzaVQvRE0KLT4gc3NoLWVkMjU1 -MTkgZ1BJZFpBIG5wbk1nYTBZUW9EUHBXNW1WRlJNdkFadlpzWkNhWU1SWXNLZHNH -Y2Z5bDgKNTBlQnpPNE1zc3pwYzFzYnVXMytGOVlRcmFEOU1lMTVTbGdDQ2ZJM3E0 -cwotPiBzc2gtZWQyNTUxOSBkYk9laEEgbkYvZVVMSUNyTmwyVEdEa1YwK3B2akJU -NTRodGZYUkxXdU5RS0dhekxBZwpuTzd2elhmQUUzYUtQcGo4Wm5MS0N3KzRUbHJ2 -TGxURTRsY3J6ejY2N3dRCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyBaT0hlaSs5clZD -QVdKdk9FQWpUNG54WklnRS9xeFdrS1M4T01WMUV4bGxVCnYvelZvNkhESmdFTXJP -Y1BpU2c2RTNHSzVZZXZ6MEZuU3Z3L1dYWWQ1YU0KLT4gc3NoLWVkMjU1MTkgV3lJ -RnpBIGFCVXNuNzk3UlcyQm94SVkxM01GWEpNNmFWSTNPekN1a2YvUnd3S0ZPWDQK -UXgxTVBua3VsTFRxMmNRZWQ1Zm11RnVFZmxvSHJ0U3l2L1R1VFBXMmFVQQotPiBh -SFFcakwpJy1ncmVhc2UgSDdPMV9eeTggIklmJHAgQApQR3dpenFqUFJRCi0tLSBl -RFlyTU9lVWd0c0RRb01yc3FkbzBnRThSejBKbExsTkVjT1RkT1FTY0ljCnmQ5Seb -SCMmBvMRRKIeeFCN/lwu75WBiiU2nQ8JsSwug+oFhIlGRgJrvGXxkYoIIplQnp3R -oJzEzgqDLrWnBrm/Qs7mUtPD5ziCP6nZA08yklZ5vGIzULg1kGtfzDpm667n4gcu -qE7EsmUlZffkudX2 +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBrbGt6 +VitDWm9zUFY2R0E2c2tBcUY2bmEvNzJSandiVjlteDd6MGo1T2dBCmdkTkRxRFY2 +REs5cnk4RGpmU3pXbithVHRjZktYTnVxNXpmQ2podnpUdDQKLT4gc3NoLWVkMjU1 +MTkgZ1BJZFpBIDJDMURwYWtXTklCeEtmSlFHczZGcGQvQUFVL1RmcVR0NkY0b1du +V1BIZ1kKM0k2d0dRRmZraUpVMm5aUlV0TWQ5STNmK2NxU2VnS1M2NUJVV24yQ0hi +cwotPiBzc2gtZWQyNTUxOSBXeUlGekEgSnJJV2dHbjMrckpWZnJldTkzaDBqZlBr +dDZ4MmwrMTFpb2EyQWQ3RzBRRQpZRVp4bnd3RE54NllhaGVYYW13dXZ5V0J3NzhK +R0E2ZG1XcXRGTHZncFM0Ci0+IHNzaC1lZDI1NTE5IGRiT2VoQSA1UnNybktkMTRk +Nm94V2FlOURRRFRKN0xETWlKcWZiR3A4TkZuQVRPWEU0CkF6bG1QNXVXL2xNbHZS +TVVTT091dVRVZUtvT20zVkJKL3VkaFRXWE9vNVkKLT4gc3NoLWVkMjU1MTkgdHYv +Q3pnIGFIVVVwakIxZ0V1ZlhjLy9ycWgyWHBmUDFJS0pMV2NaTnIyeWp1dWtIancK +T3ljNG00bkhzUzFXb0hoc2N5NnREcDEyQW51S0RMTGsxdXR5VjJvMHdqSQotPiBe +TDAtZ3JlYXNlCm84RGpjYnl2Q0ZUZEVIblQ4QlI5R214YWdIVkRxcjJZRkdPZ3Iy +clZvTmhyUnJVbmJVS0h3WnlSd2x0VWdGRQotLS0gcEZGTmRTRzJvakNpZG1sSVNq +UTdPTE9KWWZUTCtXK3phdEFWVFk5QzJDYwpa+TLHbUCHSU8UKnuESPf30ZYM2AGI +Cjve0y4uYA80kYSD0q7NSV1RkUXoTgTPRZLxbOBuh1bPQmUfpcth3FRw0xIXlWqF +mJE9RNOqWPf6EquIyt/HrNSlDsRIUuDVxhW0u8Pt0mABZexh222JPe6/DQ== -----END AGE ENCRYPTED FILE----- diff --git a/secrets/tailscale.age b/secrets/tailscale.age index 574f211..158e40e 100644 --- a/secrets/tailscale.age +++ b/secrets/tailscale.age @@ -1,18 +1,18 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBQcUEv -c0phVCtQb1hpa2k4cTFUakpmaXVVNUhieHBya2M2dFRmVlJVNWtJCkpzRWg1Z1Ns -bFNnSytmb0ovSlplbkRGNFFCT0orUEo1UWp2WEkvVCthSGsKLT4gc3NoLWVkMjU1 -MTkgZ1BJZFpBIHdtNlA0MFQwOWorbXVJenJrVkozNG12UjVXWU15akFwTEZOaEtJ -R1ZLRlUKa0VlZU0xUXlsS0o0LzhkRXhVZG9LVUFvSUlaNGRHU2M2NlVNYTU2VjFy -cwotPiBzc2gtZWQyNTUxOSBkYk9laEEgYUhwcTdtREZ4K1BKc1RDQVV1MGNUMkNa -Rk9RcUd3QmU0UGNjSUprOEZ4MAoyaGE0b29SOFFZWFFXT3IwL2hxcG40U2p5TmFO -Zkg5N0ozaU41MS9SQURBCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyA4T0pFeENjbWFF -NmJXWDlWdW5hVWdQdzBJbUdFS3Rmdmx4UDY5TEEwWkhJClgzVWlMZ3g0WGhqbVNp -eEYvRG84Ym9qUmZXb1VVZGtEa3I2Yk5oVmQwUHMKLT4gc3NoLWVkMjU1MTkgV3lJ -RnpBIDhVbXRGVzFYeTY1ZWFNbG9TZEV1dGk4S0c0UU5TejRUclNaY001L0ZGRUkK -SzBJZ3JHamw3emQySGhHNGdkZ3lNYnFVQzdEdzhXUFZ0K2xVcTZqaSt4NAotPiB0 -fW5VMkktZ3JlYXNlIHhHU1BlIEBKIG1PfmE7YQpsOHd4VmR3ZgotLS0gZ1pwZmJL -YWttZE1ub0dHZU9HZW50ZHJabms0TUt2TWpsRnFFcDN0Y3lwYwrw5I7QMzXpVBIu -RjMKomaYUiNRVzgmSoajFNgoUxRsPs9dhH8qnXHnTSvHgvvH/IJum3yZBcdG1hMg -JJSVw9+Nk0iMqtZv64H0TGGw0vR7RgJqolAf7yFJu90PutJo +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBSYVo1 +NnEzRDE2ZmYra1RtQXY4Y0gvZzI4eUh1aHNDYmhWVWppQSt6SUNjCko0N3FMbTB6 +c1JLVDlpTzIzMm4vUzVnYy9nVG4rM2tmWVBnTFUyekVUcGcKLT4gc3NoLWVkMjU1 +MTkgZ1BJZFpBIC9yU0I5V25KK2xOVXFwdzFKcGpDQnlxWE85MG5GWlNoWVByc3Js +dWVkVE0KN3hjSk5hdThwRnFTSmpjaHFBcC9sS3pKcFZUVXc4SlRiRmZla25ZRGgx +WQotPiBzc2gtZWQyNTUxOSBXeUlGekEgU3o5ZVZmRk1qU3RQWU5lcGZmOEQwaTFV +THBILzdaTHJrdGk4dHBOcW1WcworaXdaQ2hudzN4QWpreVI5ODI0Wm5KaG9MdHZ1 +NTRkSWNOcm8vbm5mVnNNCi0+IHNzaC1lZDI1NTE5IGRiT2VoQSA5ZDd4WnVRWkZs +ZkhSSENDN2dWTlIxU1AwYk91TlZXdzRXMWdvQnVlaDJJClNPVUllb2VvaXlrc3BZ +WDNQRjJjZ245V0NoU0M3TWNoNGFaQlE0ZmhnaEUKLT4gc3NoLWVkMjU1MTkgdHYv +Q3pnIGJRZGhYT0lFd2JpaVZBZ3RNU0tqeCtBNmFrL0ZxcllmY2l2NTJ1a0NTZ28K +SGxUMFArdTVpZlZaczl1VXdwekhoaWJCL1ozWEdtbzVkRTd2VzJYSTBSVQotPiBf +UHxxLWdyZWFzZSBkbl9HTzphJCBNMUJSPDYKZEFnM1dndldYZUdXQWcKLS0tIFBi +dlh6NVJDQmxYRHp2dkFVZ2hZZWg2YzF0bkFCMVpYQ1BwZkV4MDdJNGsKpoI5F0s7 +Um6NEB1i9vneoxu6TXmHgoj043vzFTlu8Hs2B0jYm2BcLNd7DBCtLOcmsV6QY4p4 +C9Vl53srH+s6yrp4jv85aP26sdjTg24CuXje/N0GYjiAJJUpWsEUWw== -----END AGE ENCRYPTED FILE----- diff --git a/secrets/wifi.age b/secrets/wifi.age index 4e8dcfd..fe6bd05 100644 --- a/secrets/wifi.age +++ b/secrets/wifi.age @@ -1,23 +1,20 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBhZU5D -UGdQNDI4cFVtQkEwSjJ3Smw1a0NzeEp3azJPK0I3S0FOUnZXOGxJCnBWcjhJRWRW -ZWV6VXBkQ0J2aHplTURleC9ySGk0YmZZdFpLVllNVzY3U0kKLT4gc3NoLWVkMjU1 -MTkgZ1BJZFpBIEZMVEQyTGRKdi92WFhlbzVXYjJYOWtaVEc5ZEtsSDJHUU54UStE -M0F6MW8KTzhCYU9YaXNEd0w2NXZuczA5bzI3d2kwalBuWXJDMDd0bEtPRHMvYTd5 -NAotPiBzc2gtZWQyNTUxOSBkYk9laEEgaGdmcUlLUk8xNEw2UUlaMENlMWJLUzJr -N3hLaHE1WkxPZmh0bXpnTkdCTQpXc1lsMzlocXdoZzNLaVViL3lMa3haR1dqUzgy -UklDakJBTWxUTGVJNXBFCi0+IHNzaC1lZDI1NTE5IHR2L0N6ZyA0ZUJIb1dMRnJE -dUtPeVJmQlZTOTZJMy9mTWh4dllBM0YrWG01T0FMMUV3CnJtTUlHY3FZNEp0VzIr -QzVvaXhyOVB4UTVYNXVubENqSmhwdmFNRHNtL2sKLT4gc3NoLWVkMjU1MTkgV3lJ -RnpBIEp3elhFbUkxeTJkSlhJQ0dMcWZ6SDZ6VEZGb2RaQzhGdm92cmNCLzBGeDgK -Ymd0bnZaYTYxWG1hTDZiekNDNHQzZGVyOWJ0dkVUbFpjTGtsZ2t5aUhhawotPiBP -c1EtZ3JlYXNlIDBhTz57IDd1WlsgY1AKRWQyMFg3eFFQdU1vWEJDR1Yxbkltbmdp -S1ZvVWx5N2dlNy9xTCttQ3RKTlRmUGRwOVMySVE4NlN0RXhTZUdRRgpzNFZjSkRw -SmRFUG8zeHdGbTFIMCtHRGNBN3J1QUI2OG81UDYzTkFCaXZFR2hLUXdBbExta1hV -a0pzR0FlUQotLS0gMmozSGVpZUVHMjAyVHN6dWNtd0pHTlN1OFBhVUpjZnNRZkti -WkppRlhERQoA/UmSpvSwxDg/rkJXI5LUafEFY92ZxkerFeMhjqcPG8F2YKnKbnAb -Kpk/pHIQV2Ls9qhtW3cOCTV/ajmzqMUxBcTmXCkBajp8hwyn8XJi1IGpfmVF3Ft5 -8Oxv9ySKHiyeHHEO/f0/i8RcJZsihmjbeSgd8JaV1pmX9vzk/ZykvOsfd+QXvPMC -rIR7vmXJlA+TtPZuvUAWIe0LC9RIGYVHxChY/5ig1Zc+Dgr5fP1fVGIlg8WXOz0v -DsQwayz2LafK +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBaZjlp +Qi80a2lrUFBUT05KUVk2RVI3ZW5kZzVURldwRWJLenBVdkFobmhZCkcrRmlEWWRq +akEwaVhxVlVWWG1qaUdkY04wK05IWDJodHFxSEJYOFFheGcKLT4gc3NoLWVkMjU1 +MTkgZ1BJZFpBIDdkT1NjVitRQWJWOFV2WHVEcDdOL253MHRNcWhsYTkrUG5kQVFK +cFZXbFUKOXlQa1RENzQxYkRaUXZPdGdoeVp2bEhMeWJ2dWpON1JuazV1cmdLRk9O +QQotPiBzc2gtZWQyNTUxOSBXeUlGekEgZHZSQXZhdVJldU43aGUvRE92RDlJQ2ha +U3JCOXRjZkhCZnduNURWTjF3MAprZWczQXhWTjY0dldTMXd0RmlXSUhVOHhhTElH +YVRNZkZaN1VFeDhOcDFRCi0+IHNzaC1lZDI1NTE5IGRiT2VoQSBBWWlzQUV2RWxv +ZXFQOFJaR0FYSS9sRjZhdUZhOWE1OTBxTTNPTkZSUmx3CkdSTHRrSjJQOXBiWXBO +eUtvMjZlM25KNXU4dDYwaVB2cEkzMHJnVVBFbG8KLT4gc3NoLWVkMjU1MTkgdHYv +Q3pnIFVOMTVjSGFncHZxMkhyMzZ6V2FwaXZGNFBKODMrcnA3d3hlRERVRUduRVEK +TzdKc291QTBMSzYrcURMUEFQd3dEUk9vYVJPMWdhWnFWaFIxK3ZCZFMzZwotPiB+ +VCR2TTMvLWdyZWFzZQp5NEx4SHNOMlBXZ0xrc1lUZWc4WWV2RERJUQotLS0gZ01P +V2Z5WGFKclFhTm8wekVmZllQSnhwaW9MbzJPSVIyWkJta3Z6SStHNAo9+mXqaBH3 +yQaKE5s6TPR6AMf4ZqZ3/TtMmruR9O0Lv6uWtvE3nf1b+QobKhFmUX/J+bX9eHI3 +JxSKc6Xg8uCdfaD+vqtqbbbW9uXv2LAIOuFCVqDcEHFlt5dBIhUB5jvWd0igdI+F +C++o85pzminNN79bFGwqhJ6yUHhE+vsOaPGCE9pLooXRm4uFbecX2gXU28ftUErC +dX9U3G2kdJj5+6RE+oeyyDapjQWyaPCzT5i08HyGx+p2gtUW6BWM705y -----END AGE ENCRYPTED FILE----- From fc80d2b1567a47f2a07d5dcd3d9d4a82620fc0e2 Mon Sep 17 00:00:00 2001 From: KoenDR06 Date: Sat, 8 Nov 2025 12:44:30 +0100 Subject: [PATCH 5/5] add artemis to syncthing --- modules/network/syncthing.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/network/syncthing.nix b/modules/network/syncthing.nix index f64dbeb..fd342f3 100644 --- a/modules/network/syncthing.nix +++ b/modules/network/syncthing.nix @@ -21,6 +21,7 @@ in { dataDir = "/home/${username}"; configDir = "/home/${username}/.config/syncthing"; overrideDevices = true; + overrideFolders = true; settings = { options = { urAccepted = -1; @@ -28,17 +29,18 @@ in { devices = { "luna" = { id = "MW4ZTAX-D7KDLRL-YHNGNCF-V6FW5L4-SCKQKES-BO7KV43-L5667GL-JHIYEAA"; - autoAcceptFolders = true; name = "luna"; }; + "artemis" = { + id = "6YN6SF4-5EK3YZX-WN7S56S-MMTXVV6-LE4IVZR-6LZBTNY-LG4LDX5-4XGKQAB"; + name = "artemis"; + }; "terra" = { id = "2QWRFLY-ZUY5C6C-X36R5CY-PJSGLYY-5HWIWJN-2YYWRPU-T66GJMU-GXTQ6QK"; - autoAcceptFolders = true; name = "terra"; }; "solis" = { id = "YOSYADZ-3OZ3XBH-7XEIK2W-DHAEIFD-5P5ZIHB-PAP74DH-T7GHLKT-O32YEA4"; - autoAcceptFolders = true; name = "solis"; }; };