From 4f2cfaa778954a651d4a5cf19859d8733ce9178a Mon Sep 17 00:00:00 2001
From: Yadunand Prem <yadunand@yadunut.com>
Date: Sat, 26 Oct 2024 19:07:57 -0400
Subject: [PATCH] feat: update flakes

---
 flake.nix                          |  19 -------------------
 nixos/flake.nix                    |  21 +++++++++++++++++++++
 nixos/proxmox/create-vm.sh         |   2 +-
 nixos/proxmox/setup-vm.sh          |   2 +-
 nixos/secrets/flux.age             | Bin 363 -> 363 bytes
 nixos/secrets/k3s.age              |  23 +++++++++--------------
 nixos/secrets/tailscale.age        | Bin 811 -> 481 bytes
 nixos/secrets/zerotier-network.age |  25 ++++++++++---------------
 8 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8415bac..3c4c213 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,25 +43,6 @@
       };
     };
 
-    packages.aarch64-darwin = {
-      setup-vm = let
-        pkgs = import nixpkgs { system = "aarch64-darwin"; };
-        script-name = "setup-vm";
-        src = builtins.readFile ./nixos/proxmox/setup-vm.sh;
-        script = (pkgs.writeScriptBin script-name src).overrideAttrs(old: {
-          buildCommand = "${old.buildCommand}\n patchShebangs $out";
-        });
-        buildInputs = with pkgs; [ 
-          gum 
-          agenix.packages.aarch64-darwin.default
-        ];
-      in pkgs.symlinkJoin {
-          name = script-name;
-          paths = [ script ] ++ buildInputs;
-          nativeBuildInputs = with pkgs; [makeWrapper];
-          postBuild = "wrapProgram $out/bin/${script-name} --prefix PATH : $out/bin";
-        };
-    };
   } // flake-utils.lib.eachDefaultSystem (system:
       let pkgs = import nixpkgs {
         inherit system;
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 23e7dfd..20f22b3 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -27,6 +27,26 @@
   }: {
     formatter.aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.alejandra;
     formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
+    packages.aarch64-darwin = {
+      setup-vm = let
+        pkgs = import nixpkgs {system = "aarch64-darwin";};
+        script-name = "setup-vm";
+        src = builtins.readFile ./proxmox/setup-vm.sh;
+        script = (pkgs.writeScriptBin script-name src).overrideAttrs (old: {
+          buildCommand = "${old.buildCommand}\n patchShebangs $out";
+        });
+        buildInputs = with pkgs; [
+          gum
+          agenix.packages.aarch64-darwin.default
+        ];
+      in
+        pkgs.symlinkJoin {
+          name = script-name;
+          paths = [script] ++ buildInputs;
+          nativeBuildInputs = with pkgs; [makeWrapper];
+          postBuild = "wrapProgram $out/bin/${script-name} --prefix PATH : $out/bin";
+        };
+    };
     nixosConfigurations = let
       nodes = import ./server/nodes.nix;
     in
@@ -37,6 +57,7 @@
               hostname = name;
               private-ip = data.private-ip;
               server-addr = (import ./server/nodes.nix).premhome-gc1.zt-ip;
+              role = data.role;
             };
           };
           modules = [
diff --git a/nixos/proxmox/create-vm.sh b/nixos/proxmox/create-vm.sh
index 78f5fb4..ebf7c5a 100755
--- a/nixos/proxmox/create-vm.sh
+++ b/nixos/proxmox/create-vm.sh
@@ -42,7 +42,7 @@ function main() {
     --name "${NAME}" \
     --net0 "virtio,bridge=vmbr0" \
     --ostype "l26" \
-    --scsi0 "${STORAGE}:50,iothread=on" \
+    --scsi0 "${STORAGE}:200,iothread=on" \
     --onboot "1" \
     --pool "premhome-cluster" \
     --scsihw "virtio-scsi-single"
diff --git a/nixos/proxmox/setup-vm.sh b/nixos/proxmox/setup-vm.sh
index 9f2c1b8..3cd32a2 100755
--- a/nixos/proxmox/setup-vm.sh
+++ b/nixos/proxmox/setup-vm.sh
@@ -37,7 +37,7 @@ function main() {
   chmod 600 "${KEY_PATH}"
 
   # Append public key to the secrets file and rekey agenix
-  pushd "./nixos/secrets"
+  pushd "./secrets"
   LINE="  ${MACHINE_NAME} = \"$(cat "${KEY_PATH}".pub)\";"
   echo "appending to file ${PWD}./keys.nix"
   sed -i -e "\$i${LINE}" "./keys.nix"
diff --git a/nixos/secrets/flux.age b/nixos/secrets/flux.age
index fc377a964b7bcbaf9b7e6e5e0fe0d717e08f3b30..8fb85fcdc9b7cbe29cf4f740f3a7c753c13cb31a 100644
GIT binary patch
delta 328
zcmV-O0k{6^0_y^hEPqpUHD_ircV}TwXL(3TZfZzSPDLv)F>hvTGjCNjc4}d0HgZ!)
zM{Pn;FbXwNcym^GPH$0Ea!+ArG(>o4N_j6&YD{Tob!s^>LrykqHcc;XOi)!pX9_Jo
zAaiqQEoEdfH8n9gATVQVOH*ecP+CeiF=k;jV^?cAHF0`LQh#V_MrV0(OL1{}PcdsT
zMpk5IS4MPaOhZv~3NLYXdSyysXgD`jGFeVlXmvO@Fj8q`VQytYQfyFBGHyX)OnNnD
zMPf!-3N0-yAZ$fcR5CY2QejS4XKPG)F*R%}GkG&<cujIkIC)NIL2pBOa&|>{OEp?W
z3W{5mZBfs%)j{4#5ldSTe=W~=H(a|e-1OnSf88W;xou64dfmf+@TzipPRsu;d>Pck
as_;dOC)VD7O|V<Q2p^?`uMm7EjD2%}czF5%

delta 328
zcmV-O0k{6^0_y^hEProlQZ+JcI8$V1Syyf~W^YhfYFJKgY%xwWFL!uDHdSUhYhyA}
zRCZ!TYYIeiNlkM~Nij)fYg$4wT4qpBS4=i$Rd8BUHBwDCL~UYERWf%_M{{*(YYHts
zAaiqQEoEdfH8n9gATVQVOH*eca5rdaMMrWuYI<dLI4eR#Lw`g|L_<Y#VQgwJH7_+y
zZ!uD6VrMikZ(%Y)3SlsBb9YKPVnH%dXi;%kLSt$%FK>BAQ)@<UGkIA`Xf|$CYD7zP
zc4;d?3N0-yAWLF%Z&Or4G(ux;Q&Cf5Wn)!AXEJR!b!2x|GdXNeLNPK$LPAw<dS!EO
z3c+@a^zK(;zd^h{C)aIcx0VMc(LyhrbKDATL)9qXByndLsX#VdrVz4E49RVKq?7Os
ag>NihJ)3{~QHh>k`ZR|SaGrZs!`=W8*>pJo

diff --git a/nixos/secrets/k3s.age b/nixos/secrets/k3s.age
index 8537592..be3fb3a 100644
--- a/nixos/secrets/k3s.age
+++ b/nixos/secrets/k3s.age
@@ -1,15 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 OOT7iQ ixSK13Q0cZ/9Ja4qQgR6EG1NhVyMgnkdzCvFlps9mEg
-WRLpuj2dkgZ1ugTk39FBHh3QpbuJmeoHU6edtYym9iQ
--> ssh-ed25519 7Lat4Q KsGdrCPrPmoluHADPkW71DfkyljX+8cgRIhfQ4Yk5FQ
-FOjCmiG62fmjAzwGvLaQpgO2lEr+Rd0twYetW9CdEfI
--> ssh-ed25519 dPFwiQ dJn3lqlHDrFD6bbTIfboLiFYEJceLVZohGjUBKa3Nm4
-PWLa4dmU2AsBKVk/8JiQG9BGmdlxxd6PF6rxzxQrnrs
--> ssh-ed25519 OV7A4A jQRymJHujZYp9lEaQo+yK77SDchzFKQP49uzxyCXzRA
-5CJiI+AnxXzWhtYNEB47ZC9lt4TQG7vVySHnnwuT/kA
--> ssh-ed25519 Gc/MTQ 6JYkL1Nbe3/M2wwSDM7rRtiJqP4BQGrOYnzeIzzYjV8
-em7ZPvc1dwaZ18/j3Y1SOjgYVq6l7udHPvd0BArd74c
--> ssh-ed25519 0ckKSg CdnYg6Oh1eyAvbUDkrSHqOKUTJ128eKEfkRhY939qEA
-XS7cA9F8MRE6Soe/2hAlaxhnv+4ThmJuTtQs7pZC2WY
---- 23uZEJ1Vb+4Ya2AJWm9JScpqyRogoUNlWQHZNpo6C3g
-f3xc�T�
	�[%T��*=�
D�[	�	������.�b?�'����h�P
\ No newline at end of file
+-> ssh-ed25519 OV7A4A 2mzVj+7svSS/ZM2y86Fg2nLTSzdNdO3sm4RLmgqCy14
+jnjkZmYcc2GQNNQ0QLz2p9x84hHZ9yl7IyMbSet0tEQ
+-> ssh-ed25519 Gc/MTQ csWJM/Y+TTK82vsC8c2FZW4uZ54fX5sOuz6yze2q1zk
+YhSxYKMkNzFZqI45gYzc33PPcgx78mRx72dJi82RqRs
+-> ssh-ed25519 0ckKSg F1Xk3UFol8gEwCFSJh8+tITJTII8IeCz4FE2S2CkKDo
+ncJRpe0TSLuMjKt+kjU5l1PJXFNDqnW+j9GT8t6/Krw
+--- S5tfjeE9DbpxFaOcV5BELXBqaLQ4mDa+eWbw2CAyHwc
+f��[���8�e;o�{:��,�>��7�
+D�D���r6m�\��eDe�-:
\ No newline at end of file
diff --git a/nixos/secrets/tailscale.age b/nixos/secrets/tailscale.age
index 06e41958735b40b0879cdbd5f6d6260c24ce3da6..295120670060856a7ad599a8916d2cf6ada091ba 100644
GIT binary patch
delta 432
zcmV;h0Z;y`2H^vcCX;Xh23LAaZ$d^eM_6WUSw=Tza85Z{Z&*$>VR%kYMl^3{P*-F$
zb9GcJOKmSRRSHo?RCI50dP7oXL@-feP-8bXSW;GQNHuL`Pi1;!R5CG8FfvF=YD!W!
zO_R+57k@8!LsDaTZ)`(Xa#}_-Ycn}+MR0CxD|SyyZ%$Y%P)bsDR8enMaWOYjRSHB#
zQAuq<R781jWmZaNOkyiJS1@fzWlmUacy)1gFIY@LWioFyVOMBQO$seOAaiqQEoEdf
zH8n9gATVQVOH*ecM@eUSWN1N5H9}`-b8==YaepgBK}2M1HBfM2NJn^PS8F+MHEeW5
zWoSls3M+V7Mp<`aIcj-pMrBoHL1=4scX3yDH&JqIHbOOKbU95+GfPu3OGtA~3N0-y
zAT~8LO-glEVM{nfRYht<OJi>{aaU_McxY8qLSu7JQFUZASWb93VmNhU3b5l7hE9c%
zaY-cg+u?6XO(slHyhTQ##@WDF9w0i5RCur*CVm)-!9k`IG}SHJCaTiL!^<Y8PLcqm
a{L@8TNaEb<8!Tp%5V`NA4Azl8A2g)lyO^y2

literal 811
zcmZ9{xzF2V0Dy6^Mq*%P@=_Hk4bJN`UXYylN?)I`<0BG-Z##~U*s&8w-5FqD>d=Y}
zb*~VWDs`%aSiZ6_u&^KoB*cim4T*2gU+{Y#KaFQ`6}Dq@%IoU$x=qmmOlDsoU6;+`
z2qQ_rAev^;xq-x?5app^L{_D;<Blbjesr@gGY`gIH6^AOr?khZOP(zzThtNU(hJ0z
z0_{PyHrQ_L7O*>je%orR4WRgBDsT{6oNqN+_D_U?tm6VGz-zFP%h)Emwyby2wQ1_m
z#y*SIi3<zC1Ttk*-DJ@oR=#ghI}{y3a<;~kEcuCZF~-)f>=d;8#dPp;8BFV2Ez*Va
z!&@#3qXLqR(#fuK46Vl76lWOlm7^F0yYs^i%l%g7U64)`2&5t?Q);A0Y4itG&#D4!
z8pzLg>~`>{B^977y}8QWt)|&DORxwvhYjp}YtXfT4{2N(G^g&<>ml4@2Jd)9FIoiO
zQ#L3j++w*q>L#Jla>4N3Ra3&AWFn0z=hMIz4rWD&;UWhDnBQt*h$@zWIHE9eBjcxf
z>DE~;)AaGFjE)h#-r`ixm5{^}+_2f$G$u#PW&0LAZ4GxRCRcoLx0GA9v9Q8%QighY
zu{~g|W4cIhwRu=TGercuuX_E$tb!g^>0#H652>u$h*rK?1K<jN-Pnq=UKzw>*v>s&
z;1bi9E{-*gvN~{MJgbQ#p44=^YG_i*VTg0bhqu`bk?79k&f1AmA<4<qx+*sMwhrYL
zA?09j_7cOiYV{N{?qc#-#E@S;UHU)YJwl&-|55epx6WU0-~Rp@+Uxr_U$t-ck05)O
z-aqkPynpuo<0oJL{nL-Xz5C?V-Tm_~|NQL3i+5`Ja!CL1|NG%P?3;i7eZ2edKmAY;
A?EnA(

diff --git a/nixos/secrets/zerotier-network.age b/nixos/secrets/zerotier-network.age
index 67d906f..e2bc98b 100644
--- a/nixos/secrets/zerotier-network.age
+++ b/nixos/secrets/zerotier-network.age
@@ -1,16 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 OOT7iQ jUogNJ9uREDJZEl4G5pb/2bNjiBHIB9IABgXQfo0g1M
-InYXkJls2Sdd+jnQ9Z8ifoUGznwktmstsM8avHFfTuU
--> ssh-ed25519 7Lat4Q O6JMNKXRwRWjFZxJM/agtJ922KR+74u8a0WmWJdSaQM
-5tPV0awfn5djn2c50xloyDRkeu2Aon3/z+6kfoA/eHk
--> ssh-ed25519 dPFwiQ HeOAeTzItJMkTPW2ODs/Z/E9nZycqtJnjGaKPigZ/CM
-MLTkDKg0hLOfDplWb33hvGQahvEgjqy+S9w+UCKZNXU
--> ssh-ed25519 OV7A4A 4mxMknf9sJCZ8NiENMJqGd2lEBB7dmvzGqVLirHvWGo
-fJ+4MY9oSFEdvjGYm2NoWviC9J4ocSUhUWuGEa71pFc
--> ssh-ed25519 Gc/MTQ pjuOkv7iMuSkrFccMGd5Usz/a0bcOJYikvHeuYg5ATA
-ydWemX28ZNygAYR/MsOezz81haHj2XhvHlFcZMwsgjo
--> ssh-ed25519 0ckKSg hV+hpxVdfr2xOfNYZkbrGNMu5GOASlHDch4AYhqlWnQ
-MeZdLC12XrF9sSy1q28dpdqjYtIEKcTzJq7/vfhILf0
---- 0rgW5rFnvhi1LMOcC3vl70s9Vq9S+PQ5Pu8Apgxu0v4
-�ߡ��P�7�-9dq���b>?2���}�N��}�5��uu\�w���
-O
\ No newline at end of file
+-> ssh-ed25519 OV7A4A SaDleivMaeTYhlPfgWNLwyVvqi7jX7zEE8U0K1Bt4Ds
+jSHVPbXpgtzBlZkGO0g0ls447BtswuQ/IqW3M/FmbgQ
+-> ssh-ed25519 Gc/MTQ IKbNi7Z6qDOIr47lSfom3K8hIrbf8OGQ3WxZsqtjDmU
+zAx5wPQzMq7ziibkjw52mGFXzACmkWdguxjM0sFRQv8
+-> ssh-ed25519 0ckKSg 2rCRoQEz6sUio3mj3MbsPNkZi09yMgXPYiJTksPROj8
+RwB0k/fMuDBc946fzhEZc2cxljWvJHzMHsbGtG3DXuo
+--- WgPFThzdFxwCEO5GrsjvBkBeoUYUo+sDOp/g39lG9lU
+��I�B�� guo�
+dSD_��z�?�[������
+�.��j�G���4
\ No newline at end of file