diff --git a/.config/nvim/ftplugin/javascript.lua b/.config/nvim/ftplugin/javascript.lua new file mode 100644 index 0000000..6845f3a --- /dev/null +++ b/.config/nvim/ftplugin/javascript.lua @@ -0,0 +1,6 @@ +-- variables +vim.opt_local.shiftwidth = 2 +vim.opt_local.tabstop = 2 +vim.opt_local.listchars = vim.o.listchars .. ",leadmultispace:│ " + +-- keybindings diff --git a/.config/nvim/pack/plugins/opt/lspconfig b/.config/nvim/pack/plugins/opt/lspconfig index dd11ba7..d177ad2 160000 --- a/.config/nvim/pack/plugins/opt/lspconfig +++ b/.config/nvim/pack/plugins/opt/lspconfig @@ -1 +1 @@ -Subproject commit dd11ba7b3c8f82d51b6d4dd7d68fce2d78bf78a0 +Subproject commit d177ad277a638f262edb73c75ffe33e377b95dc5 diff --git a/.config/nvim/pack/plugins/opt/onedark b/.config/nvim/pack/plugins/opt/onedark index cae5fdf..dac8c39 160000 --- a/.config/nvim/pack/plugins/opt/onedark +++ b/.config/nvim/pack/plugins/opt/onedark @@ -1 +1 @@ -Subproject commit cae5fdf035ee92c407a29ee2ccfcff503d2be7f1 +Subproject commit dac8c39812dae025255c9069a260e1f69d967927 diff --git a/.config/nvim/pack/plugins/opt/plenary b/.config/nvim/pack/plugins/opt/plenary index 267282a..0232372 160000 --- a/.config/nvim/pack/plugins/opt/plenary +++ b/.config/nvim/pack/plugins/opt/plenary @@ -1 +1 @@ -Subproject commit 267282a9ce242bbb0c5dc31445b6d353bed978bb +Subproject commit 0232372b906f275f76ac42029eba25eaf95e76b9 diff --git a/.config/nvim/pack/plugins/opt/telescope b/.config/nvim/pack/plugins/opt/telescope index 47c755d..a197706 160000 --- a/.config/nvim/pack/plugins/opt/telescope +++ b/.config/nvim/pack/plugins/opt/telescope @@ -1 +1 @@ -Subproject commit 47c755d737702df7a39b640c8d9c473a728be1df +Subproject commit a19770625aed49ad2a9f591a5e3946707f7359f6 diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter index 4115fad..96a5024 160000 --- a/.config/nvim/pack/plugins/opt/treesitter +++ b/.config/nvim/pack/plugins/opt/treesitter @@ -1 +1 @@ -Subproject commit 4115fad9fded72571bdc3e0f7351e64b31799a3d +Subproject commit 96a50241987531fdb8a516998b72c19f563ccd6c diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index 0add2d5..b23ba3b 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -1,3 +1,6 @@ +ln -sf "$(mktemp -d chromiumconfigXXX)" "$XDG_CACHE_HOME/chromium" +ln -sf "$(mktemp -d chromiumcacheXXXX)" "$XDG_CONFIG_HOME/chromium" + if [ "$XDG_VTNR" = 1 ]; then GUILOG="$HOME/.local/share/gui.log" diff --git a/.config/zsh/custom/themes/powerlevel10k b/.config/zsh/custom/themes/powerlevel10k index 932954a..873c4ff 160000 --- a/.config/zsh/custom/themes/powerlevel10k +++ b/.config/zsh/custom/themes/powerlevel10k @@ -1 +1 @@ -Subproject commit 932954a8b1e31ae540e9df5e5e464100d46e53ec +Subproject commit 873c4ff09c559a507d33e528df7e27a8a48705d7 diff --git a/.config/zsh/ohmyzsh b/.config/zsh/ohmyzsh index 7d5e125..cd18bce 160000 --- a/.config/zsh/ohmyzsh +++ b/.config/zsh/ohmyzsh @@ -1 +1 @@ -Subproject commit 7d5e12500a2ba0b575ffafcbb516568973528730 +Subproject commit cd18bce53e01d0f614ffcbb7429053fb508cb095 diff --git a/bin/banana b/bin/containers/banana similarity index 100% rename from bin/banana rename to bin/containers/banana 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 index d923352..4a04d75 100755 --- a/bin/containers/gui +++ b/bin/containers/gui @@ -1,15 +1,25 @@ #!/bin/bash -e +if grep -q 'Arch' /etc/os-release; then + unset DBUS_SESSION_BUS_ADDRESS +fi + +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 /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 + git.maby.dev/ange/docker-gui:0.1 diff --git a/bin/containers/lutris b/bin/containers/lutris index 5db20b9..4afe0b1 100755 --- a/bin/containers/lutris +++ b/bin/containers/lutris @@ -1,20 +1,29 @@ #!/bin/bash -e -DBUS_SESSION_BUS_ADDRESS= +if grep -q 'Arch' /etc/os-release; then + unset DBUS_SESSION_BUS_ADDRESS +fi + +if [ -z "$WAYLAND_DISPLAY" ]; then + CRI_OPT+=( + --network host + -e XAUTHORITY=/app/.Xauthority + -v "$XAUTHORITY:/app/.Xauthority:ro" + ) +fi + CRI=(podman) -mkdir -p "$HOME/GUI/lutris/" +HOMEDIR="$HOME/.local/state/docker-gui/lutris" +mkdir -p "$HOMEDIR" "${CRI[@]}" run --rm --name lutris \ - --network host \ + "${CRI_OPT[@]}" \ --userns=keep-id \ --device /dev/dri/ \ -e DISPLAY \ -e XDG_RUNTIME_DIR \ - -e XAUTHORITY=/app/.Xauthority \ - -v /dev/shm/:/dev/shm/ \ -v /tmp/.X11-unix/:/tmp/.X11-unix/ \ - -v "$XAUTHORITY:/app/.Xauthority:ro" \ -v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \ - -v "$HOME/GUI/lutris/:/app/" \ + -v "$HOMEDIR:/app/" \ git.maby.dev/ange/docker-lutris:0.1 diff --git a/bin/containers/minecraft b/bin/containers/minecraft index f0fb1e4..a702a86 100755 --- a/bin/containers/minecraft +++ b/bin/containers/minecraft @@ -1,20 +1,29 @@ #!/bin/bash -e -DBUS_SESSION_BUS_ADDRESS= +if grep -q 'Arch' /etc/os-release; then + unset DBUS_SESSION_BUS_ADDRESS +fi + +if [ -z "$WAYLAND_DISPLAY" ]; then + CRI_OPT+=( + --network host + -e XAUTHORITY=/app/.Xauthority + -v "$XAUTHORITY:/app/.Xauthority:ro" + ) +fi + CRI=(podman) -mkdir -p "$HOME/GUI/minecraft/" +HOMEDIR="$HOME/.local/state/GUI/minecraft" +mkdir -p "$HOMEDIR" "${CRI[@]}" run --rm --name minecraft \ - --network host \ + "${CRI_OPT[@]}" \ --userns=keep-id \ --device /dev/dri/ \ -e DISPLAY \ -e XDG_RUNTIME_DIR \ - -e XAUTHORITY=/app/.Xauthority \ - -v /dev/shm/:/dev/shm/ \ -v /tmp/.X11-unix/:/tmp/.X11-unix/ \ - -v "$XAUTHORITY:/app/.Xauthority:ro" \ -v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \ - -v "$HOME/GUI/minecraft/:/app/" \ + -v "$HOMEDIR:/app/" \ git.maby.dev/ange/docker-minecraft:0.1 diff --git a/bin/containers/torbrowser b/bin/containers/torbrowser deleted file mode 100755 index 40762fb..0000000 --- a/bin/containers/torbrowser +++ /dev/null @@ -1,16 +0,0 @@ -#!/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