From 3ffae9e40475dce4c37b430968ad0952e81def97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zsolt=20Alf=C3=B6ldi?= Date: Sun, 1 Mar 2026 00:17:47 +0100 Subject: [PATCH] init mystuff qemu 'network' template fix --- init_mystuff.sh | 48 ++++++++++++++++++++++++++++++++++++++++ qemu.sh | 4 +++- templates/user-data.tmpl | 7 +++++- 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100755 init_mystuff.sh diff --git a/init_mystuff.sh b/init_mystuff.sh new file mode 100755 index 0000000..5148329 --- /dev/null +++ b/init_mystuff.sh @@ -0,0 +1,48 @@ +set -ex + +_user=alfoldi + +_hostname=nokia-l13g4-sisu +_port=22 + +_hostname=localhost +_port=12222 + +# _ssh=alfoldi@nokia-l13g4-sisu +# _ssh="-e 'ssh -p 12222' alfoldi@localhost" +echo " +Host nokia-sisu + HostName $_hostname + User $_user + Port $_port +" >/tmp/sisu.ssh + +function my_rsync() { + rsync -avzP -e "ssh -F /tmp/sisu.ssh" "$@" +} + +ssh -F /tmp/sisu.ssh nokia-sisu "bash -c ' +sudo mkdir -p /persists/sops/age/ +sudo chown $USER -R /persists/sops/age/ +'" + +my_rsync --mkpath ~/.config/sops/age/keys.txt nokia-sisu:/persists/sops/age/ +my_rsync ~/.ssh/ nokia-sisu:~/.ssh + +# ssh -F /tmp/sisu.ssh nokia-sisu "bash -c ' +# mkdir -p ~/workspace/home/nix +# cd ~/workspace/home/nix +# git clone git@github.com:alfonzso/home-manager.git || true +# cd home-manager +# home-manager --extra-experimental-features \'flakes nix-command\' --flake .#nokia build/switch +# '" + +ssh -F /tmp/sisu.ssh nokia-sisu <<'EOF' +mkdir -p ~/workspace/home/nix +cd ~/workspace/home/nix +git clone git@github.com:alfonzso/home-manager.git || true +cd home-manager +sudo bash -c 'echo "trusted-users = root $SUDO_USER" >> /etc/nix/nix.conf' +sudo systemctl restart nix-daemon.service +home-manager --extra-experimental-features 'flakes nix-command' --flake .#nokia switch -b backup +EOF diff --git a/qemu.sh b/qemu.sh index f13d9bd..0411da8 100644 --- a/qemu.sh +++ b/qemu.sh @@ -24,4 +24,6 @@ qemu-system-x86_64 \ -enable-kvm \ -drive file=/tmp/test-disk.qcow2,format=qcow2 \ "${_cdrom[@]}" \ - -bios /usr/share/ovmf/OVMF.fd + -bios /usr/share/ovmf/OVMF.fd \ + -netdev user,id=net0,hostfwd=tcp::12222-:22 \ + -device e1000,netdev=net0 diff --git a/templates/user-data.tmpl b/templates/user-data.tmpl index 044ec0f..24198b7 100644 --- a/templates/user-data.tmpl +++ b/templates/user-data.tmpl @@ -68,10 +68,15 @@ autoinstall: encoding: b64 content: "${NOKIA_CLIENT_KEY_B64}" + - path: /persists/sops/age/.keep + permissions: "0600" + owner: ${TARGET_USER}:${TARGET_USER} + content: "" + - path: /home/${TARGET_USER}/first_install.sh permissions: "0755" owner: ${TARGET_USER}:${TARGET_USER} - # | + # | | # envsubst hack \ / # ` content: |