feat(build): set group executable flag for all folders in .config

.bin/create-home-tarball.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+if [ "$(basename "$(pwd -P)")" != "workspaces" ]; then
+  echo "Error: this script must be run from a directory named 'workspaces', not '$(basename "$(pwd -P)")'" >&2
+  exit 1
+fi
+
+replace_home() {
+  sed -i "s|$1|$2|g" .config/fish/fish_variables
+  find .local/share/nvim/mason/packages -type f -exec sed -i "s|$1|$2|g" {} +
+}
+
+find .config -type d -exec chmod g+x {} +
+
+replace_home "$PWD" "/home/devuser"
+tar -czf home.tar.gz --owner root --group secproc --xform "s,$PWD,/home/devuser," .config .local .ssh start.sh
+replace_home "/home/devuser" "$PWD"

.bin/test-tmux.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+PWD="$(pwd -P)"
+
+if [ "$(basename "$PWD")" != "workspaces" ]; then
+  echo "Error: this script must be run from a directory named 'workspaces', not '$(basename "$(pwd -P)")'" >&2
+  exit 1
+fi
+
+# Override PWD and HOME for this invocation
+export PWD=$PWD
+export HOME=$PWD
+export TMUX=""
+
+# Optionally adjust XDG_CONFIG_HOME if you use that
+# export XDG_CONFIG_HOME="$HOME/.config"
+
+# Start (or attach to) your dev session
+SESSION="dev"
+
+# If the session doesn't exist, create it
+if ! tmux has-session -t "$SESSION" 2>/dev/null; then
+  tmux new-session -d -s "$SESSION" -n editor 'HOME='"$HOME"' XDG_STATE_HOME='"$HOME/.state"' /usr/bin/fish'
+fi
+
+tmux send-keys -t $SESSION:editor 'fisher install jorgebucaran/fisher pure-fish/pure patrickf1/fzf.fish jorgebucaran/autopair.fish gazorby/fish-abbreviation-tips jethrokuan/z' Enter
+
+# Attach to it
+exec tmux attach -t "$SESSION"

.config/nvim/lazy-lock.json

@@ -0,0 +1,64 @@
+{
+  "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" },
+  "LuaSnip": { "branch": "master", "commit": "c1851d5c519611dfc451b6582961b2602e0af89b" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "ba7bad63cb96dae5a82e48310beada18e8eeafe5" },
+  "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
+  "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
+  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
+  "catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" },
+  "codeium.nvim": { "branch": "main", "commit": "821b570b526dbb05b57aa4ded578b709a704a38a" },
+  "conform.nvim": { "branch": "master", "commit": "2b2b30260203af3b93a7470ac6c8457ddd6e32d9" },
+  "dial.nvim": { "branch": "master", "commit": "2c7e2750372918f072a20f3cf754d845e143d7c9" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+  "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "gitsigns.nvim": { "branch": "main", "commit": "e399f9748d7cfd8859747c8d6c4e9c8b4d50a1bd" },
+  "grug-far.nvim": { "branch": "main", "commit": "176ba4c42924f4d84ee7d19c9f0081c538f84a88" },
+  "inc-rename.nvim": { "branch": "main", "commit": "2eaff20526ff6101337b84f4b0d238c11f47d7f4" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
+  "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
+  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
+  "mini.ai": { "branch": "main", "commit": "e139eb1101beb0250fea322f8c07a42f0f175688" },
+  "mini.files": { "branch": "main", "commit": "49c855977e9f4821d1ed8179ed44fe098b93ea2a" },
+  "mini.hipatterns": { "branch": "main", "commit": "e5083df391171dc9d8172645606f8496d9443374" },
+  "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
+  "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" },
+  "mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" },
+  "neogen": { "branch": "main", "commit": "d7f9461727751fb07f82011051338a9aba07581d" },
+  "neotest": { "branch": "master", "commit": "862afb2a2219d9ca565f67416fb7003cc0f22c4f" },
+  "neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" },
+  "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
+  "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
+  "nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" },
+  "nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" },
+  "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
+  "nvim-jdtls": { "branch": "master", "commit": "c23f200fee469a415c77265ca55b496feb646992" },
+  "nvim-lint": { "branch": "master", "commit": "fdb04e9285edefbe25a02a31a35e8fbb10fe054d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ac1dfbe3b60e5e23a2cff90e3bd6a3bc88031a57" },
+  "nvim-metals": { "branch": "main", "commit": "f9cc5e7f7bc129b8056f1e5aef7a91c9b5b83664" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+  "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "b0debd5c424969b4baeabdc8f54db3036c691732" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
+  "one-small-step-for-vimkind": { "branch": "main", "commit": "ba909c68fed65e268df8a4684bafef4ec889c8bc" },
+  "overseer.nvim": { "branch": "master", "commit": "72c68aab0358c92f451168b704c411c4a3e3410e" },
+  "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "render-markdown.nvim": { "branch": "main", "commit": "a1b0988f5ab26698afb56b9c2f0525a4de1195c1" },
+  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
+  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
+  "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
+  "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" },
+  "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "460432301a5cb280ea265ddfa15c9f3dcd1d26b7" },
+  "vim-illuminate": { "branch": "master", "commit": "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf" },
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
+  "yanky.nvim": { "branch": "main", "commit": "04775cc6e10ef038c397c407bc17f00a2f52b378" }
+}

