ringofstorms/qvm
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Source system and user qvm.conf; add memory/cpus options; fix flake path

Browse source
This commit is contained in:
Joshua Bell 2026-01-26 10:21:23 -06:00
parent e28d1fa14f
commit 8d68e1daf9
4 changed files with 37 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bin/qvm-rebuild
View file

@ -32,9 +32,9 @@ ensure_user_flake() {
# In development: $(dirname "$0")/../flake/default-vm/
local default_flake_dir
# Try installed location first
if [[ -d "$QVM_LIB_DIR/../share/qvm/default-vm" ]]; then
default_flake_dir="$QVM_LIB_DIR/../share/qvm/default-vm"
# Try installed location first ($QVM_LIB_DIR is $out/lib/qvm)
if [[ -d "$QVM_LIB_DIR/../../share/qvm/default-vm" ]]; then
default_flake_dir="$QVM_LIB_DIR/../../share/qvm/default-vm"
else
# Fall back to development location
default_flake_dir="$(dirname "$(readlink -f "$0")")/../flake/default-vm"

9
bin/qvm-start
View file

@ -116,6 +116,15 @@ main() {
# First-run initialization
ensure_dirs
# Source config file if it exists (sets QVM_MEMORY, QVM_CPUS, etc.)
# Check system-wide config first, then user config (user overrides system)
if [[ -f "/etc/xdg/qvm/qvm.conf" ]]; then
source "/etc/xdg/qvm/qvm.conf"
fi
if [[ -f "$QVM_CONFIG_FILE" ]]; then
source "$QVM_CONFIG_FILE"
fi
# Check if VM runner exists, build if not
if [[ ! -L "$QVM_VM_RUNNER" || ! -f "$(readlink -f "$QVM_VM_RUNNER" 2>/dev/null || echo "")" ]]; then
log_info "First run detected - building VM..."