Merge branch 'dev' of github.com:jmbuhr/quarto-nvim-kickstarter into dev

jmbuhr · Aug 25, 2024 · 0b67b3a · 0b67b3a
2 parents 60e33db + 5522630
commit 0b67b3a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git 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',

diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua
@@ -349,11 +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' },
+    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
@@ -363,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 {
@@ -445,4 +452,10 @@ return {
       vim.keymap.set('n', '<leader>ic', clear_all_images, { desc = 'image [c]lear' })
     end,
   },
+
+  { -- interface with databases
+    'tpope/vim-dadbod',
+    'kristijanhusak/vim-dadbod-completion',
+    'kristijanhusak/vim-dadbod-ui',
+  },
 }