.gitignore

@@ -1,5 +1,7 @@
 logs
-files/pallav
-home/.config/nvim/lazy-lock.json
-home/.local
-home/.cache
+.local
+.cache
+.state
+.config/fish
+.npm
+home.tar.gz

.ssh/config

@@ -1,7 +1,7 @@
 Host alps
     HostName 10.88.0.1
     User git
-    IdentityFile /opt/secure/ssh/id_ed25519
+    IdentityFile ~/.ssh/id_ed25519
     IdentitiesOnly yes
     StrictHostKeyChecking yes
     Port 2222
@@ -10,7 +10,7 @@ Host alps
 Host github
     HostName github.com
     User git
-    IdentityFile /opt/secure/ssh/id_ed25519
+    IdentityFile ~/.ssh/id_ed25519
     IdentitiesOnly yes
     StrictHostKeyChecking yes
     ProxyCommand none

.vscode/tasks.json

@@ -4,7 +4,7 @@
     {
       "label": "Build workspace image",
       "type": "shell",
-      "command": "./build-workspace.sh",
+      "command": "${workspaceFolder}/build-workspace.sh",
       "group": "build",
       "problemMatcher": [],
       "detail": "build podman image using buildah"
@@ -12,7 +12,7 @@
     {
       "label": "Clean dangling images",
       "type": "shell",
-      "command": "./clean_dangling_images.sh",
+      "command": "${workspaceFolder}/.bin/clean_dangling_images.sh",
       "problemMatcher": [],
       "detail": "Clean podman images"
     },
@@ -43,6 +43,28 @@
       "command": "sudo cp access.yml /home/infilytics/ && sudo chown -R infilytics:infilytics /home/infilytics/access.yml",
       "problemMatcher": [],
       "detail": "Copy access.yml to /home/infilytics"
+    },
+    {
+      "label": "Create home tarball",
+      "type": "shell",
+      "command": "${workspaceFolder}/.bin/create-home-tarball.sh",
+      "problemMatcher": [],
+      "detail": "create home.tar.gz from .config .local .ssh start.sh"
+    },
+    {
+      "label": "Start a tmux test session",
+      "type": "shell",
+      "group": "test",
+      "command": "${workspaceFolder}/.bin/test-tmux.sh",
+      "problemMatcher": [],
+      "detail": "run tmux with project room as home"
+    },
+    {
+      "label": "Delete .gitignore files",
+      "type": "shell",
+      "command": "git clean -Xfd",
+      "problemMatcher": [],
+      "detail": "delete all untracked files listed in .gitignore"
     }
   ],
   "inputs": []

build-workspace.sh

@@ -6,57 +6,30 @@ IMG_NAME="analytics-backend-workspace"
 DEV_USER=devuser
 DEV_UID=1001
 DEV_GID=1001
-SECURE=/opt/secure
 DEV_HOME=/home/$DEV_USER
 
 ctr=$(buildah from archlinux)
 
 buildah run "$ctr" -- bash -c "\
   pacman -Sy --noconfirm && pacman -S --noconfirm --needed base-devel neovim git fish tmux \
-  nodejs python podman fzf fd ripgrep jdk-openjdk fisher yazi less \
+  nodejs python podman fzf fd ripgrep jdk-openjdk fisher yazi less buildah \
   lazygit luarocks python-pynvim npm bash-completion tree-sitter-cli kitty-terminfo \
   lua51 openssh && pacman -Scc --noconfirm && groupadd secproc && groupadd -g $DEV_GID $DEV_USER && \
-  useradd -ms /bin/fish -G secproc -u $DEV_UID -g $DEV_GID $DEV_USER && mkdir -m 511 -p $SECURE
+  useradd -ms /bin/fish -G secproc -u $DEV_UID -g $DEV_GID $DEV_USER
 "
 
