commit d5ae73866d9ece8f7f51ee418d9277a45530e35a
parent a3c9a18fbd3c54d2351374e4403636f081b8ca27
Author: Leah (ctucx) <git@ctu.cx>
Date: Tue, 23 May 2023 10:08:06 +0200
parent a3c9a18fbd3c54d2351374e4403636f081b8ca27
Author: Leah (ctucx) <git@ctu.cx>
Date: Tue, 23 May 2023 10:08:06 +0200
machines: add `blechkaestchen`
6 files changed, 77 insertions(+), 1 deletion(-)
diff --git a/configurations/common/syncthing-config.nix b/configurations/common/syncthing-config.nix @@ -4,6 +4,7 @@ let devices = { #mobile devices blechkasten.id = "HGPWBVY-RD4JKBQ-X3V53IB-KRVDXEQ-4YLN5F2-WPPSMYR-SOXGTY6-IDFOAAC"; + blechkaestchen.id = "3EODMSO-2TZ5XLY-7DEN2J4-KBJHBG7-77Z2SUP-DFILGXB-AFZPQ4K-NSVZNAC"; iphone.id = "3SM3LJV-XMHYW2D-MU5WQ3T-KGYUJOI-LXOL6YI-BSVZ2B5-QJ6GVXN-MPWMKQ7"; ipad.id = "WVQIZTE-RULPSEW-IZF4UWI-Q2LX3WJ-MXDUZI3-DF5YHXS-CORBZ27-BCA6XAR";
diff --git a/flake.nix b/flake.nix @@ -17,6 +17,19 @@ }; modules = [ ./machines/blechkasten/darwin-configuration.nix ]; }; + + blechkaestchen = inputs.darwin.lib.darwinSystem rec { + system = "x86_64-darwin"; + pkgs = import inputs.nixpkgsDarwin { + inherit system; + overlays = overlays ++ [(import ./pkgs/darwin)]; + }; + specialArgs = { + currentSystem = system; + inherit inputs; + }; + modules = [ ./machines/blechkaestchen/darwin-configuration.nix ]; + }; }; colmena = {
diff --git a/machines/blechkaestchen/darwin-configuration.nix b/machines/blechkaestchen/darwin-configuration.nix @@ -0,0 +1,14 @@ +{ config, pkgs, lib, ... }: + +{ + imports = [ + ../../configurations/common + ]; + + networking.hostName = "blechkaestchen"; + networking.computerName = config.networking.hostName; + + home-manager.users.leah.home.stateVersion = "22.11"; + system.stateVersion = 4; + +}
diff --git a/secrets/blechkaestchen/syncthing/cert.age b/secrets/blechkaestchen/syncthing/cert.age @@ -0,0 +1,26 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqTnRRYVE1T0w2ckIvY0RV +UGRlOEl1Sm5UenR5SFl3ZCtMcFZGOXhOMm1jCmQxa09UMjZHRGZSd2h4Um15SXRN +OFNMRTJwdCtEYTBZcjkydVBteG1Ia0UKLT4gc3NoLWVkMjU1MTkgOUllMkZBIHQ4 +ZytYbjJyMm1IV3BxemJzaEtYazRNMWtKNzhTNmxKMUlYWjI3amhjR28KRGJmMGUr +L01RZ3g2c1h3UUluaXRqN3RXRmhlQzhxTmdhQTRMbnVKK3orcwotPiBlOyFxVi1n +cmVhc2UgV1AKT0dEcGVZR2d0dWdSdElpbTlrWGJ0WW8KLS0tIFB4TkU2cTBHTWUw +dWxOVEY4NWg0WWprNGM5R2tmNm9WNDFQcGNtd0RoQzgKuBgQJpu3qSwVKG5c8avJ +1EVhwQfa2eSpngCfcjfv5HgcYlmyBn5qUT9RyHXTDGiyiRLsesRYWcS7kI3Xim2Y +4kxR/32OfeO6A0Mrlx0c5WA43CgMjG8rEDEdZVLkbyXHzmopEXcgq/USRjYdE5Y8 +j7izeyKgWhd/YC/XzsdO99sH1jyvvLsPD1um/fed5O29e6k46EgoP037KFcJWQ+E +Iz3k7th6n4QVF4A8RRAcfqb5dFZroXiODuZLlXNDHeokgHW/aQ6kVpQChhD3E/GB +I5fAyIl2er5pMUwCyxL5owoWkq+gCdbDj8J84o8Jy7dUj/AHCwDRz4AML091OPyQ +iT8FrY+U48XmJSAGVky49QXUBtr4x3kYy+fCo+aHqGn1xzz7BCkGj/R/iSY49u5F +VPx0QAynFPNYGdlIqsACE0K+XNxHCpvBoQeR2tpMrV+akv8299UGJiFpzA2Qy4nB +5zw+ekXx3gfz+C88IC4tuHtwP4DyTWXIOn9VdAkT5+SaO6Y3O0ab3Qp0PRbYYa/d +P6q+UeSnA9qmGFd3ZSbmVH4GmJfAuuYAP5OTeJ2mDBZlZJKqdNXqE9WGlM/3etFJ +GWMSkXu8J87NSOjej7BOO3QdqzourS4LriE+8/9etRn3g8d4QihO8md917RBG9aL +jawopfmSexRp4M0inEJqgehDQ+pGnWxfDUYovEMUy/u8gNoxIyW/DjZjZo0OBhPI +QfHV+TVnqCeW6IQaBc7x1ASg9pOykHNyOHoY2QyZRQiIJODnoj/knfOh9PXe+QAb +Avu3R+xvQUonNeb6TW28PV/ig+t6z91ehg04kP/lrYVeAuOpnSZGPJnJJCS6FJ0j +ImYKy7wpDaT8xfhENu/0g98bRP2UZojQferJ73jiL5YlEw8+0bqUezBTXwx7x8p+ +u7ZHpv3u6fgYLmpKmrWqjHSl5E2F/xXi/xZaXwqyyPb+5k7/pQBBD7kSdThASqtJ +O+9wO4CH/+kvX4rKRxHnCl5A+ZlXa3NlJBRw1aHqe1SngZXU8pwoaP+J90Xnvb/e +faSpFtEOhgE9pswfux3URlDK/a2CdIbbd4DMGfQzY650Bm/Tj4rZY+Nh +-----END AGE ENCRYPTED FILE-----
diff --git a/secrets/blechkaestchen/syncthing/key.age b/secrets/blechkaestchen/syncthing/key.age @@ -0,0 +1,17 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzQW1zRkgwQ0tnV0ZpVWpi +MWJ0bStyZkhFb3labUwzUnNwbjlVZHV2QzJjClA3T0dNQURMUDkrOERaT3RxQ29p +Q3NPeUFSVGVMSUF2enlDdjVXUVZKZkUKLT4gc3NoLWVkMjU1MTkgOUllMkZBIDBo +MUFEbGhrc2N5c3ZpbjhDZTBDdXpOOUdoa01wRTZ6OGIycWZzV21DSEkKNkM2SSt2 +Q0FLNERoMEg3eU4rSW1PbTkzK3V4SW5mVnY5eXNrd29TcTJzYwotPiBkfC1ncmVh +c2UgdiBPWC1rbiBgVlFUeklsIFFqVVJlJ2NcCkRFaWgyVVFlZUZKSXh2TE5XN0JD +WUhyaDAxNlpCNjZ1M2JuWTZVMmg3akd3c0pRYzA5cUpkOG01eGI0RW1PQncKS2pz +Zkx3Ci0tLSBCQm1kRkwwVUFZelJqdnVTUDBrNC9TSWpCWGpLK0RhV3JLKytLMjV3 +akg0Co9kHvODM+jJ/7gP8FkMfGa90t8v2v9O82pK9qKkQqUfLzz09KNhQ9KmK2kj +skXdl7BNdwCy6/iht3akTgj3GekrqHyRkwFvyAOuBofTWGS8UO+Geng5FNLwEv9w +zGs1phBK92XdjkPU8/1rlqZPCRJfm26Te7s4iZLZFr5vL1H7F9bxuIpkRi1mbuX/ +a3ZF4WtKam+VBfM+dbXHxagJQFtNJkV0Buq7H1neDY49RxuR28KZTdh61b4GykBk +0Hg31iZu9vQDjCnaMY0ZRJ+nOklsh3lBAkLO6luJCeQdQHUYheD4KbI6NV6AkKuz +FO+KRy/5/b0CVXExNZDY2JaskZOxn79zNuOEA0Y7R8EXu0gyF+/4woX0+GHGZBig +vWCZ75wYyh01mQtD2HGrFn+eUoWK8HZiCLslq+eKeqy08xI= +-----END AGE ENCRYPTED FILE-----
diff --git a/secrets/secrets.nix b/secrets/secrets.nix @@ -4,7 +4,8 @@ let coladose = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP2ky7icnZOUMDtBPwVoq5icGFAzf1C5nfNhoqZEins7"; #servers - briefkasten = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN8mi9ZKPdhn20g9gyxE7NYBq/vAKemW4lhaQlLw5QVc"; + briefkasten = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN8mi9ZKPdhn20g9gyxE7NYBq/vAKemW4lhaQlLw5QVc"; + briefkaestchen = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP6TmPYuTFIVnLZx6MxnGcRkxC6fRuEqKlLQjMmQHHkE"; trabbi = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPLBBZJ9/644d71E8A7IFU7dvDHI+OR/7q79KvqmI/i/"; wanderduene = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+HWYkFCmuHR8HeExYXc2L9CxRdvYZ1UCkbbeDCvF0u"; @@ -21,6 +22,10 @@ in { "blechkasten/syncthing/cert.age".publicKeys = [ leah blechkasten ]; + "blechkaestchen/syncthing/key.age".publicKeys = [ leah blechkasten ]; + "blechkaestchen/syncthing/cert.age".publicKeys = [ leah blechkasten ]; + + "briefkasten/syncthing/key.age".publicKeys = [ leah briefkasten ]; "briefkasten/syncthing/cert.age".publicKeys = [ leah briefkasten ]; "briefkasten/syncthing/htpasswd.age".publicKeys = [ leah briefkasten ];