diff options
| -rw-r--r-- | nvim/init.lua | 13 | ||||
| -rw-r--r-- | nvim/lazy-lock.json | 2 | ||||
| -rw-r--r-- | nvim/lua/config/plugins.lua | 10 |
3 files changed, 22 insertions, 3 deletions
diff --git a/nvim/init.lua b/nvim/init.lua index f8d0639..855c06d 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -10,11 +10,11 @@ vim.o.tabstop = 4 vim.o.shiftwidth = 4 vim.o.ignorecase = true vim.o.number = true -vim.o.signcolumn = "yes" -- always shows column to the left from numbers, prevents jumping when git diff is added/removed -vim.opt.iskeyword:append("$") -- treats $ as part of word object +vim.o.signcolumn = "yes" -- always shows column to the left from numbers, prevents content shift when git diff is added/removed vim.cmd("colorscheme gruvbox") -vim.cmd("compiler tsc") +vim.cmd("compiler tsc") -- sets "tsc" as compiler for :make command vim.cmd("cnoreabbrev fzf FzfLua") +vim.cmd("set iskeyword+=$") -- treat $ as part of word -- auto-enable tree-sitter; pcall hides error if buffer unsupported vim.api.nvim_create_autocmd("FileType", { @@ -22,3 +22,10 @@ vim.api.nvim_create_autocmd("FileType", { pcall(vim.treesitter.start) end, }) +-- enable embedded Bash LSP when editing CI configs +vim.api.nvim_create_autocmd("BufEnter", { + pattern = { 'bitbucket-pipelines.yml' }, + command = 'OtterActivate', +}) +-- removes obsolete Fugitive commands +vim.api.nvim_del_user_command('Gbrowse') diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index dedb0d2..7e9565c 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -16,6 +16,8 @@ "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, "nvim-treesitter": { "branch": "main", "commit": "bd41519ff7901da11ba6e1c8f419f17f2d94305a" }, "nvim-web-devicons": { "branch": "master", "commit": "2ae6958df7ced50baac5035cec0c15799eedfbf7" }, + "otter.nvim": { "branch": "main", "commit": "f4a033d4e2bd86d4f09386a73d3861538601253d" }, "schemastore.nvim": { "branch": "main", "commit": "3d2c297f7152208daf4a382ea7123f9e4ebf9da1" }, + "vim-fubitive": { "branch": "master", "commit": "c85ca8fa2098aa05e816f5d0839a0dad6bfcca5a" }, "vim-fugitive": { "branch": "master", "commit": "b3828fd319eb8c9be7911a5152eba69b22fb95fe" } } diff --git a/nvim/lua/config/plugins.lua b/nvim/lua/config/plugins.lua index bbd594d..afb9fe7 100644 --- a/nvim/lua/config/plugins.lua +++ b/nvim/lua/config/plugins.lua @@ -9,6 +9,8 @@ return { -- Git integration -- Tpope did not udpate Fugitive since 2022; this version only adds commit hash to commit view { "wookayin/vim-fugitive", commit = "b3828fd" }, + -- bitbucket provider for :GBrowse command from Fugitive + { "tommcdo/vim-fubitive" }, -- Shows git diff info in the gutter { "lewis6991/gitsigns.nvim" }, -- comment gestures @@ -68,4 +70,12 @@ return { { "LunarVim/bigfile.nvim" }, -- Plugin for formatters. See formatters.lua for configs { "stevearc/conform.nvim" }, + -- allows LSP for embedded languages (e.g. bash inside of yaml) + { + "jmbuhr/otter.nvim", + dependencies = { + "nvim-treesitter/nvim-treesitter", + }, + opts = {}, + }, } |