diff --git a/.tmp_version_test/etc/n-os-tr/version b/.tmp_version_test/etc/n-os-tr/version new file mode 100644 index 00000000..6fcae9f7 --- /dev/null +++ b/.tmp_version_test/etc/n-os-tr/version @@ -0,0 +1 @@ +n-os-tr v0.0.3 (0f74671) diff --git a/.tmp_version_test/issue b/.tmp_version_test/issue new file mode 100644 index 00000000..db216fc1 --- /dev/null +++ b/.tmp_version_test/issue @@ -0,0 +1,2 @@ +n-OS-tr · n-os-tr v0.0.3 (0f74671) · SHELL · \l + diff --git a/build.sh b/build.sh index 08204836..afb08165 100755 --- a/build.sh +++ b/build.sh @@ -8,6 +8,7 @@ WORKSPACE_ISO="$WORKSPACE_ISO_DIR/live-image-amd64.hybrid.iso" BUILD_LOG="$WORKSPACE_ISO_DIR/build.log" ARTIFACTS_DIR="$WORKSPACE_ISO_DIR/config/includes.chroot_before_packages/live-artifacts" BUILD_BINARIES_SCRIPT="$REPO_ROOT/scripts/build-binaries.sh" +ISSUE_TEMPLATE_PATH="$REPO_ROOT/iso/config/templates/issue.template" CLEAN_REQUESTED=0 # Fast iteration defaults: @@ -104,6 +105,43 @@ stage_slice_bc_artifacts() { "$BUILD_BINARIES_SCRIPT" } +determine_build_version() { + local latest_tag + latest_tag="$(git -C "$REPO_ROOT" tag -l 'v*.*.*' | sort -V | tail -n 1 || true)" + + if [[ -z "$latest_tag" ]]; then + latest_tag="v0.0.0" + echo "[build.sh] warning: no semantic git tags found; defaulting to $latest_tag" + fi + + local short_hash + short_hash="$(git -C "$REPO_ROOT" rev-parse --short HEAD)" + + BUILD_VERSION_STRING="n-os-tr ${latest_tag} (${short_hash})" +} + +stage_version_metadata() { + determine_build_version + + local version_dir="$BUILD_DIR/config/includes.chroot/etc/n-os-tr" + local version_file="$version_dir/version" + local issue_file="$BUILD_DIR/config/includes.chroot/etc/issue" + + mkdir -p "$version_dir" + printf '%s\n' "$BUILD_VERSION_STRING" > "$version_file" + + if [[ ! -f "$ISSUE_TEMPLATE_PATH" ]]; then + echo "[build.sh] missing issue template: $ISSUE_TEMPLATE_PATH" >&2 + exit 1 + fi + + sed "s|__N_OS_TR_VERSION__|$BUILD_VERSION_STRING|g" "$ISSUE_TEMPLATE_PATH" > "$issue_file" + + echo "[build.sh] stamped version: $BUILD_VERSION_STRING" + echo "[build.sh] wrote: $version_file" + echo "[build.sh] rendered: $issue_file" +} + if [[ "$CLEAN_REQUESTED" -eq 1 ]]; then cleanup_artifacts fi @@ -146,6 +184,8 @@ if [[ ! -d "$BUILD_DIR" ]]; then exit 1 fi +stage_version_metadata + if [[ "$ISO_ONLY" -eq 1 ]]; then echo "[build.sh] fast mode: skipping includes/ binary rebuild" else diff --git a/includes/n_signer b/includes/n_signer index 7ffba2b6..44372c01 160000 --- a/includes/n_signer +++ b/includes/n_signer @@ -1 +1 @@ -Subproject commit 7ffba2b678b032bb2d0ffca7f5a3930dd908d41a +Subproject commit 44372c0108f0250570ce521213a43df88807c830 diff --git a/includes/nostr_terminal b/includes/nostr_terminal index e7d8b49e..9470f154 160000 --- a/includes/nostr_terminal +++ b/includes/nostr_terminal @@ -1 +1 @@ -Subproject commit e7d8b49ecc6d55cb91e0cad8c59b53a62b43b491 +Subproject commit 9470f1543c9d184a9ff8650cebb7a46330346f0e diff --git a/increment_and_push.sh b/increment_and_push.sh index e7be6dbc..cb8702ee 100755 --- a/increment_and_push.sh +++ b/increment_and_push.sh @@ -163,14 +163,13 @@ print_info "Staging changes..." git add -A if git diff --staged --quiet; then - print_warning "No staged changes to commit" - exit 0 + print_warning "No staged changes to commit; continuing with version tag bump" +else + FULL_COMMIT_MESSAGE="$NEW_VERSION - $COMMIT_MESSAGE" + print_info "Committing: $FULL_COMMIT_MESSAGE" + git commit -m "$FULL_COMMIT_MESSAGE" fi -FULL_COMMIT_MESSAGE="$NEW_VERSION - $COMMIT_MESSAGE" -print_info "Committing: $FULL_COMMIT_MESSAGE" -git commit -m "$FULL_COMMIT_MESSAGE" - if git rev-parse "$NEW_VERSION" >/dev/null 2>&1; then print_warning "Tag $NEW_VERSION already exists locally. Re-pointing to current commit." git tag -d "$NEW_VERSION" >/dev/null 2>&1 || true diff --git a/iso/config/includes.chroot/etc/default/console-setup b/iso/config/includes.chroot/etc/default/console-setup index 92451871..2c34eb57 100644 --- a/iso/config/includes.chroot/etc/default/console-setup +++ b/iso/config/includes.chroot/etc/default/console-setup @@ -2,5 +2,5 @@ ACTIVE_CONSOLES="/dev/tty[1-6]" CHARMAP="UTF-8" CODESET="Lat15" -FONTFACE="Terminus" -FONTSIZE="20x10" +FONTFACE="DejaVu" +FONTSIZE="40x74" diff --git a/iso/config/includes.chroot/etc/issue b/iso/config/includes.chroot/etc/issue index 7da9b7d1..485cbeab 100644 --- a/iso/config/includes.chroot/etc/issue +++ b/iso/config/includes.chroot/etc/issue @@ -1,2 +1,2 @@ -n-OS-tr · SHELL · \l +n-OS-tr · __N_OS_TR_VERSION__ · SHELL · \l diff --git a/iso/config/includes.chroot/etc/systemd/system/c-relay.service.d/n-os-tr-signer.conf b/iso/config/includes.chroot/etc/systemd/system/c-relay.service.d/n-os-tr-signer.conf deleted file mode 100644 index 5b81abab..00000000 --- a/iso/config/includes.chroot/etc/systemd/system/c-relay.service.d/n-os-tr-signer.conf +++ /dev/null @@ -1,5 +0,0 @@ -[Service] -ExecStartPre=/usr/local/bin/n-os-tr-await-signer -ExecStartPre=/bin/sh -c '/usr/local/bin/n-os-tr-get-key 1 > /run/c-relay.env' -EnvironmentFile=-/run/c-relay.env -ExecStartPost=/bin/rm -f /run/c-relay.env diff --git a/iso/config/includes.chroot/etc/systemd/system/didactyl.service b/iso/config/includes.chroot/etc/systemd/system/didactyl.service index 6ce6cd1b..7f8d96ff 100644 --- a/iso/config/includes.chroot/etc/systemd/system/didactyl.service +++ b/iso/config/includes.chroot/etc/systemd/system/didactyl.service @@ -6,9 +6,8 @@ Wants=network-online.target [Service] Type=simple -ExecStartPre=/usr/local/bin/n-os-tr-await-signer -ExecStartPre=/usr/local/bin/n-os-tr-render-didactyl-genesis 5 -ExecStart=/usr/local/bin/didactyl --genesis /run/didactyl/genesis.jsonc +EnvironmentFile=-/etc/default/didactyl +ExecStart=/bin/sh -c '/usr/local/bin/didactyl ${DIDACTYL_ARGS:-}' RuntimeDirectory=didactyl # Memory hygiene diff --git a/iso/config/includes.chroot/etc/systemd/system/fips.service.d/n-os-tr-signer.conf b/iso/config/includes.chroot/etc/systemd/system/fips.service.d/n-os-tr-signer.conf deleted file mode 100644 index b37350d2..00000000 --- a/iso/config/includes.chroot/etc/systemd/system/fips.service.d/n-os-tr-signer.conf +++ /dev/null @@ -1,5 +0,0 @@ -[Service] -ExecStartPre=/usr/local/bin/n-os-tr-await-signer -ExecStartPre=/bin/sh -c '/usr/local/bin/n-os-tr-get-key 3 > /run/fips.env' -EnvironmentFile=-/run/fips.env -ExecStartPost=/bin/rm -f /run/fips.env diff --git a/iso/config/includes.chroot/etc/systemd/system/ginxsom.service.d/n-os-tr-signer.conf b/iso/config/includes.chroot/etc/systemd/system/ginxsom.service.d/n-os-tr-signer.conf deleted file mode 100644 index e5ef787f..00000000 --- a/iso/config/includes.chroot/etc/systemd/system/ginxsom.service.d/n-os-tr-signer.conf +++ /dev/null @@ -1,5 +0,0 @@ -[Service] -ExecStartPre=/usr/local/bin/n-os-tr-await-signer -ExecStartPre=/bin/sh -c '/usr/local/bin/n-os-tr-get-key 2 > /run/ginxsom.env' -EnvironmentFile=-/run/ginxsom.env -ExecStartPost=/bin/rm -f /run/ginxsom.env diff --git a/iso/config/includes.chroot/etc/systemd/system/nginx.service.d/n-os-tr-signer.conf b/iso/config/includes.chroot/etc/systemd/system/nginx.service.d/n-os-tr-signer.conf deleted file mode 100644 index 05c9c95a..00000000 --- a/iso/config/includes.chroot/etc/systemd/system/nginx.service.d/n-os-tr-signer.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -ExecStartPre=/usr/local/bin/n-os-tr-await-signer diff --git a/iso/config/includes.chroot/usr/local/bin/n-os-tr-await-signer b/iso/config/includes.chroot/usr/local/bin/n-os-tr-await-signer deleted file mode 100755 index d32f9d49..00000000 --- a/iso/config/includes.chroot/usr/local/bin/n-os-tr-await-signer +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# n-os-tr-await-signer: block until nsigner's abstract socket @n_os_tr is reachable. -# Used as ExecStartPre= by services that depend on the signer. -set -euo pipefail - -SOCKET_NAME="n_os_tr" -TIMEOUT="${NSIGNER_AWAIT_TIMEOUT:-120}" -INTERVAL=1 -ELAPSED=0 - -while [ "$ELAPSED" -lt "$TIMEOUT" ]; do - # Try to connect to the abstract socket. socat will exit 0 on success. - if socat -u OPEN:/dev/null ABSTRACT-CONNECT:"$SOCKET_NAME" 2>/dev/null; then - exit 0 - fi - sleep "$INTERVAL" - ELAPSED=$((ELAPSED + INTERVAL)) -done - -echo "n-os-tr-await-signer: timed out after ${TIMEOUT}s waiting for @${SOCKET_NAME}" >&2 -exit 1 diff --git a/iso/config/includes.chroot/usr/local/bin/n-os-tr-get-key b/iso/config/includes.chroot/usr/local/bin/n-os-tr-get-key deleted file mode 100755 index 864f9399..00000000 --- a/iso/config/includes.chroot/usr/local/bin/n-os-tr-get-key +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# n-os-tr-get-key: request a role's secret key from nsigner via @n_os_tr -# Usage: n-os-tr-get-key -# Outputs: 64-char hex private key on stdout -# Exit 1 on failure. -set -euo pipefail - -ROLE="${1:?usage: n-os-tr-get-key }" -SOCKET="n_os_tr" -TIMEOUT="${NSIGNER_KEY_TIMEOUT:-30}" - -# Wait for socket to be available -ELAPSED=0 -while [ "$ELAPSED" -lt "$TIMEOUT" ]; do - if socat -u OPEN:/dev/null ABSTRACT-CONNECT:"$SOCKET" 2>/dev/null; then - break - fi - sleep 1 - ELAPSED=$((ELAPSED + 1)) -done - -if [ "$ELAPSED" -ge "$TIMEOUT" ]; then - echo "n-os-tr-get-key: timed out waiting for @${SOCKET}" >&2 - exit 1 -fi - -# Build the framed request (4-byte big-endian length prefix + JSON payload) -PAYLOAD='{"id":"1","method":"get_secret_key","params":[{"role":"'"$ROLE"'"}]}' -PAYLOAD_LEN=${#PAYLOAD} - -# Use printf to create the 4-byte length prefix and send via socat -RESPONSE=$(printf '%08x' "$PAYLOAD_LEN" | xxd -r -p | cat - <(echo -n "$PAYLOAD") | \ - socat -t5 - ABSTRACT-CONNECT:"$SOCKET" 2>/dev/null | tail -c +5) - -# Check for error -if echo "$RESPONSE" | grep -q '"error"'; then - ERROR=$(echo "$RESPONSE" | grep -o '"message":"[^"]*"' | cut -d'"' -f4) - echo "n-os-tr-get-key: signer error: ${ERROR:-unknown}" >&2 - exit 1 -fi - -# Extract the hex private key from the result field -KEY=$(echo "$RESPONSE" | grep -oP '"result"\s*:\s*"[a-f0-9]{64}"' | grep -o '[a-f0-9]\{64\}') - -if [ -z "$KEY" ] || [ ${#KEY} -ne 64 ]; then - echo "n-os-tr-get-key: failed to extract valid key from response" >&2 - exit 1 -fi - -echo "$KEY" diff --git a/iso/config/includes.chroot/usr/local/bin/n-os-tr-render-didactyl-genesis b/iso/config/includes.chroot/usr/local/bin/n-os-tr-render-didactyl-genesis deleted file mode 100755 index e78ca7d1..00000000 --- a/iso/config/includes.chroot/usr/local/bin/n-os-tr-render-didactyl-genesis +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# Render didactyl genesis.jsonc from n_signer-derived key -# Usage: n-os-tr-render-didactyl-genesis -set -e - -NOSTR_INDEX="${1:?Usage: $0 }" -OUTDIR="/run/didactyl" -OUTFILE="$OUTDIR/genesis.jsonc" - -# Get the hex secret key from n_signer -HEX_KEY=$(/usr/local/bin/n-os-tr-get-key "$NOSTR_INDEX") - -if [ -z "$HEX_KEY" ] || [ ${#HEX_KEY} -ne 64 ]; then - echo "ERROR: failed to get valid key from n_signer (index=$NOSTR_INDEX)" >&2 - exit 1 -fi - -mkdir -p "$OUTDIR" - -cat > "$OUTFILE" </dev/null | tail -c +5 -} - # -------------------- core section ---------------------- section "core" @@ -56,53 +46,9 @@ check "n-os-tr-firstboot active" systemctl is-active n-os-tr-firstboot.service check "n-os-tr-firstboot succeeded" \ bash -c '[[ "$(systemctl show -p Result --value n-os-tr-firstboot.service)" == "success" ]]' check "firstboot marker exists" test -f /var/lib/n-os-tr/.provisioned -check "ginxsom nsec exists" test -f /var/lib/n-os-tr/keys/ginxsom.nsec check "env file readable by www-data" \ sudo -u www-data test -r /var/lib/n-os-tr/env -# -------------------- n_signer integration ---------------------- -section "n_signer integration" - -SIGNER_RUNNING=0 -if pgrep -x n_signer >/dev/null 2>&1; then - pass "n_signer process running" "pgrep" - SIGNER_RUNNING=1 -else - skip "n_signer process running" "not running in this environment" - skip "@n_os_tr socket reachable" "signer absent" - skip "get_public_key(nostr_index=0, caller=uid:0) returns valid 64-hex" "signer absent" - skip "sign_event non-preapproved nostr_index denied/prompted" "signer absent" - printf " (note: signer checks skipped because n_signer is not running)\n" -fi - -if [[ "$SIGNER_RUNNING" -eq 1 ]]; then - if ss -xl 2>/dev/null | grep -q '@n_os_tr' || socat -u OPEN:/dev/null ABSTRACT-CONNECT:n_os_tr >/dev/null 2>&1; then - pass "@n_os_tr socket reachable" "ss/socat" - else - fail "@n_os_tr socket reachable" "abstract socket not visible/reachable" - fi - - PUBKEY_RESP=$(rpc_call_nsigner '{"id":"smoke-pub","method":"get_public_key","params":[{"nostr_index":0}]}' || true) - PUBKEY=$(echo "$PUBKEY_RESP" | grep -oE '"result"\s*:\s*"[0-9a-f]{64}"' | grep -oE '[0-9a-f]{64}' | head -n1) - if [[ ${#PUBKEY} -eq 64 ]]; then - pass "get_public_key(nostr_index=0, caller=uid:0) returns valid 64-hex" "${PUBKEY:0:16}..." - else - fail "get_public_key(nostr_index=0, caller=uid:0) returns valid 64-hex" "response=${PUBKEY_RESP:-}" - fi - - SIGN_REQ='{"id":"smoke-sign","method":"sign_event","params":[{"nostr_index":99,"event":{"kind":1,"created_at":1700000000,"tags":[],"content":"n-os-tr smoketest"}}]}' - SIGN_RESP=$(rpc_call_nsigner "$SIGN_REQ" || true) - if [[ -z "$SIGN_RESP" ]]; then - pass "sign_event non-preapproved nostr_index denied/prompted" "no immediate auto-allow response" - elif echo "$SIGN_RESP" | grep -qiE 'denied|prompt|"error"'; then - pass "sign_event non-preapproved nostr_index denied/prompted" "${SIGN_RESP:0:80}" - elif echo "$SIGN_RESP" | grep -q '"result"'; then - fail "sign_event non-preapproved nostr_index denied/prompted" "unexpected auto-allow result" - else - fail "sign_event non-preapproved nostr_index denied/prompted" "unexpected response=${SIGN_RESP:0:120}" - fi -fi - # -------------------- nginx + ginxsom -------------------- section "blossom (nginx + ginxsom)" diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Bold.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Bold.ttf new file mode 100755 index 00000000..2ad2fa1d Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Bold.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-BoldItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-BoldItalic.ttf new file mode 100755 index 00000000..29d9f353 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-BoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-ExtraLight.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-ExtraLight.ttf new file mode 100755 index 00000000..66ad6f15 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-ExtraLight.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-ExtraLightItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-ExtraLightItalic.ttf new file mode 100755 index 00000000..86a4e73e Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-ExtraLightItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Italic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Italic.ttf new file mode 100755 index 00000000..d17f56b6 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Italic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Light.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Light.ttf new file mode 100755 index 00000000..88cbd9b7 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Light.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-LightItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-LightItalic.ttf new file mode 100755 index 00000000..02b6524e Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-LightItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Medium.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Medium.ttf new file mode 100755 index 00000000..3dea23c7 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Medium.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-MediumItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-MediumItalic.ttf new file mode 100755 index 00000000..ee9dfe78 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-MediumItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Regular.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Regular.ttf new file mode 100755 index 00000000..93331e26 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Regular.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-SemiBold.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-SemiBold.ttf new file mode 100755 index 00000000..dcf56afb Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-SemiBold.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-SemiBoldItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-SemiBoldItalic.ttf new file mode 100755 index 00000000..0f77c11a Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-SemiBoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Thin.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Thin.ttf new file mode 100755 index 00000000..16bcd55f Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-Thin.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-ThinItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-ThinItalic.ttf new file mode 100755 index 00000000..d9c094c4 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/IBMPlexMono-ThinItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Bold.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Bold.ttf new file mode 100644 index 00000000..0a928091 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Bold.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-BoldItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-BoldItalic.ttf new file mode 100644 index 00000000..d051920c Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-BoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ExtraBold.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ExtraBold.ttf new file mode 100644 index 00000000..f85a85b5 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ExtraBold.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ExtraBoldItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ExtraBoldItalic.ttf new file mode 100644 index 00000000..30bd7e65 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ExtraBoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ExtraLight.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ExtraLight.ttf new file mode 100644 index 00000000..a3b844e4 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ExtraLight.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ExtraLightItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ExtraLightItalic.ttf new file mode 100644 index 00000000..1457b442 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ExtraLightItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Italic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Italic.ttf new file mode 100644 index 00000000..e54a46ee Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Italic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Light.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Light.ttf new file mode 100644 index 00000000..dba79a74 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Light.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-LightItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-LightItalic.ttf new file mode 100644 index 00000000..b5ac2168 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-LightItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Medium.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Medium.ttf new file mode 100644 index 00000000..a6ba5529 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Medium.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-MediumItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-MediumItalic.ttf new file mode 100644 index 00000000..3c5aff85 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-MediumItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Regular.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Regular.ttf new file mode 100644 index 00000000..8da8aa40 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Regular.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-SemiBold.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-SemiBold.ttf new file mode 100644 index 00000000..94c1b18c Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-SemiBold.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-SemiBoldItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-SemiBoldItalic.ttf new file mode 100644 index 00000000..51d8fdd2 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-SemiBoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Thin.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Thin.ttf new file mode 100644 index 00000000..d1b977d6 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-Thin.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ThinItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ThinItalic.ttf new file mode 100644 index 00000000..4e2f8c86 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMono-ThinItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Bold.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Bold.ttf new file mode 100644 index 00000000..b5962a32 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Bold.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-BoldItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-BoldItalic.ttf new file mode 100644 index 00000000..7dce20ed Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-BoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraBold.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraBold.ttf new file mode 100644 index 00000000..9a82e891 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraBold.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraBoldItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraBoldItalic.ttf new file mode 100644 index 00000000..15416ae7 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraBoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraLight.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraLight.ttf new file mode 100644 index 00000000..dfc95ca6 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraLight.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraLightItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraLightItalic.ttf new file mode 100644 index 00000000..c79c70a3 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraLightItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Italic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Italic.ttf new file mode 100644 index 00000000..ef28958e Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Italic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Light.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Light.ttf new file mode 100644 index 00000000..e4fc2889 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Light.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-LightItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-LightItalic.ttf new file mode 100644 index 00000000..4cbe624e Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-LightItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Medium.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Medium.ttf new file mode 100644 index 00000000..3d866abd Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Medium.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-MediumItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-MediumItalic.ttf new file mode 100644 index 00000000..756440c5 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-MediumItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Regular.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Regular.ttf new file mode 100644 index 00000000..1aa91ec2 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Regular.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-SemiBold.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-SemiBold.ttf new file mode 100644 index 00000000..aad3b86b Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-SemiBold.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-SemiBoldItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-SemiBoldItalic.ttf new file mode 100644 index 00000000..0beb4fb2 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-SemiBoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Thin.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Thin.ttf new file mode 100644 index 00000000..bcd94221 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-Thin.ttf differ diff --git a/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ThinItalic.ttf b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ThinItalic.ttf new file mode 100644 index 00000000..56f40739 Binary files /dev/null and b/iso/config/includes.chroot/usr/local/share/fonts/truetype/custom/JetBrainsMonoNL-ThinItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Bold.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Bold.ttf new file mode 100755 index 00000000..2ad2fa1d Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Bold.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-BoldItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-BoldItalic.ttf new file mode 100755 index 00000000..29d9f353 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-BoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-ExtraLight.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-ExtraLight.ttf new file mode 100755 index 00000000..66ad6f15 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-ExtraLight.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-ExtraLightItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-ExtraLightItalic.ttf new file mode 100755 index 00000000..86a4e73e Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-ExtraLightItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Italic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Italic.ttf new file mode 100755 index 00000000..d17f56b6 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Italic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Light.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Light.ttf new file mode 100755 index 00000000..88cbd9b7 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Light.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-LightItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-LightItalic.ttf new file mode 100755 index 00000000..02b6524e Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-LightItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Medium.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Medium.ttf new file mode 100755 index 00000000..3dea23c7 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Medium.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-MediumItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-MediumItalic.ttf new file mode 100755 index 00000000..ee9dfe78 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-MediumItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Regular.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Regular.ttf new file mode 100755 index 00000000..93331e26 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Regular.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-SemiBold.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-SemiBold.ttf new file mode 100755 index 00000000..dcf56afb Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-SemiBold.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-SemiBoldItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-SemiBoldItalic.ttf new file mode 100755 index 00000000..0f77c11a Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-SemiBoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Thin.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Thin.ttf new file mode 100755 index 00000000..16bcd55f Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-Thin.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-ThinItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-ThinItalic.ttf new file mode 100755 index 00000000..d9c094c4 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/IBMPlexMono-ThinItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Bold.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Bold.ttf new file mode 100644 index 00000000..0a928091 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Bold.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-BoldItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-BoldItalic.ttf new file mode 100644 index 00000000..d051920c Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-BoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ExtraBold.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ExtraBold.ttf new file mode 100644 index 00000000..f85a85b5 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ExtraBold.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ExtraBoldItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ExtraBoldItalic.ttf new file mode 100644 index 00000000..30bd7e65 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ExtraBoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ExtraLight.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ExtraLight.ttf new file mode 100644 index 00000000..a3b844e4 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ExtraLight.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ExtraLightItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ExtraLightItalic.ttf new file mode 100644 index 00000000..1457b442 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ExtraLightItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Italic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Italic.ttf new file mode 100644 index 00000000..e54a46ee Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Italic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Light.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Light.ttf new file mode 100644 index 00000000..dba79a74 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Light.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-LightItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-LightItalic.ttf new file mode 100644 index 00000000..b5ac2168 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-LightItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Medium.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Medium.ttf new file mode 100644 index 00000000..a6ba5529 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Medium.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-MediumItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-MediumItalic.ttf new file mode 100644 index 00000000..3c5aff85 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-MediumItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Regular.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Regular.ttf new file mode 100644 index 00000000..8da8aa40 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Regular.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-SemiBold.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-SemiBold.ttf new file mode 100644 index 00000000..94c1b18c Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-SemiBold.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-SemiBoldItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-SemiBoldItalic.ttf new file mode 100644 index 00000000..51d8fdd2 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-SemiBoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Thin.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Thin.ttf new file mode 100644 index 00000000..d1b977d6 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-Thin.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ThinItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ThinItalic.ttf new file mode 100644 index 00000000..4e2f8c86 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMono-ThinItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Bold.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Bold.ttf new file mode 100644 index 00000000..b5962a32 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Bold.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-BoldItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-BoldItalic.ttf new file mode 100644 index 00000000..7dce20ed Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-BoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraBold.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraBold.ttf new file mode 100644 index 00000000..9a82e891 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraBold.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraBoldItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraBoldItalic.ttf new file mode 100644 index 00000000..15416ae7 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraBoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraLight.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraLight.ttf new file mode 100644 index 00000000..dfc95ca6 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraLight.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraLightItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraLightItalic.ttf new file mode 100644 index 00000000..c79c70a3 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ExtraLightItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Italic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Italic.ttf new file mode 100644 index 00000000..ef28958e Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Italic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Light.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Light.ttf new file mode 100644 index 00000000..e4fc2889 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Light.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-LightItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-LightItalic.ttf new file mode 100644 index 00000000..4cbe624e Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-LightItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Medium.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Medium.ttf new file mode 100644 index 00000000..3d866abd Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Medium.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-MediumItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-MediumItalic.ttf new file mode 100644 index 00000000..756440c5 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-MediumItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Regular.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Regular.ttf new file mode 100644 index 00000000..1aa91ec2 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Regular.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-SemiBold.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-SemiBold.ttf new file mode 100644 index 00000000..aad3b86b Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-SemiBold.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-SemiBoldItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-SemiBoldItalic.ttf new file mode 100644 index 00000000..0beb4fb2 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-SemiBoldItalic.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Thin.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Thin.ttf new file mode 100644 index 00000000..bcd94221 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-Thin.ttf differ diff --git a/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ThinItalic.ttf b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ThinItalic.ttf new file mode 100644 index 00000000..56f40739 Binary files /dev/null and b/iso/config/includes.chroot/usr/share/fonts/truetype/custom/JetBrainsMonoNL-ThinItalic.ttf differ diff --git a/iso/config/package-lists/base.list.chroot b/iso/config/package-lists/base.list.chroot index 0bd3f73c..1cf62cac 100644 --- a/iso/config/package-lists/base.list.chroot +++ b/iso/config/package-lists/base.list.chroot @@ -19,6 +19,7 @@ libsecp256k1-2 fonts-terminus console-setup +kbd # Service-menu optional stack tor diff --git a/iso/config/templates/issue.template b/iso/config/templates/issue.template new file mode 100644 index 00000000..485cbeab --- /dev/null +++ b/iso/config/templates/issue.template @@ -0,0 +1,2 @@ +n-OS-tr · __N_OS_TR_VERSION__ · SHELL · \l + diff --git a/scripts/build-binaries.sh b/scripts/build-binaries.sh index b48c691b..273c369b 100755 --- a/scripts/build-binaries.sh +++ b/scripts/build-binaries.sh @@ -60,8 +60,8 @@ build_and_stage "ginxsom" "$REPO_ROOT/includes/ginxsom" "ginxsom-fcgi" \ "build/ginxsom-fcgi_static_x86_64" "build/ginxsom-fcgi" "ginxsom-fcgi" build_and_stage "nostr_terminal" "$REPO_ROOT/includes/nostr_terminal" "nt" \ - "rm -rf build && mkdir -p resources && ln -sfn ../../nostr_core_lib resources/nostr_core_lib && cmake -S . -B build && cmake --build build -j\"$(nproc)\"" \ - "build/nt" "nt" "build/nt_static_x86_64" + "rm -rf resources/nostr_core_lib && mkdir -p resources && cp -a ../nostr_core_lib ./resources/nostr_core_lib && ./build.sh" \ + "nt" "build/nt_static_x86_64" "build/nt" build_and_stage "otp" "$REPO_ROOT/includes/otp" "otp" \ "[ -d miniz ] || git clone --depth 1 https://github.com/richgel999/miniz.git miniz; [ -f miniz/miniz_export.h ] || printf '%s\n' '#ifndef MINIZ_EXPORT_H' '#define MINIZ_EXPORT_H' '#define MINIZ_EXPORT' '#endif' > miniz/miniz_export.h; [ -d microtar/src ] || git clone --depth 1 https://github.com/rxi/microtar.git microtar; make static" \