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

jmbuhr · Nov 5, 2024 · 67f39e0 · 67f39e0
2 parents 37765ba + db82e96
commit 67f39e0
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 30 deletions.
diff --git a/init.lua b/init.lua
@@ -16,6 +16,9 @@ require 'config.autocommands'
 require 'config.redir'
 
 
-vim.treesitter.language.add('pandoc_markdown', { path = "/usr/local/lib/libtree-sitter-pandoc-markdown.so" })
-vim.treesitter.language.add('pandoc_markdown_inline', { path = "/usr/local/lib/libtree-sitter-pandoc-markdown-inline.so" })
-vim.treesitter.language.register('pandoc_markdown', { 'quarto', 'rmarkdown' })
+-- vim.treesitter.language.add('pandoc_markdown', { path = "/usr/local/lib/libtree-sitter-pandoc-markdown.so" })
+-- vim.treesitter.language.add('pandoc_markdown_inline', { path = "/usr/local/lib/libtree-sitter-pandoc-markdown-inline.so" })
+-- vim.treesitter.language.register('pandoc_markdown', { 'quarto', 'rmarkdown' })
+
+vim.treesitter.language.register("markdown", 'text')
+
diff --git a/lua/config/global.lua b/lua/config/global.lua
@@ -2,6 +2,9 @@
 
 local animals = require('misc.style').animals
 
+DefaultConcealLevel = 0
+FullConcealLevel = 3
+
 -- proper colors
 vim.opt.termguicolors = true
 
