New host: kogata

README.md

@@ -13,6 +13,7 @@ Collection of my personal Nix configurations and opinionated NixOS, nix-darwin,
   - hijiri-vm - linux vm running on my macbook
   - miyagi - my work machine[^1]
   - ude - another linux arm server
+  - kogata - my m1 mac mini doubling as a server
 - modules - options which in principle should be reusable by others
   - */common - common options between my machines which aren't meant to be reusable by others
   - system

assets/ssh.nix

@@ -12,6 +12,7 @@
     legion = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILHX2MNGZGSTedYAepZHgcx+KK0A6ASulwSrpf9ytb5h nikodem@rabulinski.com";
     miyagi = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEIf4Ypws+1v9WL9MibW1dELpa/7YixElaBE7S71jsTy nrabulinski@antmicro.com";
     ude = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEDm3M/i/4wP2BM4+9hHAOMospwvlBZ+FT+pJtVgaaMq nikodem@rabulinski.com";
+    kogata = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGK7H4Z29d72HJlI69Vt0YLOyuPcn9XxYjvMZfql80z0 nikodem@rabulinski.com";
   };
 
   system = {
@@ -19,5 +20,6 @@
     legion = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH0Ktyj0FSn8KLRwRGd0Tp/qNUPXV7+XyxAsWGWdMYp8 root@legion";
     miyagi = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILbUcsZrZgGHojG+1yVyNEW5Fgr7/7qNaWxOt+lFrJaD root@miyagi";
     ude = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDZW15ObZ6XG776pdEvs9yqSuIiWlbGveEVA774Ri9/o root@ude";
+    kogata = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICPN/SXBcIB1WN8GIhYrQrqzFGuVkEP4o0E+x0uQ4f2l";
   };
 }

hosts/default.nix

@@ -13,6 +13,7 @@
     # TODO: Custom installer ISO
     # ./installer
     ./ude
+    ./kogata
   ];
 
   builders = let

hosts/kogata/default.nix

@@ -0,0 +1,11 @@
+{
+  configurations.darwin.kogata = {pkgs, ...}: {
+    nixpkgs.system = "aarch64-darwin";
+
+    settei.user.config = {
+      home.packages = with pkgs; [alacritty];
+    };
+
+    common.hercules.enable = true;
+  };
+}

modules/system/common/default.nix