-# copy start script, neovim, tmux setup and ssh setup
-buildah copy --chown $DEV_USER:$DEV_USER "$ctr" ./home/. $DEV_HOME
-buildah copy "$ctr" 00-allow-git.conf /etc/ssh/ssh_config.d/
+buildah add "$ctr" home.tar.gz $DEV_HOME
 
-# configure lazyvim
 # shellcheck disable=SC2016
-buildah run --user "$DEV_USER" "$ctr" -- fish -c '
+buildah run "$ctr" -- fish -c '
   set -gx HOME '"$DEV_HOME"';
-  mkdir -p $HOME/.ssh;
   ssh-keyscan -p 2222 10.88.0.1 >> $HOME/.ssh/known_hosts;
   ssh-keyscan -p 22 github.com >> $HOME/.ssh/known_hosts;
-  fisher install \
-    jorgebucaran/fisher \
-    pure-fish/pure \
-    patrickf1/fzf.fish \
-    jorgebucaran/autopair.fish \
-    gazorby/fish-abbreviation-tips \
-    jethrokuan/z;
+  chown -R '"$DEV_USER"':'"$DEV_USER"' $HOME/.local $HOME/.config/fish/completions \
+    $HOME/.config/fish/functions $HOME/.config/fish/fish_variables;
+  chown '"$DEV_USER"':'"$DEV_USER"' $HOME/.config/tmux;
 '
 
-# lock the files
-buildah run "$ctr" -- bash -c "\
-  chmod 750 $DEV_HOME/start.sh \
-  $DEV_HOME/.config/lazygit/config.yml \
-  $DEV_HOME/.config/nvim/lua/config/lazy.lua \
-  $DEV_HOME/.config/nvim/init.lua \
-  $DEV_HOME/.config/nvim/README.md \
-  $DEV_HOME/.config/nvim/LICENSE \
-  $DEV_HOME/.config/tmux/tmux.conf && \
-  chown root:secproc $DEV_HOME/start.sh \
-  $DEV_HOME/.config/lazygit/config.yml \
-  $DEV_HOME/.config/nvim/lua/config/lazy.lua \
-  $DEV_HOME/.config/nvim/init.lua \
-  $DEV_HOME/.config/nvim/README.md \
-  $DEV_HOME/.config/nvim/LICENSE \
-  $DEV_HOME/.config/tmux/tmux.conf
-"
-
 buildah config \
   --user $DEV_USER \
   --workingdir /app \

nvim-workspace.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-XDG_CONFIG_HOME="$PWD/home/.config" \
-  XDG_DATA_HOME="$PWD/home/.local/share" \
-  XDG_STATE_HOME="$PWD/home/.local/state" \
-  XDG_CACHE_HOME="$PWD/home/.cache" \
-  nvim

pre-build.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-ln -s "$PWD"/zsh-autosuggestions "$PWD"/config/zsh/ohmyzsh/custom/plugins/zsh-autosuggestions
-ln -s "$PWD"/zsh-syntax-highlighting "$PWD"/config/zsh/ohmyzsh/custom/plugins/zsh-syntax-highlighting
-rm -rf local/state

ssh_router.sh

@@ -80,8 +80,8 @@ start_container_if_needed() {
       -v "${XDG_RUNTIME_DIR}"/podman/podman.sock:/run/podman/podman.sock \
       -v /home/infilytics/data/"$WORKSPACE":/app \
       -v /home/infilytics/secrets/"$WORKSPACE"/gitconfig:/home/"$DEV_USER"/.gitconfig:ro \
-      -v /home/infilytics/secrets/"$WORKSPACE"/id_ed25519:/opt/secure/ssh/id_ed25519:ro \
-      -v /home/infilytics/secrets/"$WORKSPACE"/id_ed25519.pub:/opt/secure/ssh/id_ed25519.pub:ro \
+      -v /home/infilytics/secrets/"$WORKSPACE"/id_ed25519:/home/"$DEV_USER"/.ssh/id_ed25519:ro \
+      -v /home/infilytics/secrets/"$WORKSPACE"/id_ed25519.pub:/home/"$DEV_USER"/.ssh/id_ed25519.pub:ro \
       --entrypoint "/home/$DEV_USER/start.sh" \
       "$IMAGE" "${TMUX_SESSION}"
   elif ! podman inspect -f '{{.State.Running}}' "$WORKSPACE" | grep -q true; then