From 65d2b59afed8a0e6940c9bad28b03d5da619d1db Mon Sep 17 00:00:00 2001 From: Jannik Buhr Date: Fri, 16 Aug 2024 09:55:24 +0200 Subject: [PATCH 1/4] disable neodev, add dadbod --- lua/plugins/lsp.lua | 2 +- lua/plugins/ui.lua | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index c327c7a..20fa09d 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -37,7 +37,7 @@ return { enabled = false, opts = {}, }, - { 'folke/neodev.nvim', opts = {}, enabled = true }, + { 'folke/neodev.nvim', opts = {}, enabled = false }, { 'folke/neoconf.nvim', opts = {}, enabled = false }, }, config = function() diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 9b8fcd8..45ea425 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -433,4 +433,10 @@ return { vim.keymap.set('n', 'ic', clear_all_images, { buffer = true, desc = 'image [c]lear' }) end, }, + + { -- interface with databases + 'tpope/vim-dadbod', + 'kristijanhusak/vim-dadbod-completion', + 'kristijanhusak/vim-dadbod-ui', + }, } From 0f4e3d504658cdca8d4b703869fce93b5e8ead53 Mon Sep 17 00:00:00 2001 From: Jannik Buhr Date: Fri, 16 Aug 2024 10:01:19 +0200 Subject: [PATCH 2/4] merge --- lua/plugins/ui.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 2b6bb72..8e02e20 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -354,6 +354,15 @@ return { commit = 'deb158d', dev = false, ft = { 'markdown', 'quarto', 'vimwiki' }, + -- dependencies = { + -- { + -- 'vhyrro/luarocks.nvim', + -- priority = 1001, -- this plugin needs to run before anything else + -- opts = { + -- rocks = { 'magick' }, + -- }, + -- }, + -- }, config = function() -- Requirements -- https://github.com/3rd/image.nvim?tab=readme-ov-file#requirements From e343ccf9a8bcbc2077b2d948a49c541a3396277a Mon Sep 17 00:00:00 2001 From: Jannik Buhr Date: Fri, 16 Aug 2024 10:01:55 +0200 Subject: [PATCH 3/4] no dev --- lua/plugins/lsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 0520116..029dfa6 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -5,7 +5,7 @@ return { -- for lsp features in code cells / embedded code 'jmbuhr/otter.nvim', - dev = true, + dev = false, dependencies = { { 'neovim/nvim-lspconfig', From 5522630c3f7e849c6f11246302ec4ef1d46c2574 Mon Sep 17 00:00:00 2001 From: Jannik Buhr Date: Fri, 16 Aug 2024 10:10:15 +0200 Subject: [PATCH 4/4] update image.nvim --- lua/plugins/ui.lua | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 8e02e20..c61077b 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -349,20 +349,18 @@ return { { -- show images in nvim! '3rd/image.nvim', enabled = true, + dev = false, -- fix to commit to keep using the rockspeck for image magick -- TODO: check back on this later - commit = 'deb158d', - dev = false, + -- commit = 'deb158d', ft = { 'markdown', 'quarto', 'vimwiki' }, - -- dependencies = { - -- { - -- 'vhyrro/luarocks.nvim', - -- priority = 1001, -- this plugin needs to run before anything else - -- opts = { - -- rocks = { 'magick' }, - -- }, - -- }, - -- }, + cond = function() + -- Disable on Windows system + return vim.fn.has 'win32' ~= 1 + end, + dependencies = { + 'leafo/magick', -- that's a lua rock + }, config = function() -- Requirements -- https://github.com/3rd/image.nvim?tab=readme-ov-file#requirements @@ -372,7 +370,7 @@ return { -- sudo apt install libmagickwand-dev -- sudo apt install liblua5.1-0-dev -- sudo apt install lua5.1 - -- sudo apt installl luajit + -- sudo apt install luajit local image = require 'image' image.setup {