@@ -53,6 +53,9 @@
 
   darwinConfig = lib.optionalAttrs (!isLinux) {
     system.stateVersion = 4;
+
+    # Every macOS ARM machine can emulate x86.
+    nix.settings.extra-platforms = lib.mkIf pkgs.stdenv.isAarch64 ["x86_64-darwin"];
   };
 in {
   _file = ./default.nix;

secrets/alert-plain-pass.age

@@ -1,9 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 ioPMHA qqVh4A0E1AHAKWzkfGkJngMUdMc+HSxcKjyYQ2gaCAQ
-hKu0kGoC+DFFzhGI8hq0oiiRuKa0kiE1WqTjq5tfPt4
--> ssh-ed25519 GKhvwg KBSfWjKPAhb+FmKet9HoUfcffcGvPvoM2eWWgysxWk8
-xhymHp+IWG6gH63U6dX9cSg7eIPD/Uhtj87cAS0vtfU
--> @oU{zMr-grease
-tw95QJTmdroGQEQhYEGLUNBJTp6Zdytql07m8Cjt1OvnNdt5/A
---- iM/8bokZsr5SDc73lZTloR/YpngXsy/mt1E89rNCmZI
-Kß“,{ÅGG ™Ù” ½3“ÈôF7(ÈÍôI0R,¤ƒêá!GìIl÷ýY[­ï
+-> ssh-ed25519 ioPMHA 4EqxwfHCz9VJQPMfULLbAr9eaesivV9BE1ERyrH91xY
+M2l3meRzStyjlG9enK3ObCeglXP6cOfiYzrqcw0in2U
+-> ssh-ed25519 GKhvwg 2CjaggQgGYNEfP/IBME/T0cueM5KY94nK5VbbXw4Tj8
+Mi0Sig6qtnBtKVEiw7uBQqyLdqxw6OuJzAbu7USrR40
+--- OfhXRbqvSTxx9Sv/Ke7IHMSZrkVF/dmCqabmt5fbhP8
+ëHŠržm-iB̳ޥ.Ú{2»]PÔ¾d!eæô¥²Uým1ø{dŒÈ

secrets/leet-nrab-lol-pass.age

@@ -1,10 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 84j9mw 60XbIW64DZX9qTPvWP1O5NCjyf61W3oMNsN3Q+Up2CE
-K52Sye1rQiv5SQha3AGBu9V9jSlc4NgiGaLWabXwyRE
--> ssh-ed25519 GKhvwg r39/lbL3Bv4R9vMnwMHPUUYrTWUckNya9Rtbx5u9sAA
-/DcA2jJbFSvikdxWkLplmlpON0J2KcrsT26x1QK98vE
--> Tw\nck-grease
-sq39qrZT1PsMtl4VPGHTDvsw7v8rJfa8MJknNRzp1rVrq5rNLg
---- uZjIGnDN/nUbdcIyfy80RUxuJUCODct1uhaKM7EmbDQ
-fo1H„×X<EFBFBD>¶®qˆ*¢âÂŒ¯6|mŸ“#3Eü2Ûœqë·klìS@h:<3A>T<EFBFBD>^ÎS¦Uªè¥:wz¤ÜM`¤.˲Ö#„ug
-Qk\ 
0OÍ´‘ãѤHÞ
+-> ssh-ed25519 84j9mw T5HYWpCNb7V1Ox+9tEdebKLwUpG7faSHPnMXM2WQiBo
+P2vbyCS2EoZiDMrSMFZSo3olmrUKvqMzC6IbqF3njiE
+-> ssh-ed25519 GKhvwg AoxnrsJAkFZ3jXXlQUCjG9gIi/jjkDbYP6m+aF4zUn8
+40eUcRqG7nfMmhCPlzFnFTiL5DAKNpNB075DjFj/Akg
+--- 8RLfYhxRRAU3P3LRt+vSUCkxHVv9+Mtv/fkHIXQR9Ak
+éJœ¼ýòlMÆ$”ë"ÇÈÍAûXŒ™_×ùw<C3B9>”R<E2809D>Jèáõ¬<C3B5>îE<C3AE>E<06>hg2Ìä+fLzfFѧíe—åüÔ°Úá‡Ðe‰Ü†§÷*¨¡ÅžC`+pèí˜í

secrets/legion-niko-pass.age

@@ -1,10 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 ioPMHA A6SzZP5Fqppeg0xJ2GBrBIVzby6tpt8dMrOpkg6IU0U
-wZOmja7rff0Ot/xxSikzKKuzva7aeDP9l1yQF3wiR2M
--> ssh-ed25519 GKhvwg SQ/Nl+i9/IGrqjAeGXDvYLHbLdIW2GnwXHtJUTN2TA0
-bXK1+8SE18XtILUqM8s2KCbFiXS4aKN7IVFvtTjiBuU
--> {Z=m(-grease J$7_wp rrf\
-tXMmFUM2
---- 6B3pPWUGKzSAlEYmttE4EiuuDxmUYo9tdnKlw+QUI0o
-vGb¾
-ºËɧýþ XqEјµml]ÉÌó‘óüc)óü£“t\(c¸]¶QIªf¢
Üì<>ˆ×Í›_ŸÁø`ÆÙìu–	ãÊŠ߀¡è ÕûNJvØ~W'èQœŠHk\]³
+-> ssh-ed25519 ioPMHA BCoFRArzhiWzaXVtF1qkiPxL+M5WuLsrUqH9T8hh7D0
+3be6hdQ8hjRLCuN91pB8X/WhvwfpvPifsICFOxAUxlY
+-> ssh-ed25519 GKhvwg 0L+oViZLW+pKKDmP2H4uv1PDAE423vqAHpPltN+euhU
+zDVev9k/LRuqUWvSjFxCE0H+yt8xniV/Au0Z+49zY9M
+--- 1UkToOyXP7ljQ+KTcSfNydUd8J1rm3QeyabusJiZqAM
+J)2<><32><EFBFBD>a ^6<><36><EFBFBD>
<01>䗍<EFBFBD>AJ<41><13><12>͜5<CD9C><35><EFBFBD>1i<31>	<09><><EFBFBD>ғ<EFBFBD>c<EFBFBD><63><EFBFBD><EFBFBD>Z<EFBFBD><5A>P<L<>V<EFBFBD><0F>l<EFBFBD><6C><15>3<05>0\<5C>2\/oc<><63>9µ<18>rdl<64><6C><EFBFBD>#<23>͌5<CD8C>=<3D>,'9<><39>

secrets/secrets.nix

@@ -1,12 +1,39 @@
 let
   keys = import ../assets/ssh.nix;
 in {
-  "leet-nrab-lol-pass.age".publicKeys = [keys.system.kazuki keys.other.bootstrap];
-  "alert-nrab-lol-pass.age".publicKeys = [keys.system.kazuki keys.other.bootstrap];
-  "vault-cert-env.age".publicKeys = [keys.system.kazuki keys.other.bootstrap];
+  "leet-nrab-lol-pass.age".publicKeys = [
+    keys.system.kazuki
+    keys.other.bootstrap
+  ];
+  "alert-nrab-lol-pass.age".publicKeys = [
+    keys.system.kazuki
+    keys.other.bootstrap
+  ];
+  "vault-cert-env.age".publicKeys = [
+    keys.system.kazuki
+    keys.other.bootstrap
+  ];
   # "bitwarden-env-file.age".publicKeys = [keys.system.kazuki keys.other.bootstrap];
-  "hercules-token.age".publicKeys = [keys.system.kazuki keys.system.legion keys.system.ude keys.other.bootstrap];
-  "hercules-cache.age".publicKeys = [keys.system.kazuki keys.system.legion keys.system.ude keys.other.bootstrap];
-  "alert-plain-pass.age".publicKeys = [keys.system.legion keys.other.bootstrap];
-  "legion-niko-pass.age".publicKeys = [keys.system.legion keys.other.bootstrap];
+  "hercules-token.age".publicKeys = [
+    keys.system.kazuki
+    keys.system.legion
+    keys.system.ude
+    keys.system.kogata
+    keys.other.bootstrap
+  ];
+  "hercules-cache.age".publicKeys = [
+    keys.system.kazuki
+    keys.system.legion
+    keys.system.ude
+    keys.system.kogata
+    keys.other.bootstrap
+  ];
+  "alert-plain-pass.age".publicKeys = [
+    keys.system.legion
+    keys.other.bootstrap
+  ];
+  "legion-niko-pass.age".publicKeys = [
+    keys.system.legion
+    keys.other.bootstrap
+  ];
 }

secrets/vault-cert-env.age

@@ -1,9 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 84j9mw iX2rMQ/L6p+pZO6HZWGk+LWuQzTbWrTMRHbAMONyMQI
-qwcUJ9BMDc4gaZS3voRtgZwuOqU7IeaOp1RMfmmeSMo
--> ssh-ed25519 GKhvwg /O4i6P36CGqPwiHlV59QDlnZnE7mgz+u8wrt7hI6Z3M
-ytfwriyDoCROiePo8Ey+VETVPxd42ltj+8s91hRDWoM
--> RB"-grease Ia=.
-J9xSMHsIpNTKbksUxqZM8M5bgJwxapjGp8VYKh7bXk8jH9nOhUuhrLA
---- i3nJq19lE+kSfe3fzciLrZ0QOUT0ItuP62fXFBvnVrg
-]2•6ÚìÉF/á³!x<>lB¯M<04>¸oN„p|«’J³o¹Œ<C592>ÝÚ#c¿îʪ3\zΑè»-1½’"4(ä”ìŽÁQÜ=øJJ¤c¹g°Y¾j þ
+-> ssh-ed25519 84j9mw eje98xFWmQ76FVbbuu1fIJSN26sxalB3hQeCZe86tGw
+2hIPVSC1oLwY/AtEhKa0qUenw8nBBOY5uC74B0O4ohs
+-> ssh-ed25519 GKhvwg e4D3PZQrTW3DHV9YLD9d9wvirIhCNJCBVqI/BKC6CWA
+jpQnjh4yhLJdjeBcjlyP+aRZfSI++7j8PxlIwbQ00Qw
+--- eU8hHBZ0+PiVjH1SetgWVronyegyAZclWnIdxHmeO8Q
+í)b³#pBJxÖ<78>
¼Í%¶—<C2B6>ù…<txsdJŽƒ‡º`jÞ_FÅd€n2gåMO
Ožó«\?~6ç>êa
«§q(ÿlP¨«{ƒ+j¼¿>lâé#Ó<13>