oh-my-devpod 0.15.6 → 0.15.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-devpod",
-  "version": "0.15.6",
+  "version": "0.15.8",
   "description": "Ubuntu productivity tool manager with the omd terminal interface",
   "license": "MIT",
   "author": "zhangdw156",

package/runtime/VERSION

@@ -1 +1 @@
-0.15.6
+0.15.8

package/runtime/build/install-lazyvim.sh

@@ -3,6 +3,7 @@ set -euo pipefail
 
 source_dir="${OHMYDEVPOD_LAZYVIM_SOURCE_DIR:-/opt/vendor/nvim/lazyvim-starter}"
 overlay_dir="${OHMYDEVPOD_NVM_OVERLAY_DIR:-}"
+plugin_archive="${OHMYDEVPOD_LAZYVIM_PLUGIN_ARCHIVE:-}"
 config_dir="${OHMYDEVPOD_NVM_CONFIG_DIR:-${XDG_CONFIG_HOME:-${HOME}/.config}/nvim}"
 data_dir="${OHMYDEVPOD_NVM_DATA_DIR:-${XDG_DATA_HOME:-${HOME}/.local/share}/nvim}"
 state_dir="${OHMYDEVPOD_NVM_STATE_DIR:-${XDG_STATE_HOME:-${HOME}/.local/state}/nvim}"
@@ -18,6 +19,19 @@ if [[ ! -d "${source_dir}" ]]; then
   exit 1
 fi
 
+if [[ -n "${plugin_archive}" ]]; then
+  plugin_dir="$(dirname "${plugin_archive}")"
+  [[ "$(basename "${plugin_archive}")" == "plugins.tar.gz" &&
+    -f "${plugin_dir}/plugins.lock.json" ]] || {
+    echo "Missing or invalid LazyVim plugin bundle" >&2
+    exit 1
+  }
+  (cd "${plugin_dir}" && sha256sum -c SHA256SUMS) || {
+    echo "LazyVim plugin archive verification failed" >&2
+    exit 1
+  }
+fi
+
 if [[ -z "${starter_commit}" && -f "${source_dir}/.oh-my-devpod-source-commit" ]]; then
   starter_commit="$(<"${source_dir}/.oh-my-devpod-source-commit")"
 fi
@@ -52,6 +66,11 @@ cp -R "${source_dir}" "${config_dir}"
 if [[ -n "${overlay_dir}" && -d "${overlay_dir}" ]]; then
   cp -R "${overlay_dir}/." "${config_dir}"
 fi
+if [[ -n "${plugin_archive}" ]]; then
+  mkdir -p "${config_dir}/.omd-plugins"
+  tar -xzf "${plugin_archive}" -C "${config_dir}/.omd-plugins"
+  cp "${plugin_dir}/plugins.lock.json" "${config_dir}/.omd-plugins/plugins.lock.json"
+fi
 rm -rf "${config_dir}/.git"
 rm -f "${config_dir}/.oh-my-devpod-source-commit"
 

package/runtime/build/omd-brew-gateway.sh

@@ -28,8 +28,16 @@ real_brew="${prefix}/bin/brew"
 stable_gateway="${libexec_dir}/brew-gateway"
 lock_file="${state_dir}/locks/mutation.lock"
 brew_noninteractive=0
+inventory_snapshot=""
 declare -a forwarded_env=()
 
