cleanup

.local/bin/ddev

@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/bash -e
 
 dkr() {
-    local ep="$1"; shift
+    local shell="$1"; shift
 
     (set -x
-        podman run --rm -it -v "$PWD:/mnt/" -w /mnt/ --entrypoint "$ep" \
+        podman run --rm -it -v "$PWD:/mnt/" -w /mnt/ --entrypoint "$shell" \
             "$img" "$@"
     )
 }

.local/bin/ffcapture

@@ -12,8 +12,7 @@ audio=(
     -i default
 )
 
-ffmpeg \
-    -framerate 10 \
+ffmpeg -framerate 30 \
     "${video[@]}" \
     "${audio[@]}" \
     "$output"

.local/bin/ffreduce

@@ -14,7 +14,6 @@ if ! [ -r "$in" ]; then
     exit 1
 fi
 
-
 set -x
 #ffmpeg -i "$in" -r 24 -vcodec libx265 -vf "scale=-2:$smallside,setpts=0.5*PTS" "$@" "$out"
 ffmpeg -i "$in" -r 24 -vcodec libx265 -vf "scale=-2:$smallside" "$@" "$out"

.local/bin/lock

@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/bin/bash -eu
 
 i3lock -ftni "$XDG_CONFIG_HOME/wallpapers/lock.png"

.local/bin/vm

@@ -1,28 +1,35 @@
-#!/bin/bash -e
+#!/bin/bash -eu
 
-ISO="$1"
+getmaxram() {
+    local ram; ram="$(free -g | awk '/^Mem:/{print $2 - 2}')"
+
+    if   [ "$ram" -le  2 ]; then  ram=2
+    elif [ "$ram" -gt 32 ]; then ram=32; fi
+    echo "${ram}G"
+}
+
+ISO="$1"; shift
 DISK="$HOME/${ISO%.*}.qcow2"
-MAXMEM="$(free -g | awk '/^Mem:/{print $6 / 2}')G"
-OVMF_CODE=/usr/share/edk2/x64/OVMF_CODE.4m.fd
-OVMF_VARS=/tmp/OVMF_VARS.4m.fd
+MAXMEM="$(getmaxram)"
 
-set -x
-if [ -f "$OVMF_VARS" ]; then
-    cp -f /usr/share/edk2/x64/OVMF_VARS.4m.fd "$OVMF_VARS"
-fi
-if ! [ -f "$DISK" ]; then
-    qemu-img create -f qcow2 "$DISK" 20G
-fi
+if ! [ -f "$DISK" ]; then (set -x
+    qemu-img create -f qcow2 "$DISK" 64G
+) fi
+(set -x
 qemu-system-x86_64 \
     -accel   kvm \
     -M       q35 \
+    -bios    /usr/share/edk2/x64/OVMF.4m.fd \
     -monitor stdio \
     -cpu     host \
     -m       "2G,maxmem=$MAXMEM" \
     -vga     virtio \
     -audio   pipewire,model=hda \
     -nic     model=virtio-net-pci,type=user \
-    -drive   "if=pflash,format=raw,file=$OVMF_CODE,readonly=on" \
-    -drive   "if=pflash,format=raw,file=$OVMF_VARS" \
+    -device  qemu-xhci \
+    -object  "memory-backend-ram,id=mem,size=$ram,share=on" \
+    -numa    node,memdev=mem \
     -drive   "if=virtio,file=$DISK" \
-    -drive   "file=$ISO,media=cdrom,readonly=on"
+    -drive   "file=$ISO,media=cdrom,readonly=on" \
+    "$@"
+)

.local/bin/wallpaper

@@ -1,5 +1,4 @@
-#!/bin/bash
-
+#!/bin/bash -eu
 shopt -s extglob
 
 feh --bg-fill "$(shuf -en1 "$XDG_CONFIG_HOME/wallpapers/"!(lock.png))" --no-fehbg

.local/bin/wlp

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -eu
 
 iwctl=(iwctl station "$(find /sys/class/net/wlan* -printf '%f' -quit)")