Skip to content

Commit 0b67b3a

Browse files
committed
Merge branch 'dev' of github.com:jmbuhr/quarto-nvim-kickstarter into dev
2 parents 60e33db + 5522630 commit 0b67b3a

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

lua/plugins/lsp.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ return {
55

66
-- for lsp features in code cells / embedded code
77
'jmbuhr/otter.nvim',
8-
dev = true,
8+
dev = false,
99
dependencies = {
1010
{
1111
'neovim/nvim-lspconfig',

lua/plugins/ui.lua

+16-3
Original file line numberDiff line numberDiff line change
@@ -349,11 +349,18 @@ return {
349349
{ -- show images in nvim!
350350
'3rd/image.nvim',
351351
enabled = true,
352+
dev = false,
352353
-- fix to commit to keep using the rockspeck for image magick
353354
-- TODO: check back on this later
354-
commit = 'deb158d',
355-
dev = false,
355+
-- commit = 'deb158d',
356356
ft = { 'markdown', 'quarto', 'vimwiki' },
357+
cond = function()
358+
-- Disable on Windows system
359+
return vim.fn.has 'win32' ~= 1
360+
end,
361+
dependencies = {
362+
'leafo/magick', -- that's a lua rock
363+
},
357364
config = function()
358365
-- Requirements
359366
-- https://github.com/3rd/image.nvim?tab=readme-ov-file#requirements
@@ -363,7 +370,7 @@ return {
363370
-- sudo apt install libmagickwand-dev
364371
-- sudo apt install liblua5.1-0-dev
365372
-- sudo apt install lua5.1
366-
-- sudo apt installl luajit
373+
-- sudo apt install luajit
367374

368375
local image = require 'image'
369376
image.setup {
@@ -445,4 +452,10 @@ return {
445452
vim.keymap.set('n', '<leader>ic', clear_all_images, { desc = 'image [c]lear' })
446453
end,
447454
},
455+
456+
{ -- interface with databases
457+
'tpope/vim-dadbod',
458+
'kristijanhusak/vim-dadbod-completion',
459+
'kristijanhusak/vim-dadbod-ui',
460+
},
448461
}

0 commit comments

Comments
 (0)