app_containers/.local/bin/generate_shortcut_container_app

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-die() {
-  echo "$1" >&2
-  exit 1
-}
-
-container_name="$1"
-[ -z "container_name" ] && die "Please provide name of container"
-container_root=/var/lib/machines/$container_name
-
-app_name="$2"
-[ -z "$app_name" ] && die "Please provide name of app"
-
-desktop_file=$container_root/usr/share/applications/$app_name.desktop
-desktop_file_content=$(sudo cat $desktop_file 2>/dev/null)
-[ $? == 0 ] || die "App $app_name not found in container $container_name"
-
-icon_name=$(echo "$desktop_file_content" | grep "Icon=" | head -1 | cut -d'=' -f 2)
-[ -z "$icon_name" ] && die "No icon defined for app $app_name"
-
-icon_root=$container_root/usr/share/icons/hicolor
-icons=($(sudo find $icon_root -name "$icon_name.*"))
-[ ${#icons[@]} == 0 ] && die "Cannot find any icon for app $app_name"
-
-for icon in ${icons[@]}; do
-  icon_target=${icon//$icon_root/$HOME/.local/share/icons/hicolor}
-  icon_target_dir=$(dirname "$icon_target")
-  echo "Copying $icon to $icon_target in $icon_target_dir"
-  mkdir -p "$icon_target_dir"
-  sudo cat "$icon" > "$icon_target"
-done
-
-mkdir -p $HOME/.local/share/applications
-echo "$desktop_file_content" | sed -r "s@^Exec=(.*)\$@Exec=env CONTAINER_NAME=$container_name $HOME/.local/bin/run_app_container \\1@g" > $HOME/.local/share/applications/$app_name.desktop
-echo "Created $HOME/.local/share/applications/$app_name.desktop"

app_containers/.local/bin/run_app_container

@@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-
-die() {
-  echo "$1" >&2
-  exit 1
-}
-
-[ -z "$CONTAINER_NAME" ] && die "\$CONTAINER_NAME not set"
-[ -z "$DISPLAY" ] && die "\$DISPLAY not set (you must run the script in a desktop environment"
-
-# Source configuration files if any
-config="$HOME/.config/app_containers/$CONTAINER_NAME.sh"
-if [ -f "$config" ]; then
-  source "$config"
-fi
-
-# Create a XDG_RUNTIME_DIR for guest on host
-container_xdg_runtime="$(mktemp -d)"
-trap 'rm -rf -- "$container_xdg_runtime"' EXIT
-
-# Link the current wayland session to the container's xdg runtime
-# Note that the session itself must be bind-mounted first
-ln -s /run/host/$WAYLAND_DISPLAY $container_xdg_runtime/$WAYLAND_DISPLAY
-
-# From <https://liolok.com/run-desktop-app-with-systemd-nspawn-container>
-if [[ -n $DBUS_SESSION_BUS_ADDRESS ]]; then # remove prefix
-    host_bus=${DBUS_SESSION_BUS_ADDRESS#unix:path=}
-else # default guess
-    host_bus=$XDG_RUNTIME_DIR/bus
-fi
-
-if [[ -n $PULSE_SERVER ]]; then # remove prefix
-  host_pulse=${PULSE_SERVER#unix:}
-else # default guess
-  host_pulse=$XDG_RUNTIME_DIR/pulse
-fi
-
-# Default username (assume `user` always has the same uid as the host user)
-run_as=user
-homedir=/home/user
-if [ "$CONTAINER_RUN_AS_ROOT" = true ]; then
-  run_as=root
-  homedir=/root
-fi
-
-SUDO_ASKPASS=$HOME/.local/bin/askpass-bemenu sudo -A systemd-nspawn -M $CONTAINER_NAME \
-    `# DNS (when containers do not have their own netns)` \
-    --bind-ro=/run/systemd/resolve/stub-resolv.conf:/etc/resolv.conf \
-    `# GPU` \
-    --bind=/dev/dri \
-    --bind=/dev/shm \
-    --property=DeviceAllow='/dev/dri rw' \
-    --property=DeviceAllow='/dev/shm rw' \
-    `# Input devices` \
-    --bind-ro=/dev/input \
-    --property=DeviceAllow='char-input r' \
-    `# Xdg runtime` \
-    --bind=$container_xdg_runtime:/run/xdg \
-    --setenv=XDG_RUNTIME_DIR=/run/xdg \
-    `# Xorg / Xwayland` \
-    --bind-ro=/tmp/.X11-unix \
-    --setenv=DISPLAY=$DISPLAY \
-    `# Wayland (note the symlink created before in xdg runtime)` \
-    --bind-ro=$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY:/run/host/$WAYLAND_DISPLAY \
-    --setenv=WAYLAND_DISPLAY=$WAYLAND_DISPLAY \
-    `# PulseAudio` \
-    --bind-ro=$host_pulse:/run/host/pulse \
-    --setenv=PULSE_SERVER=unix:/run/host/pulse/native \
-    `# DBus` \
-    --bind-ro=$host_bus:/run/host/bus \
-    --setenv=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/host/bus \
-    `# Scaling `\
-    --setenv=GDK_SCALE="$GDK_SCALE" \
-    `# Extra params` \
-    $SYSTEMD_NSPAWN_EXTRA_ARGS \
-    `# Launch app` \
-    --user=$run_as --chdir=$homedir --as-pid2 $@ 

utils/.local/bin/askpass-bemenu

@@ -1,7 +0,0 @@
-#!/bin/sh
-/usr/bin/bemenu \
-    --prompt "$1" \
-    --password \
-    --no-exec \
-    </dev/null
-# must close stdin, otherwise bemenu hangs