@@ -101,7 +104,7 @@ vim.opt.formatoptions:remove 'o'
 vim.opt.scrolloff = 5
 
 -- (don't == 0) replace certain elements with prettier ones
-vim.opt.conceallevel = 0
+vim.opt.conceallevel = DefaultConcealLevel
 
 -- diagnostics
 vim.diagnostic.config {

diff --git a/lua/config/keymap.lua b/lua/config/keymap.lua
@@ -312,6 +312,15 @@ end
 
 vim.keymap.set("n", "<leader>os", get_otter_symbols_lang, { desc = "otter [s]ymbols" })
 
+local function toggle_conceal()
+  local lvl = vim.o.conceallevel
+  if lvl > DefaultConcealLevel then
+    vim.o.conceallevel = DefaultConcealLevel
+  else
+    vim.o.conceallevel = FullConcealLevel
+  end
+end
+
 
 -- normal mode with <leader>
 wk.add({
@@ -354,8 +363,7 @@ wk.add({
     { "<leader>gws",      ":lua require('telescope').extensions.git_worktree.git_worktrees()<cr>",       desc = "worktree switch" },
     { "<leader>h",        group = "[h]elp / [h]ide / debug" },
     { "<leader>hc",       group = "[c]onceal" },
-    { "<leader>hch",      ":set conceallevel=1<cr>",                                                     desc = "[h]ide/conceal" },
-    { "<leader>hcs",      ":set conceallevel=0<cr>",                                                     desc = "[s]how/unconceal" },
+    { "<leader>hc",       toggle_conceal,                                                     desc = "[c]onceal toggle" },
     { "<leader>ht",       group = "[t]reesitter" },
     { "<leader>htt",      vim.treesitter.inspect_tree,                                                   desc = "show [t]ree" },
     { "<leader>i",        group = "[i]mage" },

diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
@@ -31,7 +31,7 @@ require('lazy').setup('plugins', {
       'gzip',
       'matchit',
       'matchparen',
-      'netrwPlugin',
+      -- 'netrwPlugin',
       'tarPlugin',
       'tohtml',
       'tutor',

diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua
@@ -154,7 +154,7 @@ return {
 
   { -- gh copilot
     'zbirenbaum/copilot.lua',
-    enabled = true,
+    enabled = false,
     config = function()
       require('copilot').setup {
         suggestion = {

diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
@@ -115,9 +115,6 @@ return {
         debounce_text_changes = 150,
       }
 
-      vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(vim.lsp.handlers.hover, { border = require('misc.style').border })
-      vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = require('misc.style').border })
-
       local capabilities = vim.lsp.protocol.make_client_capabilities()
       capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
       capabilities.textDocument.completion.completionItem.snippetSupport = true
@@ -159,6 +156,11 @@ return {
         flags = lsp_flags,
       }
 
+      lspconfig.svelte.setup {
+        capabilities = capabilities,
+        flags = lsp_flags,
+      }
+
       lspconfig.yamlls.setup {
         capabilities = capabilities,
         flags = lsp_flags,

diff --git a/lua/plugins/notes.lua b/lua/plugins/notes.lua
@@ -33,26 +33,49 @@ return {
       'nvim-lua/plenary.nvim',
     },
     keys = {
-      { '<leader>nd', ':ObsidianToday<cr>', desc = 'obsidian [d]aily' },
-      { '<leader>nt', ':ObsidianToday 1<cr>', desc = 'obsidian [t]omorrow' },
-      { '<leader>ny', ':ObsidianToday -1<cr>', desc = 'obsidian [y]esterday' },
-      { '<leader>nb', ':ObsidianBacklinks<cr>', desc = 'obsidian [b]acklinks' },
-      { '<leader>nl', ':ObsidianLink<cr>', desc = 'obsidian [l]ink selection' },
-      { '<leader>nf', ':ObsidianFollowLink<cr>', desc = 'obsidian [f]ollow link' },
-      { '<leader>nn', ':ObsidianNew<cr>', desc = 'obsidian [n]ew' },
-      { '<leader>ns', ':ObsidianSearch<cr>', desc = 'obsidian [s]earch' },
+      { '<leader>nd', ':ObsidianToday<cr>',       desc = 'obsidian [d]aily' },
+      { '<leader>nt', ':ObsidianToday 1<cr>',     desc = 'obsidian [t]omorrow' },
+      { '<leader>ny', ':ObsidianToday -1<cr>',    desc = 'obsidian [y]esterday' },
+      { '<leader>nb', ':ObsidianBacklinks<cr>',   desc = 'obsidian [b]acklinks' },
+      { '<leader>nl', ':ObsidianLink<cr>',        desc = 'obsidian [l]ink selection' },
+      { '<leader>nf', ':ObsidianFollowLink<cr>',  desc = 'obsidian [f]ollow link' },
+      { '<leader>nn', ':ObsidianNew<cr>',         desc = 'obsidian [n]ew' },
+      { '<leader>ns', ':ObsidianSearch<cr>',      desc = 'obsidian [s]earch' },
       { '<leader>no', ':ObsidianQuickSwitch<cr>', desc = 'obsidian [o]pen quickswitch' },
-      { '<leader>nO', ':ObsidianOpen<cr>', desc = 'obsidian [O]pen in app' },
+      { '<leader>nO', ':ObsidianOpen<cr>',        desc = 'obsidian [O]pen in app' },
     },
     config = function()
       ---@diagnostic disable-next-line: missing-fields
       require('obsidian').setup {
+        ui = {
+          enable = false,
+        },
         workspaces = {
           {
             name = 'notes',
             path = '~/notes',
           },
         },
+        -- Optional, for templates (see below).
+        templates = {
+          folder = "templates",
+          date_format = "%Y-%m-%d",
+          time_format = "%H:%M",
+          -- A map for custom variables, the key should be the variable and the value a function
+          substitutions = {},
+        },
+        daily_notes = {
+          -- Optional, if you keep daily notes in a separate directory.
+          -- folder = "dailies",
+          -- Optional, if you want to change the date format for the ID of daily notes.
+          -- date_format = "%Y-%m-%d",
+          -- Optional, if you want to change the date format of the default alias of daily notes.
+          -- alias_format = "%B %-d, %Y",
+          -- Optional, default tags to add to each new daily note created.
+          -- default_tags = { "daily-notes" },
+          -- Optional, if you want to automatically insert a template from your template directory like 'daily.md'
+          template = 'template-daily.md'
+        },
         mappings = {
           -- Overrides the 'gf' mapping to work on markdown/wiki links within your vault.
           ['gf'] = {
@@ -93,8 +116,6 @@ return {
           return tostring(os.time()) .. '-' .. suffix
         end,
       }
-
-      vim.wo.conceallevel = 1
     end,
   },
 }
diff --git a/lua/plugins/quarto.lua b/lua/plugins/quarto.lua
@@ -8,7 +8,7 @@ return {
     opts = {
       codeRunner = {
         enabled = true,
-        default_method = "molten"
+        default_method = "slime"
       }
     },
     dependencies = {
@@ -127,8 +127,8 @@ return {
 
   {
     'benlubas/molten-nvim',
-    dev = true,
-    enabled = true,
+    dev = false,
+    enabled = false,
     build = ':UpdateRemotePlugins',
     init = function()
       vim.g.molten_image_provider = 'image.nvim'

diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua
@@ -45,16 +45,35 @@ return {
       table.insert(vimgrep_arguments, '--glob')
       table.insert(vimgrep_arguments, '!docs/*')
 
+      table.insert(vimgrep_arguments, '--glob')
+      table.insert(vimgrep_arguments, '!_site/*')
+
+      table.insert(vimgrep_arguments, '--glob')
+      table.insert(vimgrep_arguments, '!*_files/libs/*')
+
+      table.insert(vimgrep_arguments, '--glob')
+      table.insert(vimgrep_arguments, '!.obsidian/*')
+
+      table.insert(vimgrep_arguments, '--glob')
+      table.insert(vimgrep_arguments, '!.quarto/*')
+
+      table.insert(vimgrep_arguments, '--glob')
+      table.insert(vimgrep_arguments, '!_freeze/*')
+
       telescope.setup {
         defaults = {
           buffer_previewer_maker = new_maker,
           vimgrep_arguments = vimgrep_arguments,
           file_ignore_patterns = {
-            'node_modules',
+            'node%_modules',
             '%_cache',
-            '.git/',
-            'site_libs',
-            '.venv',
+            '%.git/',
+            'site%_libs',
+            '%.venv/',
+            '%_files/libs/',
+            '%.obsidian/',
+            '%.quarto/',
+            '%_freeze/',
           },
           layout_strategy = 'flex',
           sorting_strategy = 'ascending',
@@ -203,7 +222,7 @@ return {
     },
     config = function()
       require('nvim-tree').setup {
-        disable_netrw = true,
+        disable_netrw = false,
         update_focused_file = {
           enable = true,
         },

diff --git a/snips/snippets/markdown.json b/snips/snippets/markdown.json
@@ -3,6 +3,10 @@
     "prefix": ["eq"],
     "body": ["\\$\\$", "$1", "\\$\\$ {#eq-${2: label}}"]
   },
+  "def": {
+    "prefix": ["def"],
+    "body": [":::{#def-$1}", "## $2\n", "$3", ":::"]
+  },
   "Insert Block Equation": {
     "prefix": "$$",
     "body": ["\\$$", "${0}", "\\$$"]