feat: replace docker by flatpak

This commit is contained in:
AngeD 2023-09-26 20:23:32 +02:00
parent 4e7cc23e42
commit 4d87709fef
9 changed files with 9 additions and 79 deletions

View File

@ -0,0 +1,2 @@
[Environment]
GTK_THEME=Materia-dark

View File

@ -3,7 +3,7 @@ export XDG_CONFIG_HOME="$HOME/.config"
export XDG_DATA_HOME="$HOME/.local/share"
export XDG_STATE_HOME="$HOME/.local/state"
export XDG_CONFIG_DIRS=/etc/xdg
export XDG_DATA_DIRS='/usr/local/share:/usr/share'
export XDG_DATA_DIRS="$XDG_DATA_HOME/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share:/usr/share"
export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
export ZSH="$ZDOTDIR/ohmyzsh"
@ -14,7 +14,7 @@ export ZSH_COMPDUMP="$XDG_CACHE_HOME/.zcompdump-$ZSH_VERSION"
export LESSHISTFILE='-'
path=("$HOME/bin" "$HOME/bin/containers" "$HOME/.local/bin" $path)
path=("$HOME/bin" "$HOME/.local/bin" /var/lib/flatpak/exports/bin $path)
export EDITOR='nvim'
export MAKEFLAGS='-j'

View File

@ -1,5 +1,4 @@
#!/bin/bash -e
# shellcheck disable=SC2034
CRI=(podman)

View File

@ -1,5 +0,0 @@
#!/bin/bash -e
CRI=(podman)
"${CRI[@]}" run --rm -it -v "$PWD:/mnt/" -w /mnt/ debian:12-slim

View File

@ -1,21 +0,0 @@
#!/bin/bash -e
if [ -z "$WAYLAND_DISPLAY" ]; then
CRI_OPT+=(
--network host
-e XAUTHORITY=/app/.Xauthority
-v "$XAUTHORITY:/app/.Xauthority:ro"
)
fi
CRI=(podman)
"${CRI[@]}" run --rm --name gui \
--userns=keep-id \
--device /dev/dri/ \
-e DISPLAY \
-e XDG_RUNTIME_DIR \
-v /tmp/.X11-unix/:/tmp/.X11-unix/ \
-v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \
-v home:/app/ \
git.maby.dev/ange/docker-gui:0.1

View File

@ -1,25 +0,0 @@
#!/bin/bash -e
if [ -z "$WAYLAND_DISPLAY" ]; then
CRI_OPT+=(
--network host
-e XAUTHORITY=/app/.Xauthority
-v "$XAUTHORITY:/app/.Xauthority:ro"
)
fi
CRI=(podman)
HOMEDIR="$HOME/.local/state/docker-gui/lutris"
mkdir -p "$HOMEDIR"
"${CRI[@]}" run --rm --name lutris \
"${CRI_OPT[@]}" \
--userns=keep-id \
--device /dev/dri/ \
-e DISPLAY \
-e XDG_RUNTIME_DIR \
-v /tmp/.X11-unix/:/tmp/.X11-unix/ \
-v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \
-v "$HOMEDIR:/app/" \
git.maby.dev/ange/docker-lutris:0.1

View File

@ -1,25 +0,0 @@
#!/bin/bash -e
if [ -z "$WAYLAND_DISPLAY" ]; then
CRI_OPT+=(
--network host
-e XAUTHORITY=/app/.Xauthority
-v "$XAUTHORITY:/app/.Xauthority:ro"
)
fi
CRI=(podman)
HOMEDIR="$HOME/.local/state/GUI/minecraft"
mkdir -p "$HOMEDIR"
"${CRI[@]}" run --rm --name minecraft \
"${CRI_OPT[@]}" \
--userns=keep-id \
--device /dev/dri/ \
-e DISPLAY \
-e XDG_RUNTIME_DIR \
-v /tmp/.X11-unix/:/tmp/.X11-unix/ \
-v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \
-v "$HOMEDIR:/app/" \
git.maby.dev/ange/docker-minecraft:0.1

5
bin/debian Executable file
View File

@ -0,0 +1,5 @@
#!/bin/bash -e
CRI=(podman)
"${CRI[@]}" run --rm -it -v "$PWD:/mnt/" -w /mnt/ docker.io/debian:12-slim