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

This reverts commit 7f2534a1fd.

.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" }
+}

.config/nvim/lazyvim.json

@@ -8,7 +8,6 @@
     "lazyvim.plugins.extras.dap.core",
     "lazyvim.plugins.extras.dap.nlua",
     "lazyvim.plugins.extras.editor.dial",
-    "lazyvim.plugins.extras.editor.fzf",
     "lazyvim.plugins.extras.editor.illuminate",
     "lazyvim.plugins.extras.editor.inc-rename",
     "lazyvim.plugins.extras.editor.mini-files",
@@ -37,4 +36,3 @@
   },
   "version": 8
 }
-

.config/nvim/lua/config/keymaps.lua

@@ -0,0 +1,15 @@
+-- Keymaps are automatically loaded on the VeryLazy event
+-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
+
+vim.keymap.set(
+  "n",
+  "]<space>",
+  ':<C-u>call append(line("."),   repeat([""], v:count1))<CR>',
+  { silent = true, desc = "Add line below" }
+)
+vim.keymap.set(
+  "n",
+  "[<space>",
+  ':<C-u>call append(line(".")-1, repeat([""], v:count1))<CR>',
+  { silent = true, desc = "Add line above" }
+)

.config/nvim/lua/config/options.lua

@@ -1,3 +1,4 @@
 -- Options are automatically loaded before lazy.nvim startup
 -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
 -- Add any additional options here
+vim.opt.clipboard = "unnamedplus"

.config/nvim/lua/plugins/diffview.lua

