From 916fb70a696dee54b3d1488b168aac2cc5b18ee2 Mon Sep 17 00:00:00 2001 From: AngeD Date: Mon, 3 Jul 2023 18:16:11 +0200 Subject: [PATCH] feat: ~/bin/containers: containerized applis --- .config/nvim/pack/plugins/opt/telescope | 2 +- .config/nvim/pack/plugins/opt/treesitter | 2 +- .zshenv | 2 +- bin/containers/debian | 5 +++++ bin/{ => containers}/epitest | 0 bin/containers/gui | 15 +++++++++++++++ bin/{ => containers}/lutris | 0 bin/{ => containers}/minecraft | 0 bin/{ => containers}/repitest | 0 bin/containers/torbrowser | 16 ++++++++++++++++ bin/sbar | 2 +- 11 files changed, 40 insertions(+), 4 deletions(-) create mode 100755 bin/containers/debian rename bin/{ => containers}/epitest (100%) create mode 100755 bin/containers/gui rename bin/{ => containers}/lutris (100%) rename bin/{ => containers}/minecraft (100%) rename bin/{ => containers}/repitest (100%) create mode 100755 bin/containers/torbrowser diff --git a/.config/nvim/pack/plugins/opt/telescope b/.config/nvim/pack/plugins/opt/telescope index c5b11f4..0e06009 160000 --- a/.config/nvim/pack/plugins/opt/telescope +++ b/.config/nvim/pack/plugins/opt/telescope @@ -1 +1 @@ -Subproject commit c5b11f4fe780f4acd6ed0d58575d3cb7af3e893a +Subproject commit 0e0600908d1ad5ac4992fa0ab578e23e9d9d6f37 diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter index 3fde158..c42a8f9 160000 --- a/.config/nvim/pack/plugins/opt/treesitter +++ b/.config/nvim/pack/plugins/opt/treesitter @@ -1 +1 @@ -Subproject commit 3fde1587d0850d46b5a1473e5d1e59254e947496 +Subproject commit c42a8f96d37be82cf32934c4351150d7736f93f5 diff --git a/.zshenv b/.zshenv index e613de2..5ee12bd 100644 --- a/.zshenv +++ b/.zshenv @@ -14,7 +14,7 @@ export ZSH_COMPDUMP="$XDG_CACHE_HOME/.zcompdump-$ZSH_VERSION" export LESSHISTFILE='-' -path=("$HOME/bin" "$HOME/.local/bin" $path) +path=("$HOME/bin" "$HOME/bin/containers" "$HOME/.local/bin" $path) export EDITOR='nvim' export MAKEFLAGS='-j' diff --git a/bin/containers/debian b/bin/containers/debian new file mode 100755 index 0000000..09ef134 --- /dev/null +++ b/bin/containers/debian @@ -0,0 +1,5 @@ +#!/bin/bash -e + +CRI=(podman) + +${CRI[@]} run --rm -it -v "$PWD:/mnt" -w /mnt debian:12-slim diff --git a/bin/epitest b/bin/containers/epitest similarity index 100% rename from bin/epitest rename to bin/containers/epitest diff --git a/bin/containers/gui b/bin/containers/gui new file mode 100755 index 0000000..9e91f9a --- /dev/null +++ b/bin/containers/gui @@ -0,0 +1,15 @@ +#!/bin/bash -e + +CRI=(podman) + +${CRI[@]} run --rm --name minecraft \ + --device /dev/dri/ \ + -e DISPLAY \ + -e XDG_RUNTIME_DIR \ + -v /dev/shm:/dev/shm \ + -v /tmp/.X11-unix/:/tmp/.X11-unix/ \ + -v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \ + -v "home:/app/" \ + -it \ + git.maby.dev/ange/docker-gui:0.1 \ + bash diff --git a/bin/lutris b/bin/containers/lutris similarity index 100% rename from bin/lutris rename to bin/containers/lutris diff --git a/bin/minecraft b/bin/containers/minecraft similarity index 100% rename from bin/minecraft rename to bin/containers/minecraft diff --git a/bin/repitest b/bin/containers/repitest similarity index 100% rename from bin/repitest rename to bin/containers/repitest diff --git a/bin/containers/torbrowser b/bin/containers/torbrowser new file mode 100755 index 0000000..873d826 --- /dev/null +++ b/bin/containers/torbrowser @@ -0,0 +1,16 @@ +#!/bin/bash -e + +CRI=(podman) + +mkdir -p "/tmp/torbrowser/" + +${CRI[@]} run --rm --name torbrowser \ + --userns=keep-id \ + --device /dev/dri/ \ + -e DISPLAY \ + -e XDG_RUNTIME_DIR \ + -v /dev/shm:/dev/shm \ + -v /tmp/.X11-unix/:/tmp/.X11-unix/ \ + -v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \ + -v "/tmp/torbrowser/:/app/" \ + git.maby.dev/ange/docker-torbrowser:0.1 diff --git a/bin/sbar b/bin/sbar index 475003f..6193e8b 100755 --- a/bin/sbar +++ b/bin/sbar @@ -70,7 +70,7 @@ reload_bar() { } display() { - ${DISPLAYCMD[@]} "$crypto | $cpu | $memory | $vol | $wlp | $bat | $time" + "${DISPLAYCMD[@]}" "$crypto | $cpu | $memory | $vol | $wlp | $bat | $time" } # SIGNALING