From e77669751561ca72296b92caab0d733636675225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Tue, 9 Jan 2024 15:53:40 +0100 Subject: [PATCH] New host: kogata --- README.md | 1 + assets/ssh.nix | 2 ++ hosts/default.nix | 1 + hosts/kogata/default.nix | 11 ++++++++ modules/system/common/default.nix | 3 +++ secrets/alert-nrab-lol-pass.age | Bin 435 -> 384 bytes secrets/alert-plain-pass.age | 14 +++++----- secrets/hercules-cache.age | Bin 1012 -> 979 bytes secrets/hercules-token.age | Bin 842 -> 888 bytes secrets/leet-nrab-lol-pass.age | 15 +++++------ secrets/legion-niko-pass.age | 15 +++++------ secrets/secrets.nix | 41 +++++++++++++++++++++++++----- secrets/vault-cert-env.age | 14 +++++----- 13 files changed, 76 insertions(+), 41 deletions(-) create mode 100644 hosts/kogata/default.nix diff --git a/README.md b/README.md index 6ac9b2e..c0255d9 100644 --- a/README.md +++ b/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 diff --git a/assets/ssh.nix b/assets/ssh.nix index c03bc8f..fccafac 100644 --- a/assets/ssh.nix +++ b/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"; }; } diff --git a/hosts/default.nix b/hosts/default.nix index ecc6cdd..c4aeaf8 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -13,6 +13,7 @@ # TODO: Custom installer ISO # ./installer ./ude + ./kogata ]; builders = let diff --git a/hosts/kogata/default.nix b/hosts/kogata/default.nix new file mode 100644 index 0000000..45fe071 --- /dev/null +++ b/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; + }; +} diff --git a/modules/system/common/default.nix b/modules/system/common/default.nix index c44861e..5b07975 100644 --- a/modules/system/common/default.nix +++ b/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; diff --git a/secrets/alert-nrab-lol-pass.age b/secrets/alert-nrab-lol-pass.age index 089369a86e2bccd6c6d201207e2ae02c0f47cddd..321ccf7a9a10a7c89dde4e6a3aa697fda33ba950 100644 GIT binary patch delta 349 zcmdnY+`v3Rr#`nlHznN5-Ag~h%g-$(r_{J8Eu}mls@$|slMFIw<0XpyeP%bC&VKo$|p5h z+sU{zGosRyE2PL&+qE>H)Y(7O)x%i3I4`46KcK`sD5xsLz|Yh@B-27W+sVf?T-(c) zOIKG{!M)hsA|=WsAlD=*rlt*`HL+f5YUo`g-x)WoJ%)eO7Zsp|s=B8Slc% xc=6=kGXV#;$yZexrM@c2 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ٔ 3F7(I0R,!GIlY[ \ No newline at end of file +-> ssh-ed25519 ioPMHA 4EqxwfHCz9VJQPMfULLbAr9eaesivV9BE1ERyrH91xY +M2l3meRzStyjlG9enK3ObCeglXP6cOfiYzrqcw0in2U +-> ssh-ed25519 GKhvwg 2CjaggQgGYNEfP/IBME/T0cueM5KY94nK5VbbXw4Tj8 +Mi0Sig6qtnBtKVEiw7uBQqyLdqxw6OuJzAbu7USrR40 +--- OfhXRbqvSTxx9Sv/Ke7IHMSZrkVF/dmCqabmt5fbhP8 +Hrm-iBޥ.{2]PԾd!e Um1{d \ No newline at end of file diff --git a/secrets/hercules-cache.age b/secrets/hercules-cache.age index 3f8c310b490d4ec5fd46f757d7407db2ce07a70c..034c1c1904b6cacfbcaa77534fd68cfeaca985f2 100644 GIT binary patch delta 910 zcmeyuewlrOPJLu>VsL1cV{uYpaI#aLMP5dMqhXLwQlzI(QdntFcyXX>lw+2DMSw+l zK9_!qetLmRS!S|Xj-h_GYr2QGQ(n2Nd#P!9l#_d?flsDcd67%HiF0UVGMBEMLUD11 zZfc5=si~o*LS}w|uZN>TSa^AIX1P~bN@!kDn7enPnVV;-aY1fkdRTaYsbip*wsvuP zsEMC(vUz$smws86zDbgqPoit8Q(|6fnrpFPT8g$uP@zGhQDkOnU`3v5YOY z#E;_j`Qbr+;gNYk7Qx2;W=>Is>88GcmQLB8mgW}dJ~4GPFGvkkFf0$z zukZ`VNi#CZF)PVT_IC>_4$n8w$+9R9y8@Jo;M@Hg<$Pjxo)D)kFXG^?l#O$;dxoE*<6UZ3G%=~QLzV^JOv=AGl| zmR97H;$)JS=9l6VWNIE9lIO0U>Sy8_V(gUZ%N0-(!DmYL+Koe>$48c>y;Wg6lh z>=kB_RAgC_jZCYj)QQ}sX=;-TI7!??mmQhuZ zT%;eRpP!eWRd47NnP!$`w*A_a?9NlkDUz;xHN%Ze2ODBEheVWNEnP%<2E;fv} z|6j<^JImU}#hLN!orlZX7iPj+Ui&mGy(r}JjP+`Q-jg+Zwo5GEJfCmxdA>!@6O;Ow zJ}!Q o@S@^{2f-g*m6x8(NS2)W<7e(ku@mJ@J_((#mX(&Q^OHUc0Ifh~%K!iX delta 944 zcmcc2{)K&lPQ774RGwE_glkY*S!F@FXP&lmuB&BcZlJVGMBEMLUD11 zZfc5=si~o*LS}w|uZN>TN|~2=u6u;Bp=nU1iJ4hwrJKHfR8Xl`aJI2?es++5dPI>) zp}D1DZb*aySC&_xTY#BQPEloqsar~6nXi9Nm_=blXmNpQMp34JdR0MQcwkAIPgQ2} z#E;_Pe%i(X{>DE3#wE_4`K8{TCWeLOK1Nl>!HHoW7D2{Q`q`$LKCb%4#g6G*X)c)- zK}MyXC4ph?$>s*0u31K&rtVb*Caz`~!A_|erXI=RVg7|4>E)i2&oYYFJDLYqWK@I| zr38djrKU!Bn0Z^28koBq2Ak!VrMdzy(l%YI8~uiEl0s5m&@Fz zG&3v9!qqgQFh42D-L$?cw=6vfnvEIpaa$k)9xqA1YZ*T*$4u)xnKD%ITGE6_B;)7P}z$t&F@(8I&oyDCLH z)5Oa?IV8y~!@{%3BArWDS687R)6BxLva~e6B-OvfRo|>4+@xMVG|{ohP&=<6$|55y zH!;dnJ6t=&$j_B4W%k);`quM;KX5(buIx$R66TyFFBoJSVb%Uo!1t~gJJ;fpwVhXZ z7-RRiZW39x?8U-2Z~v9@JY!n&W{d6fevgA!E0&di3Y0s{mb>!Dwtk^~B#`lmA+`7LsNKET>TlM)x8zw5AJ*L>rQg=q2`_Kfn z_Z^?Ep6}dR;?K;-u*a%c=V1P4yE*RhPx8|)O8IwKZ(Po|Pgwg+fpWjH_=~4usT_K8 z^-)`P+}KntT&T^nsz~~x?k1lfA2Pl=mNH5`@wDjNV#aFptors*rpZsTS?kv?kNtn; zwSHcmhQ(UV*pR}jT#{iojvY(fk-Va*tc3kabEQ}1&4(MeKYq=(`j=40G4qXX6E5Eo z(!BGj@W*zcwEh1UM=h_v7+EO6{_M|Oi7mm;loP%=y8L*f&g2@_+nFQOe6sXpwYL7^ hsKp*ZZ_l|^C@ov^_tnbminkwnt=ZJhGV6By0RUvLZaM$} diff --git a/secrets/hercules-token.age b/secrets/hercules-token.age index e5434690941f9e46ae2176db865ca506e5b55d33..f6a958ff625bd2752b82d4d2aa98b0701c1ae9fd 100644 GIT binary patch delta 819 zcmX@b_JeJLPJMcwYeAHyk+*?Geu1NtNl=QmTWCg(hq-p1MW&;VLB2^N374*&LUD11 zZfc5=si~o*LS}w|uZN>TQbs_DYni@hNNIsngjtTiwp&<=S&2)bfwqrnd9Hr3zJa4} zab#F|UZtA>SEWgmPpD_GL1e01UTLnYvrCpiaA{VQSzc0vQ({D-g=0~Wi+@^1VMc|? z#E;_jS!QOXewpd!<`o4|X};;sL4}EV$;MS-$;NrX{?1`e*=5;j7Fmv2+JOdKN$&cg zl|I3)g?VBAg{A3W!b@XtJD)jPjH*w1^+zl07Q{Wf@lH8kJt=KcfX&M<&QR1O(Z0ueY=4g@_9+(+m z>Ex4M5mn({Q6C=YZyE09Ud+{$eeVBj=cbqYpSSQ?E!F0D+|AIpD@A>_UT3BXri$T;j z?On8s|2>zW;>Xe2(#-AaW09-E#$sA88c>E^H`bMk!G>8a9ZG{VhA z&L7jUtXQmc`=;!tJf7X>+CraO%z4jpIrh0pMSJV)@)0;-6Y~TPN<0ko=`cY6 delta 772 zcmeytc8YC+PJN}hM^Z#(T4ZFVtE+FWNlAX1Sy*XlR+zqDWwuXvh^u*}p+Qc5SV+D{ zAeXUunT20!uv?0mo13#)YFUnfzH_=;o}Wu#NvW%AQkhvwN|;GriAQ=yK9{bYLUD11 zZfc5=si~o*LS}w|uZN>TzFAP9lb@+iuDOe6u1`U7xLabec21?US9)PqNLEF$Z-sxp zaZ$NnU|NPNS9)=2WKOtuVUD(?zM;2IRIr7qrH8vyT3V`aicx4#XjW#aXO*$LL131} z#E;_P6=9(nK~Y9-MI`|dmQh}=UIm%10cI8jrfH_eQP~lm#-^cB?&j|KL5}HMl|ccS z-i|@x#brSrnT7iLDTO8(DJib{p;^JD7XF?k-pK(;CIN*hjSwMPz&Wc{*l$rMqPt7&@kE zS0zW3207*!`x<8XWTm-!S4HI(<{BrJni`dZLa9VIy(l%YI8~w6+1I2rH(4PrSVuD? zQX$yKO~Hz*(m2;U!@0g9(j+iFJkd2Gr^vlB&&(j#Q`t`NJOwGKw@$x6( zhM%QXDSNbTpS@Lnv{zBzXA=MV%`$s4ns4PSnV7xQt|j$)#nMTBQSXEGc{C#L`pBGK z8JcxxH*?|ioY$Hn3%v@qZQd+tcW|FY++HEszi)mhcREE`vh4fSv_8b6UpS{waP?US z0cobEXMf7S_^>3btma*6CCj&Ps{q-pU0Gd~4~&EEq#f&4wOv%lJ(HoTIQ- ssh-ed25519 84j9mw 60XbIW64DZX9qTPvWP1O5NCjyf61W3oMNsN3Q+Up2CE -K52Sye1rQiv5SQha3AGBu9V9jSlc4NgiGaLWabXwyRE --> ssh-ed25519 GKhvwg r39/lbL3Bv4R9vMnwMHPUUYrTWUckNya9Rtbx5u9sAA -/DcA2jJbFSvikdxWkLplmlpON0J2KcrsT26x1QK98vE --> Tw\nck-grease -sq39qrZT1PsMtl4VPGHTDvsw7v8rJfa8MJknNRzp1rVrq5rNLg ---- uZjIGnDN/nUbdcIyfy80RUxuJUCODct1uhaKM7EmbDQ -fo1HXq*Œ6|m#3E2ۜqklS@h:T^SU:wzM`.˲#ug -Qk\ 0OʹH +-> ssh-ed25519 84j9mw T5HYWpCNb7V1Ox+9tEdebKLwUpG7faSHPnMXM2WQiBo +P2vbyCS2EoZiDMrSMFZSo3olmrUKvqMzC6IbqF3njiE +-> ssh-ed25519 GKhvwg AoxnrsJAkFZ3jXXlQUCjG9gIi/jjkDbYP6m+aF4zUn8 +40eUcRqG7nfMmhCPlzFnFTiL5DAKNpNB075DjFj/Akg +--- 8RLfYhxRRAU3P3LRt+vSUCkxHVv9+Mtv/fkHIXQR9Ak +J lM$"AX_wRJEEhg2+fLzfFѧe԰e܆*ŞC` +p \ No newline at end of file diff --git a/secrets/legion-niko-pass.age b/secrets/legion-niko-pass.age index 1d226c2..15ead82 100644 --- a/secrets/legion-niko-pass.age +++ b/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]QIf썈_`u ʊ߀NJv~W'QHk\] \ No newline at end of file +-> ssh-ed25519 ioPMHA BCoFRArzhiWzaXVtF1qkiPxL+M5WuLsrUqH9T8hh7D0 +3be6hdQ8hjRLCuN91pB8X/WhvwfpvPifsICFOxAUxlY +-> ssh-ed25519 GKhvwg 0L+oViZLW+pKKDmP2H4uv1PDAE423vqAHpPltN+euhU +zDVev9k/LRuqUWvSjFxCE0H+yt8xniV/Au0Z+49zY9M +--- 1UkToOyXP7ljQ+KTcSfNydUd8J1rm3QeyabusJiZqAM +J)2a ^6䗍AJ͜51i ғcZP ssh-ed25519 84j9mw iX2rMQ/L6p+pZO6HZWGk+LWuQzTbWrTMRHbAMONyMQI -qwcUJ9BMDc4gaZS3voRtgZwuOqU7IeaOp1RMfmmeSMo --> ssh-ed25519 GKhvwg /O4i6P36CGqPwiHlV59QDlnZnE7mgz+u8wrt7hI6Z3M -ytfwriyDoCROiePo8Ey+VETVPxd42ltj+8s91hRDWoM --> RB"-grease Ia=. -J9xSMHsIpNTKbksUxqZM8M5bgJwxapjGp8VYKh7bXk8jH9nOhUuhrLA ---- i3nJq19lE+kSfe3fzciLrZ0QOUT0ItuP62fXFBvnVrg -]26F/!xlBMoNp|Jo#cʪ3\zΑ-1"4(Q=JJcgYj \ No newline at end of file +-> ssh-ed25519 84j9mw eje98xFWmQ76FVbbuu1fIJSN26sxalB3hQeCZe86tGw +2hIPVSC1oLwY/AtEhKa0qUenw8nBBOY5uC74B0O4ohs +-> ssh-ed25519 GKhvwg e4D3PZQrTW3DHV9YLD9d9wvirIhCNJCBVqI/BKC6CWA +jpQnjh4yhLJdjeBcjlyP+aRZfSI++7j8PxlIwbQ00Qw +--- eU8hHBZ0+PiVjH1SetgWVronyegyAZclWnIdxHmeO8Q +)b#pBJx֏%aq(lP{+j>l# \ No newline at end of file