@@ -0,0 +1,208 @@
+return {
+  {
+    "folke/snacks.nvim",
+    dependencies = { "sindrets/diffview.nvim" },
+    ---@type snacks.Config
+    opts = {
+      picker = {
+        sources = {
+          git_diff_any = {
+            finder = function()
+              local cmd = {
+                "git",
+                "log",
+                "--branches",
+                "--remotes",
+                "--oneline",
+                "--decorate=short",
+                "--color=never",
+                "--pretty=format:%h%x1f%D%x1f%s%x1f%ch",
+              }
+              local raw = vim.fn.systemlist(cmd)
+              if vim.v.shell_error ~= 0 then
+                vim.notify("Failed to load git log", vim.log.levels.ERROR)
+                return {}
+              end
+
+              local items = {}
+              for i, record in ipairs(raw) do
+                if record ~= "" then
+                  -- split on our unit‐separator
+                  local parts = vim.split(record, "\x1f", { plain = true })
+                  local sha = parts[1]
+                  local decorate = parts[2]:gsub("^%s*(.-)%s*$", "%1") -- trim
+                  local msg = parts[3]
+                  local rel_date = parts[4]
+                  -- rebuild a nice display string
+                  local display = string.format("%s %s %s (%s)", sha, decorate ~= "" and decorate or "", msg, rel_date)
+
+                  items[#items + 1] = {
+                    idx = i, -- required
+                    score = 0, -- required
+                    text = display, -- shown in the list
+                    commit = sha, -- for later Diffview use
+                    branch = decorate,
+                    msg = msg,
+                    date = rel_date,
+                  }
+                end
+              end
+
+              return items
+            end,
+
+            format = function(item, picker)
+              local util = Snacks.picker.util
+              local hl = Snacks.picker.highlight
+              local a = util.align
+              local ret = {}
+
+              -- 1) Commit icon + SHA
+              ret[#ret + 1] = { picker.opts.icons.git.commit, "SnacksPickerGitCommit" }
+              ret[#ret + 1] = { a(item.commit, 8, { truncate = true }), "SnacksPickerGitCommit" }
+              ret[#ret + 1] = { " " }
+
+              -- 2) Relative date
+              ret[#ret + 1] = { a(item.date, 16), "SnacksPickerGitDate" }
+              ret[#ret + 1] = { " " }
+
+              -- 3) Branch/Tag decorate info (if any)
+              if item.branch and item.branch ~= "" then
+                -- local truncated = a(item.branch, 20, { truncate = true })
+                local truncated = item.branch
+                ret[#ret + 1] = { "[" .. truncated .. "]", "SnacksPickerGitBranch" }
+                ret[#ret + 1] = { " " }
+              end
+
+              -- 4) Conventional-commit parsing: type, scope, breaking, and body
+              local msg = item.msg
+              local typ, scope, breaking, body = msg:match("^(%S+)%s*(%b())(!?):%s*(.*)$")
+              if not typ then
+                typ, breaking, body = msg:match("^(%S+)(!?):%s*(.*)$")
+              end
+
+              local msg_hl = "SnacksPickerGitMsg"
+              if typ and body then
+                local dimmed = vim.tbl_contains({ "chore", "bot", "build", "ci", "style", "test" }, typ)
+                msg_hl = dimmed and "SnacksPickerDimmed" or "SnacksPickerGitMsg"
+
+                -- type
+                local type_hl = breaking ~= "" and "SnacksPickerGitBreaking"
+                  or dimmed and "SnacksPickerBold"
+                  or "SnacksPickerGitType"
+                ret[#ret + 1] = { typ, type_hl }
+
+                -- scope
+                if scope and scope ~= "" then
+                  ret[#ret + 1] = { scope, "SnacksPickerGitScope" }
+                end
+
+                -- breaking "!"
+                if breaking ~= "" then
+                  ret[#ret + 1] = { "!", "SnacksPickerGitBreaking" }
+                end
+
+                -- delimiter
+                ret[#ret + 1] = { ": ", "SnacksPickerDelim" }
+                msg = body
+              end
+
+              -- 5) The rest of the message
+              ret[#ret + 1] = { msg, msg_hl }
+
+              -- 6) Markdown-style inline formatting & issue hyperlinked
+              hl.markdown(ret)
+              hl.highlight(ret, { ["#%d+"] = "SnacksPickerGitIssue" })
+
+              return ret
+            end,
+
+            preview = "git_show",
+
+            matcher = { fuzzy = true },
+            sort = { fields = { "idx" } },
+
+            title = "Select commits to diff",
+
+            confirm = function(picker)
+              local sel = picker:selected()
+              picker:close()
+
+              local function open_single(s)
+                local parents = vim.fn.systemlist("git rev-list --parents -n 1 " .. s)[1] or ""
+                if parents:find(" ") then
+                  vim.cmd("DiffviewOpen " .. s .. "^.." .. s)
+                else
+                  vim.cmd("DiffviewOpen " .. s)
+                end
+              end
+
+              if #sel == 1 then
+                open_single(sel[1].commit)
+              elseif #sel == 2 then
+                vim.cmd("DiffviewOpen " .. sel[2].commit .. ".." .. sel[1].commit)
+              else
+                vim.notify("Select maximum two commits", vim.log.levels.ERROR)
+              end
+            end,
+          },
+          git_diff_branches = {
+            finder = "git_branches",
+            format = "git_branch",
+            preview = "git_log",
+
+            matcher = { fuzzy = true },
+            sort = { fields = { "idx" } },
+
+            title = "Select branches to diff",
+
+            confirm = function(picker)
+              local sel = picker:selected()
+              picker:close()
+
+              local function open_single(s)
+                local parents = vim.fn.systemlist("git rev-list --parents -n 1 " .. s)[1] or ""
+                if parents:find(" ") then
+                  vim.cmd("DiffviewOpen " .. s .. "^.." .. s)
+                else
+                  vim.cmd("DiffviewOpen " .. s)
+                end
+              end
+
+              if #sel == 1 then
+                open_single(sel[1].branch)
+              elseif #sel == 2 then
+                vim.cmd("DiffviewOpen " .. sel[2].branch .. ".." .. sel[1].branch)
+              else
+                vim.notify("Select maximum two commits", vim.log.levels.ERROR)
+              end
+            end,
+          },
+        },
+      },
+    },
+
+    keys = {
+      {
+        "<leader>gD",
+        function()
+          ---@diagnostic disable-next-line: undefined-field
+          Snacks.picker.git_diff_any()
+        end,
+        desc = "Snacks: Git Diff",
+      },
+      {
+        "<leader>gE",
+        function()
+          ---@diagnostic disable-next-line: undefined-field
+          Snacks.picker.git_diff_branches()
+        end,
+        desc = "Snacks: Git Branch Diff",
+      },
+    },
+  },
+  {
+    "sindrets/diffview.nvim",
+    opts = {},
+  },
+}

.config/tmux/tmux.conf.local

@@ -4,7 +4,7 @@
 #         without any warranty.
 #         Copyright 2012— Gregory Pakosz (@gpakosz).
 
-set -g default-shell /usr/bin/zsh
+set -g default-shell /usr/bin/fish
 
 # -- bindings ------------------------------------------------------------------
 

.gitignore

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

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "home/.config/zsh/ohmyzsh"]
-	path = home/.config/zsh/ohmyzsh
-	url = https://github.com/ohmyzsh/ohmyzsh.git
-  ignore = all

.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"
     },
@@ -36,6 +36,35 @@
       "command": "sudo cp ssh_router.sh /home/infilytics/ && sudo chown -R infilytics:infilytics /home/infilytics/ssh_router.sh",
       "problemMatcher": [],
       "detail": "Copy ssh_router.sh to /home/infilytics"
+    },
+    {
+      "label": "Copy access.yml",
+      "type": "shell",
+      "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": []

access.yml

@@ -4,6 +4,7 @@ pallav:
   rw:
     - darshan
     - param
+    - palak
 
 darshan:
   name: Darshan Parmar

build-workspace.sh

@@ -6,51 +6,29 @@ 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 zsh tmux \
+  pacman -Sy --noconfirm && pacman -S --noconfirm --needed base-devel neovim git fish tmux \
-  nodejs python podman fzf fd ripgrep jdk-openjdk zsh-completions zsh-syntax-highlighting \
+  nodejs python podman fzf fd ripgrep jdk-openjdk fisher yazi less buildah \
-  lazygit zsh-autosuggestions luarocks python-pynvim npm bash-completion tree-sitter-cli \
+  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/zsh -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, zshrc, neovim, tmux setup and ssh setup
+buildah add "$ctr" home.tar.gz $DEV_HOME
-buildah copy --chown $DEV_USER:$DEV_USER "$ctr" ./home/. $DEV_HOME
-buildah copy "$ctr" 00-allow-git.conf /etc/ssh/ssh_config.d/
 
-# configure lazyvim
+# shellcheck disable=SC2016
-buildah run --user $DEV_USER "$ctr" -- bash -c "\
+buildah run "$ctr" -- fish -c '
-  nvim --headless \"+Lazy! sync\" +qa && sleep 1 && \
+  set -gx HOME '"$DEV_HOME"';
-  nvim --headless \"+Lazy! sync\" +qa && sleep 1 && \
+  ssh-keyscan -p 2222 10.88.0.1 >> $HOME/.ssh/known_hosts;
-  nvim --headless \"+Lazy! sync\" +qa && \
+  ssh-keyscan -p 22 github.com >> $HOME/.ssh/known_hosts;
-  mkdir -p $DEV_HOME/.ssh && ssh-keyscan -p 2222 10.88.0.1 >> ~/.ssh/known_hosts && \
+  chown -R '"$DEV_USER"':'"$DEV_USER"' $HOME/.local $HOME/.config/fish/completions \
-  ssh-keyscan -p 22 github.com >> ~/.ssh/known_hosts
+    $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 \
-  $DEV_HOME/.config/zsh/fzf-git.sh && \
-  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 \
-  $DEV_HOME/.config/zsh/fzf-git.sh
-"
 
 buildah config \
   --user $DEV_USER \

gitconfig.template

@@ -2,6 +2,16 @@
   name = ${GIT_NAME}
   email = ${GIT_EMAIL}
 
+[diff]
+    tool = nvimdiff
+
+[difftool]
+    prompt = false    # don’t ask “launch nvim?” each time
+
+[difftool "nvimdiff"]
+    cmd = nvim -d "$LOCAL" "$REMOTE"
+    trustExitCode = true
+
 [alias]
   co = checkout
   st = status

home/.config/nvim/lua/config/keymaps.lua

@@ -1,16 +0,0 @@
--- Keymaps are automatically loaded on the VeryLazy event
--- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
-
-vim.keymap.set(
-"n",
-"]<space>",
-':<C-u>call append(line("."),   repeat([""], v:count1))<CR>',
-{ silent = true, desc = "Add line below" }
-)
-vim.keymap.set(
-"n",
-"[<space>",
-':<C-u>call append(line(".")-1, repeat([""], v:count1))<CR>',
-{ silent = true, desc = "Add line above" }
-)
-vim.keymap.set("n", "<leader>ghB", ":ToggleBlame virtual<Enter>", { silent = true, desc = "Toggle virtual blame" })-- Add any additional keymaps here

home/.config/nvim/lua/plugins/diffview.lua

@@ -1,4 +0,0 @@
-return {
-  "sindrets/diffview.nvim",
-  opts = {},
-}

home/.config/zsh/fzf-git.sh

@@ -1,344 +0,0 @@
-# The MIT License (MIT)
-#
-# Copyright (c) 2024 Junegunn Choi
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# shellcheck disable=SC2039
-[[ $0 = - ]] && return
-
-__fzf_git_color() {
-  if [[ -n $NO_COLOR ]]; then
-    echo never
-  elif [[ $# -gt 0 ]] && [[ -n $FZF_GIT_PREVIEW_COLOR ]]; then
-    echo "$FZF_GIT_PREVIEW_COLOR"
-  else
-    echo "${FZF_GIT_COLOR:-always}"
-  fi
-}
-
-__fzf_git_cat() {
-  if [[ -n $FZF_GIT_CAT ]]; then
-    echo "$FZF_GIT_CAT"
-    return
-  fi
-
-  # Sometimes bat is installed as batcat
-  _fzf_git_bat_options="--style='${BAT_STYLE:-full}' --color=$(__fzf_git_color .) --pager=never"
-  if command -v batcat > /dev/null; then
-    echo "batcat $_fzf_git_bat_options"
-  elif command -v bat > /dev/null; then
-    echo "bat $_fzf_git_bat_options"
-  else
-    echo cat
-  fi
-}
-
-__fzf_git_pager() {
-  local pager
-  pager="${FZF_GIT_PAGER:-${GIT_PAGER:-$(git config --get core.pager 2>/dev/null)}}"
-  echo "${pager:-cat}"
-}
-
-if [[ $1 = --list ]]; then
-  shift
-  if [[ $# -eq 1 ]]; then
-    branches() {
-      git branch "$@" --sort=-committerdate --sort=-HEAD --format=$'%(HEAD) %(color:yellow)%(refname:short) %(color:green)(%(committerdate:relative))\t%(color:blue)%(subject)%(color:reset)' --color=$(__fzf_git_color) | column -ts$'\t'
-    }
-    refs() {
-      git for-each-ref "$@" --sort=-creatordate --sort=-HEAD --color=$(__fzf_git_color) --format=$'%(if:equals=refs/remotes)%(refname:rstrip=-2)%(then)%(color:magenta)remote-branch%(else)%(if:equals=refs/heads)%(refname:rstrip=-2)%(then)%(color:brightgreen)branch%(else)%(if:equals=refs/tags)%(refname:rstrip=-2)%(then)%(color:brightcyan)tag%(else)%(if:equals=refs/stash)%(refname:rstrip=-2)%(then)%(color:brightred)stash%(else)%(color:white)%(refname:rstrip=-2)%(end)%(end)%(end)%(end)\t%(color:yellow)%(refname:short) %(color:green)(%(creatordate:relative))\t%(color:blue)%(subject)%(color:reset)' | column -ts$'\t'
-    }
-    hashes() {
-      git log --date=short --format="%C(green)%C(bold)%cd %C(auto)%h%d %s (%an)" --graph --color=$(__fzf_git_color) "$@" $LIST_OPTS
-    }
-    case "$1" in
-      branches)
-        echo 'CTRL-O (open in browser) ╱ ALT-A (show all branches)'
-        echo 'ALT-H (list commit hashes)'
-        branches
-        ;;
-      all-branches)
-        echo 'CTRL-O (open in browser) ╱ ALT-ENTER (accept without remote)'
-        echo 'ALT-H (list commit hashes)'
-        branches -a
-        ;;
-      hashes)
-        echo 'CTRL-O (open in browser) ╱ CTRL-D (diff)'
-        echo 'CTRL-S (toggle sort) ╱ ALT-A (show all hashes)'
-        hashes
-        ;;
-      all-hashes)
-        echo 'CTRL-O (open in browser) ╱ CTRL-D (diff)'
-        echo 'CTRL-S (toggle sort)'
-        hashes --all
-        ;;
-      refs)
-        echo 'CTRL-O (open in browser) ╱ ALT-E (examine in editor) ╱ ALT-A (show all refs)'
-        refs --exclude='refs/remotes'
-        ;;
-      all-refs)
-        echo 'CTRL-O (open in browser) ╱ ALT-E (examine in editor)'
-        refs
-        ;;
-      *) exit 1 ;;
-    esac
-  elif [[ $# -gt 1 ]]; then
-    set -e
-
-    branch=$(git rev-parse --abbrev-ref HEAD 2> /dev/null)
-    if [[ $branch = HEAD ]]; then
-      branch=$(git describe --exact-match --tags 2> /dev/null || git rev-parse --short HEAD)
-    fi
-
-    # Only supports GitHub for now
-    case "$1" in
-      commit)
-        hash=$(grep -o "[a-f0-9]\{7,\}" <<< "$2")
-        path=/commit/$hash
-        ;;
-      branch|remote-branch)
-        branch=$(sed 's/^[* ]*//' <<< "$2" | cut -d' ' -f1)
-        remote=$(git config branch."${branch}".remote || echo 'origin')
-        branch=${branch#$remote/}
-        path=/tree/$branch
-        ;;
-      remote)
-        remote=$2
-        path=/tree/$branch
-        ;;
-      file) path=/blob/$branch/$(git rev-parse --show-prefix)$2 ;;
-      tag)  path=/releases/tag/$2 ;;
-      *)    exit 1 ;;
-    esac
-
-    remote=${remote:-$(git config branch."${branch}".remote || echo 'origin')}
-    remote_url=$(git remote get-url "$remote" 2> /dev/null || echo "$remote")
-
-    if [[ $remote_url =~ ^git@ ]]; then
-      url=${remote_url%.git}
-      url=${url#git@}
-      url=https://${url/://}
-    elif [[ $remote_url =~ ^http ]]; then
-      url=${remote_url%.git}
-    fi
-
-    case "$(uname -s)" in
-      Darwin) open "$url$path"     ;;
-      *)      xdg-open "$url$path" ;;
-    esac
-    exit 0
-  fi
-fi
-
-if [[ $- =~ i ]] || [[ $1 = --run ]]; then # ----------------------------------
-
-# Redefine this function to change the options
-_fzf_git_fzf() {
-  fzf --height 50% --tmux 90%,70% \
-    --layout reverse --multi --min-height 20+ --border \
-    --no-separator --header-border horizontal \
-    --border-label-pos 2 \
-    --color 'label:blue' \
-    --preview-window 'right,50%' --preview-border line \
-    --bind 'ctrl-/:change-preview-window(down,50%|hidden|)' "$@"
-}
-
-_fzf_git_check() {
-  git rev-parse HEAD > /dev/null 2>&1 && return
-
-  [[ -n $TMUX ]] && tmux display-message "Not in a git repository"
-  return 1
-}
-
-__fzf_git=${BASH_SOURCE[0]:-${(%):-%x}}
-__fzf_git=$(readlink -f "$__fzf_git" 2> /dev/null || /usr/bin/ruby --disable-gems -e 'puts File.expand_path(ARGV.first)' "$__fzf_git" 2> /dev/null)
-
-_fzf_git_files() {
-  _fzf_git_check || return
-  local root query
-  root=$(git rev-parse --show-toplevel)
-  [[ $root != "$PWD" ]] && query='!../ '
-
-  (git -c color.status=$(__fzf_git_color) status --short --no-branch
-   git ls-files "$root" | grep -vxFf <(git status -s | grep '^[^?]' | cut -c4-; echo :) | sed 's/^/   /') |
-  _fzf_git_fzf -m --ansi --nth 2..,.. \
-    --border-label '📁 Files ' \
-    --header 'CTRL-O (open in browser) ╱ ALT-E (open in editor)' \
-    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list file {-1}" \
-    --bind "alt-e:execute:${EDITOR:-vim} {-1} > /dev/tty" \
-    --query "$query" \
-    --preview "git diff --no-ext-diff --color=$(__fzf_git_color .) -- {-1} | $(__fzf_git_pager); $(__fzf_git_cat) {-1}" "$@" |
-  cut -c4- | sed 's/.* -> //'
-}
-
-_fzf_git_branches() {
-  _fzf_git_check || return
-  bash "$__fzf_git" --list branches |
-  _fzf_git_fzf --ansi \
-    --border-label '🌲 Branches ' \
-    --header-lines 2 \
-    --tiebreak begin \
-    --preview-window down,border-top,40% \
-    --color hl:underline,hl+:underline \
-    --no-hscroll \
-    --bind 'ctrl-/:change-preview-window(down,70%|hidden|)' \
-    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list branch {}" \
-    --bind "alt-a:change-border-label(🌳 All branches)+reload:bash \"$__fzf_git\" --list all-branches" \
-    --bind "alt-h:become:LIST_OPTS=\$(cut -c3- <<< {} | cut -d' ' -f1) bash \"$__fzf_git\" --run hashes" \
-    --bind "alt-enter:become:printf '%s\n' {+} | cut -c3- | sed 's@[^/]*/@@'" \
-    --preview "git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' \$(cut -c3- <<< {} | cut -d' ' -f1) --" "$@" |
-  sed 's/^\* //' | awk '{print $1}' # Slightly modified to work with hashes as well
-}
-
-_fzf_git_tags() {
-  _fzf_git_check || return
-  git tag --sort -version:refname |
-  _fzf_git_fzf --preview-window right,70% \
-    --border-label '📛 Tags ' \
-    --header 'CTRL-O (open in browser)' \
-    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list tag {}" \
-    --preview "git show --color=$(__fzf_git_color .) {} | $(__fzf_git_pager)" "$@"
-}
-
-_fzf_git_hashes() {
-  _fzf_git_check || return
-  bash "$__fzf_git" --list hashes |
-  _fzf_git_fzf --ansi --no-sort --bind 'ctrl-s:toggle-sort' \
-    --border-label '🍡 Hashes ' \
-    --header-lines 2 \
-    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list commit {}" \
-    --bind "ctrl-d:execute:grep -o '[a-f0-9]\{7,\}' <<< {} | head -n 1 | xargs git diff --color=$(__fzf_git_color) > /dev/tty" \
-    --bind "alt-a:change-border-label(🍇 All hashes)+reload:bash \"$__fzf_git\" --list all-hashes" \
-    --color hl:underline,hl+:underline \
-    --preview "grep -o '[a-f0-9]\{7,\}' <<< {} | head -n 1 | xargs git show --color=$(__fzf_git_color .) | $(__fzf_git_pager)" "$@" |
-  awk 'match($0, /[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]*/) { print substr($0, RSTART, RLENGTH) }'
-}
-
-_fzf_git_remotes() {
-  _fzf_git_check || return
-  git remote -v | awk '{print $1 "\t" $2}' | uniq |
-  _fzf_git_fzf --tac \
-    --border-label '📡 Remotes ' \
-    --header 'CTRL-O (open in browser)' \
-    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list remote {1}" \
-    --preview-window right,70% \
-    --preview "git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' '{1}/$(git rev-parse --abbrev-ref HEAD)' --" "$@" |
-  cut -d$'\t' -f1
-}
-
-_fzf_git_stashes() {
-  _fzf_git_check || return
-  git stash list | _fzf_git_fzf \
-    --border-label '🥡 Stashes ' \
-    --header 'CTRL-X (drop stash)' \
-    --bind 'ctrl-x:reload(git stash drop -q {1}; git stash list)' \
-    -d: --preview "git show --color=$(__fzf_git_color .) {1} | $(__fzf_git_pager)" "$@" |
-  cut -d: -f1
-}
-
-_fzf_git_lreflogs() {
-  _fzf_git_check || return
-  git reflog --color=$(__fzf_git_color) --format="%C(blue)%gD %C(yellow)%h%C(auto)%d %gs" | _fzf_git_fzf --ansi \
-    --border-label '📒 Reflogs ' \
-    --preview "git show --color=$(__fzf_git_color .) {1} | $(__fzf_git_pager)" "$@" |
-  awk '{print $1}'
-}
-
-_fzf_git_each_ref() {
-  _fzf_git_check || return
-  bash "$__fzf_git" --list refs | _fzf_git_fzf --ansi \
-    --nth 2,2.. \
-    --tiebreak begin \
-    --border-label '☘️  Each ref ' \
-    --header-lines 1 \
-    --preview-window down,border-top,40% \
-    --color hl:underline,hl+:underline \
-    --no-hscroll \
-    --bind 'ctrl-/:change-preview-window(down,70%|hidden|)' \
-    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list {1} {2}" \
-    --bind "alt-e:execute:${EDITOR:-vim} <(git show {2}) > /dev/tty" \
-    --bind "alt-a:change-border-label(🍀 Every ref)+reload:bash \"$__fzf_git\" --list all-refs" \
-    --preview "git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' {2} --" "$@" |
-  awk '{print $2}'
-}
-
-_fzf_git_worktrees() {
-  _fzf_git_check || return
-  git worktree list | _fzf_git_fzf \
-    --border-label '🌴 Worktrees ' \
-    --header 'CTRL-X (remove worktree)' \
-    --bind 'ctrl-x:reload(git worktree remove {1} > /dev/null; git worktree list)' \
-    --preview "
-      git -c color.status=$(__fzf_git_color .) -C {1} status --short --branch
-      echo
-      git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' {2} --
-    " "$@" |
-  awk '{print $1}'
-}
-fi # --------------------------------------------------------------------------
-
-if [[ $1 = --run ]]; then
-  shift
-  type=$1
-  shift
-  eval "_fzf_git_$type" "$@"
-
-elif [[ $- =~ i ]]; then # ------------------------------------------------------
-if [[ -n "${BASH_VERSION:-}" ]]; then
-  __fzf_git_init() {
-    bind -m emacs-standard '"\er":  redraw-current-line'
-    bind -m emacs-standard '"\C-z": vi-editing-mode'
-    bind -m vi-command     '"\C-z": emacs-editing-mode'
-    bind -m vi-insert      '"\C-z": emacs-editing-mode'
-
-    local o c
-    for o in "$@"; do
-      c=${o:0:1}
-      bind -m emacs-standard '"\C-g\C-'$c'": " \C-u \C-a\C-k`_fzf_git_'$o'`\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er \C-h"'
-      bind -m vi-command     '"\C-g\C-'$c'": "\C-z\C-g\C-'$c'\C-z"'
-      bind -m vi-insert      '"\C-g\C-'$c'": "\C-z\C-g\C-'$c'\C-z"'
-      bind -m emacs-standard '"\C-g'$c'":    " \C-u \C-a\C-k`_fzf_git_'$o'`\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er \C-h"'
-      bind -m vi-command     '"\C-g'$c'":    "\C-z\C-g'$c'\C-z"'
-      bind -m vi-insert      '"\C-g'$c'":    "\C-z\C-g'$c'\C-z"'
-    done
-  }
-elif [[ -n "${ZSH_VERSION:-}" ]]; then
-  __fzf_git_join() {
-    local item
-    while read item; do
-      echo -n "${(q)item} "
-    done
-  }
-
-  __fzf_git_init() {
-    local m o
-    for o in "$@"; do
-      eval "fzf-git-$o-widget() { local result=\$(_fzf_git_$o | __fzf_git_join); zle reset-prompt; LBUFFER+=\$result }"
-      eval "zle -N fzf-git-$o-widget"
-      for m in emacs vicmd viins; do
-        eval "bindkey -M $m '^g^${o[1]}' fzf-git-$o-widget"
-        eval "bindkey -M $m '^g${o[1]}' fzf-git-$o-widget"
-      done
-    done
-  }
-fi
-__fzf_git_init files branches tags remotes hashes stashes lreflogs each_ref worktrees
-
-fi # --------------------------------------------------------------------------

home/.zshrc

@@ -1,18 +0,0 @@
-export ZSH=$HOME/.config/zsh/ohmyzsh
-
-ZSH_THEME="robbyrussell"
-
-plugins=(git fzf)
-
-export FZF_CTRL_T_OPTS="--preview '(highlight -O ansi -l {} 2> /dev/null || cat {} || tree -C {}) 2> /dev/null | head -200'"
-export FZF_ALT_C_OPTS="--preview 'tree -C {} | head -200'"
-export FZF_DEFAULT_OPTS=" \
---color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 \
---color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc \
---color=marker:#f5e0dc,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8"
-export FZF_TMUX=1
-
-source $ZSH/oh-my-zsh.sh
-source $HOME/.config/zsh/fzf-git.sh
-source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh

nvim-workspace.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-XDG_CONFIG_HOME="$PWD/home/.config" \
-  XDG_DATA_HOME="$PWD/local/share" \
-  XDG_STATE_HOME="$PWD/local/state" \
-  XDG_CACHE_HOME="$PWD/local/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:/home/"$DEV_USER"/.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.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