+cleanup() {
+  [[ -z "${inventory_snapshot}" ]] || rm -f "${inventory_snapshot}"
+}
+trap cleanup EXIT
+trap 'exit 130' INT
+trap 'exit 143' TERM
+
 fail() {
   printf 'brew: shared Linuxbrew gateway: %s\n' "$*" >&2
   exit 1
@@ -291,9 +299,11 @@ run_backend() {
   validate_inventory_records
   home="$(service_home "$(service_user)")"
   prepare_backend_working_directory "${home}"
-  before="${state_dir}/.inventory-before.$$"
   if is_inventory_mutation "${1:-}"; then
     mutates=1
+    before="$(mktemp "${inventory_dir}/.inventory-before.XXXXXX")" ||
+      fail "cannot create shared inventory snapshot"
+    inventory_snapshot="${before}"
     snapshot_formulae "${before}"
   fi
 
@@ -307,6 +317,7 @@ run_backend() {
   if [[ "${mutates}" == "1" ]]; then
     reconcile_inventory "${before}"
     rm -f "${before}"
+    inventory_snapshot=""
   fi
   return "${status}"
 }

package/runtime/components.toml

@@ -16,6 +16,7 @@ name = "Micromamba"
 description = "Lightweight Conda-compatible package manager"
 category = "foundation"
 module = "modules/core/micromamba.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -26,6 +27,7 @@ name = "Zsh"
 description = "Interactive shell"
 category = "foundation"
 module = "modules/core/zsh.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -36,6 +38,7 @@ name = "uv"
 description = "Fast Python package and project manager"
 category = "foundation"
 module = "modules/core/uv.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -46,6 +49,7 @@ name = "Git"
 description = "Version control client"
 category = "development"
 module = "modules/tools/git.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -56,6 +60,7 @@ name = "GitHub CLI"
 description = "Official command-line client for GitHub"
 category = "development"
 module = "modules/tools/gh.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -76,6 +81,7 @@ name = "ripgrep"
 description = "Fast recursive text search"
 category = "terminal"
 module = "modules/tools/ripgrep.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -86,6 +92,7 @@ name = "fzf"
 description = "Interactive fuzzy finder"
 category = "terminal"
 module = "modules/tools/fzf.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -96,6 +103,7 @@ name = "bat"
 description = "Syntax-aware cat replacement"
 category = "terminal"
 module = "modules/tools/bat.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -106,6 +114,7 @@ name = "fd"
 description = "Friendly and fast find replacement"
 category = "terminal"
 module = "modules/tools/fd.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -116,6 +125,7 @@ name = "jq"
 description = "JSON processor"
 category = "terminal"
 module = "modules/tools/jq.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -126,6 +136,7 @@ name = "yq"
 description = "YAML, JSON, XML, CSV, TOML, and properties processor"
 category = "terminal"
 module = "modules/tools/yq.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -136,6 +147,7 @@ name = "Atuin"
 description = "Shell history search and synchronization"
 category = "terminal"
 module = "modules/tools/atuin.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -146,6 +158,7 @@ name = "Zellij"
 description = "Terminal workspace and multiplexer"
 category = "terminal"
 module = "modules/tools/zellij.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -156,6 +169,7 @@ name = "Yazi"
 description = "Terminal file manager"
 category = "terminal"
 module = "modules/tools/yazi.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -166,6 +180,7 @@ name = "btop"
 description = "Interactive resource monitor"
 category = "terminal"
 module = "modules/tools/btop.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -176,6 +191,7 @@ name = "witr"
 description = "Trace processes, ports, containers, and files to their launch chain"
 category = "terminal"
 module = "modules/tools/witr.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
@@ -186,6 +202,7 @@ name = "Neovim"
 description = "Modern terminal editor"
 category = "editor"
 module = "modules/tools/neovim.sh"
+provider = "linuxbrew"
 requires = []
 install_requires = ["linuxbrew"]
 uninstall = true

package/runtime/config/nvim-cn/lua/config/lazy.lua

@@ -0,0 +1,20 @@
+-- The China profile loads pinned plugins shipped with OMD.
+local bundle = vim.fn.stdpath("config") .. "/.omd-plugins"
+vim.opt.rtp:prepend(bundle .. "/lazy.nvim")
+local plugins = vim.json.decode(table.concat(vim.fn.readfile(bundle .. "/plugins.lock.json"), "\n"))
+local spec = {
+  { "LazyVim/LazyVim", dir = bundle .. "/LazyVim", import = "lazyvim.plugins" },
+  { import = "plugins" },
+}
+for name, plugin in pairs(plugins) do
+  spec[#spec + 1] = { plugin.repo, name = name, dir = bundle .. "/" .. name, pin = true, build = false }
+end
+require("lazy").setup({
+  spec = spec,
+  defaults = { lazy = false, version = false },
+  install = { missing = false, colorscheme = { "tokyonight", "habamax" } },
+  checker = { enabled = false },
+  change_detection = { notify = false },
+  rocks = { enabled = false },
+  pkg = { enabled = false },
+})

package/runtime/config/nvim-cn/lua/plugins/omd-offline.lua

@@ -0,0 +1,23 @@
+-- External tools and parsers can be installed explicitly when needed.
+return {
+  { "mason-org/mason.nvim", enabled = false },
+  { "mason-org/mason-lspconfig.nvim", enabled = false },
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function(_, opts)
+      opts.ensure_installed = {}
+    end,
+  },
+  { "saghen/blink.cmp", opts = { fuzzy = { implementation = "lua" } } },
+  {
+    "neovim/nvim-lspconfig",
+    opts = function(_, opts)
+      for _, server in pairs(opts.servers) do
+        if type(server) == "table" then
+          server.mason = false
+        end
+      end
+      opts.servers.lua_ls = { enabled = vim.fn.executable("lua-language-server") == 1, mason = false }
+    end,
+  },
+}

package/runtime/install/bootstrap.sh

@@ -293,13 +293,13 @@ omd_source_env_is_managed() {
 }
 
 omd_uv_config_is_managed() {
-  local path="$1" contents
+  local path="$1" contents expected
+  [[ ! -L "${path}" ]] || return 1
   [[ ! -e "${path}" ]] && return 0
-  head -n 1 "${path}" 2>/dev/null |
-    grep -Fq '# Generated by oh-my-devpod.' &&
-    return 0
   contents="$(cat "${path}" 2>/dev/null)" || return 1
-  [[ "${contents}" == $'[[index]]\nurl = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"\ndefault = true' ]]
+  expected=$'[[index]]\nurl = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"\ndefault = true'
+  [[ "${contents}" == "${expected}" ||
+    "${contents}" == "# Generated by oh-my-devpod. Use omd --source github or gitee to change this profile."$'\n'"${expected}" ]]
 }
 
 omd_validate_source_config_ownership() {
@@ -308,11 +308,6 @@ omd_validate_source_config_ownership() {
     omd_warn "Refusing to overwrite user-managed source environment: ${config_dir}/env"
     return 1
   fi
-  if [[ "${source}" == "gitee" ]] &&
-    ! omd_uv_config_is_managed "${config_dir}/uv.toml"; then
-    omd_warn "Refusing to overwrite user-managed uv configuration: ${config_dir}/uv.toml"
-    return 1
-  fi
 }
 
 omd_persist_source() {
@@ -340,7 +335,6 @@ omd_persist_source() {
         'export HOMEBREW_CORE_GIT_REMOTE="https://mirrors.ustc.edu.cn/homebrew-core.git"' \
         'export HOMEBREW_BOTTLE_DOMAIN="https://mirrors.ustc.edu.cn/homebrew-bottles"' \
         'export HOMEBREW_API_DOMAIN="https://mirrors.ustc.edu.cn/homebrew-bottles/api"' \
-        'export UV_CONFIG_FILE="${OHMYDEVPOD_CONFIG_DIR}/uv.toml"' \
         'export PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"' \
         'export CONDA_CHANNELS="conda-forge"' \
         'export MAMBA_CHANNEL_ALIAS="https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud"' \
@@ -348,17 +342,9 @@ omd_persist_source() {
     fi
   } | omd_atomic_write "${env_file}" || return 1
 
-  if [[ "${mirror_profile}" == "cn" ]]; then
-    cat <<'EOF' | omd_atomic_write "${config_dir}/uv.toml"
-# Generated by oh-my-devpod. Use omd --source github or gitee to change this profile.
-[[index]]
-url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
-default = true
-EOF
-  else
-    if omd_uv_config_is_managed "${config_dir}/uv.toml"; then
-      rm -f "${config_dir}/uv.toml" || return 1
-    fi
+  # Retire the old explicit override; native uv config keeps project discovery.
+  if omd_uv_config_is_managed "${config_dir}/uv.toml"; then
+    rm -f "${config_dir}/uv.toml" || return 1
   fi
 }
 

package/runtime/modules/tools/lazyvim.sh

@@ -20,7 +20,7 @@ managed() {
 }
 
 install_or_update() {
-  local action="$1" repo_root
+  local action="$1" repo_root overlay_dir plugin_archive=""
   shift
   omd_module_reject_unknown_flags "$@" || return
   if status && ! managed; then
@@ -32,8 +32,14 @@ install_or_update() {
     return 0
   fi
   repo_root="$(omd_module_repo_root)"
+  overlay_dir="${repo_root}/config/nvim"
+  if [[ "${OHMYDEVPOD_MIRROR_PROFILE:-upstream}" == "cn" ]]; then
+    overlay_dir="${repo_root}/config/nvim-cn"
+    plugin_archive="${repo_root}/vendor/nvim/plugins.tar.gz"
+  fi
   OHMYDEVPOD_LAZYVIM_SOURCE_DIR="${repo_root}/vendor/nvim/lazyvim-starter" \
-    OHMYDEVPOD_NVM_OVERLAY_DIR="${repo_root}/config/nvim" \
+    OHMYDEVPOD_NVM_OVERLAY_DIR="${overlay_dir}" \
+    OHMYDEVPOD_LAZYVIM_PLUGIN_ARCHIVE="${plugin_archive}" \
     OHMYDEVPOD_NVM_CONFIG_DIR="${config_dir}" \
     OHMYDEVPOD_NVM_DATA_DIR="${data_dir}" \
     OHMYDEVPOD_NVM_STATE_DIR="${state_dir}" \

package/runtime/vendor/nvim/SHA256SUMS

@@ -0,0 +1 @@
+830475fc6ccae8ec0833d6d154d9c309b16f997b6713ebda5b4cfe0fdb766f63  plugins.tar.gz

package/runtime/vendor/nvim/plugins.lock.json

@@ -0,0 +1,122 @@
+{
+  "LazyVim": {
+    "repo": "LazyVim/LazyVim",
+    "commit": "999700997f72227187d49d8b92667183dc7fc809"
+  },
+  "blink.cmp": {
+    "repo": "saghen/blink.cmp",
+    "commit": "78336bc89ee5365633bcf754d93df01678b5c08f"
+  },
+  "bufferline.nvim": {
+    "repo": "akinsho/bufferline.nvim",
+    "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3"
+  },
+  "catppuccin": {
+    "repo": "catppuccin/nvim",
+    "commit": "edefef779ab08ce1a4a404713e3012b0d202bd35"
+  },
+  "conform.nvim": {
+    "repo": "stevearc/conform.nvim",
+    "commit": "016802de402556da54c36bd7359b441266b01cdd"
+  },
+  "flash.nvim": {
+    "repo": "folke/flash.nvim",
+    "commit": "5f0f270fdc7c5b0c21d903ee85b9cb06f2ac636a"
+  },
+  "friendly-snippets": {
+    "repo": "rafamadriz/friendly-snippets",
+    "commit": "b4d01b0fdf3c9a549961c2f9ffe8dc09be166219"
+  },
+  "gitsigns.nvim": {
+    "repo": "lewis6991/gitsigns.nvim",
+    "commit": "f2421c550618d257048afa650413d9e542ddbe67"
+  },
+  "grug-far.nvim": {
+    "repo": "MagicDuck/grug-far.nvim",
+    "commit": "11595bf747edc270bce2069d1020502ad4ae56cf"
+  },
+  "lazy.nvim": {
+    "repo": "folke/lazy.nvim",
+    "commit": "85c7ff3711b730b4030d03144f6db6375044ae82"
+  },
+  "lazydev.nvim": {
+    "repo": "folke/lazydev.nvim",
+    "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d"
+  },
+  "lualine.nvim": {
+    "repo": "nvim-lualine/lualine.nvim",
+    "commit": "221ce6b2d999187044529f49da6554a92f740a96"
+  },
+  "mini.ai": {
+    "repo": "nvim-mini/mini.ai",
+    "commit": "cb02c5444613475b7edf0c8dc98264c1c857aa6e"
+  },
+  "mini.icons": {
+    "repo": "nvim-mini/mini.icons",
+    "commit": "98faae31e9be1cc054ae63485e58ceb185efcad0"
+  },
+  "mini.pairs": {
+    "repo": "nvim-mini/mini.pairs",
+    "commit": "b1c5a726921b7a8c9321e9a7a208aa0571de5810"
+  },
+  "noice.nvim": {
+    "repo": "folke/noice.nvim",
+    "commit": "7bfd942445fb63089b59f97ca487d605e715f155"
+  },
+  "nui.nvim": {
+    "repo": "MunifTanjim/nui.nvim",
+    "commit": "10fc361835c856ba4233ef5ea135b919bf3dce97"
+  },
+  "nvim-lint": {
+    "repo": "mfussenegger/nvim-lint",
+    "commit": "3d55c8f67c6ae5c15e1042571e107c7a3d5c5f4e"
+  },
+  "nvim-lspconfig": {
+    "repo": "neovim/nvim-lspconfig",
+    "commit": "ac9d2f7c4757db6320cab6697fe73e5e8adb2457"
+  },
+  "nvim-treesitter": {
+    "repo": "nvim-treesitter/nvim-treesitter",
+    "commit": "7caec274fd19c12b55902a5b795100d21531391f"
+  },
+  "nvim-treesitter-textobjects": {
+    "repo": "nvim-treesitter/nvim-treesitter-textobjects",
+    "commit": "5c7b0263797dfd1bd6202f2b219f3b53a80b2187"
+  },
+  "nvim-ts-autotag": {
+    "repo": "windwp/nvim-ts-autotag",
+    "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275"
+  },
+  "persistence.nvim": {
+    "repo": "folke/persistence.nvim",
+    "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c"
+  },
+  "plenary.nvim": {
+    "repo": "nvim-lua/plenary.nvim",
+    "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b"
+  },
+  "snacks.nvim": {
+    "repo": "folke/snacks.nvim",
+    "commit": "882c996cf28183f4d63640de0b4c02ec886d01f2"
+  },
+  "todo-comments.nvim": {
+    "repo": "folke/todo-comments.nvim",
+    "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668"
+  },
+  "tokyonight.nvim": {
+    "repo": "folke/tokyonight.nvim",
+    "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6"
+  },
+  "trouble.nvim": {
+    "repo": "folke/trouble.nvim",
+    "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a"
+  },
+  "ts-comments.nvim": {
+    "repo": "folke/ts-comments.nvim",
+    "commit": "a59d6092213447450191122c9346f309161504cb"
+  },
+  "which-key.nvim": {
+    "repo": "folke/which-key.nvim",
+    "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a"
+  }
+}