adding settings for markdown LSP and zk

Author: ray-x

after/ftplugin/gotmpl.vim

@@ -0,0 +1 @@
+autocmd BufNewFile,BufRead *.tmpl if search('{{.\+}}', 'nw') | setlocal filetype=gotmpl | endif

after/ftplugin/markdown.vim

@@ -0,0 +1,5 @@
+setlocal expandtab
+setlocal shiftwidth=2
+setlocal softtabstop=2
+setlocal tabstop=2
+setlocal conceallevel=0

after/queries/gomod/highlights.scm

@@ -0,0 +1 @@
+(text) @yaml

after/queries/html/injections.scm

@@ -0,0 +1 @@
+autocmd BufNewFile,BufRead *.tmpl if search('{{.\+}}', 'nw') | setlocal filetype=gotmpl | endif

ftdetect/gotmpl.vim

@@ -1,3 +1,2 @@
 -- Load Modules:
 require("core")
-

init.lua

@@ -55,13 +55,15 @@ local load_core = function()
     require('core.colorscheme').load_colorscheme()
   end
   if vim.wo.diff then
+    vim.wo.wrap = true
     return
   end
   require('core.commands')
   lprint('load compiled and lazy', uv.now() - start)
 
   require('core.lazy').setup(fsz)
   lprint('lazy done', uv.now() - start)
+  require('utils.markdown')
 end
 
 load_core()

lua/core/init.lua

@@ -112,8 +112,8 @@ local def_map = {
   -- Vim map
   ['n|<C-x>k'] = map_cmd('Bd'):with_noremap():with_silent(),
   ['n|<C-S-y>'] = map_cmd('%y +'), -- yank file
-  ['n|]b'] = map_cmd('bp'):with_noremap(),
-  ['n|[b'] = map_cmd('bn'):with_noremap(),
+  ['n|]b'] = map_cmd('BufferLineCycleNext'):with_noremap(),
+  ['n|[b'] = map_cmd('BufferLineCyclePrev'):with_noremap(),
   -- ["n|<Space>cw"] = map_cmd([[silent! keeppatterns %substitute/\s\+$//e]]):with_noremap():with_silent(),
   ['n|<A-[>'] = map_cmd('vertical resize -5'):with_silent(),
   ['n|<A-]>'] = map_cmd('vertical resize +5'):with_silent(),
@@ -193,7 +193,7 @@ local plug_keys = {
   --
   ["n|<F13>"] = map_cmd("NvimTreeToggle"),
   ["n|<S-F1>"] = map_cmd("NvimTreeToggle"),
-  ["n|<Leader>s"] = map_func(function() require("flash").toggle(true) end),
+  ["n|<Leader>S"] = map_func(function() require("flash").toggle(true) end),
   ["n|<F9>"] = map_func(function()
     if vim.o.ft == 'go' then
       return vim.cmd('GoBreakToggle')
@@ -377,7 +377,7 @@ bind.nvim_load_mapping(def_map)
 local keymap = vim.keymap
 keymap.amend = require('keymap.amend')
 
-keymap.amend('n', '<Esc>', function(original)
+keymap.amend('n', '<ESC>', function(original)
   if vim.v.hlsearch and vim.v.hlsearch == 1 then
     vim.cmd('nohlsearch')
   end
@@ -404,6 +404,8 @@ keymap.amend('n', '[c', function()
   end
 end, { desc = 'prevdiff/hunk' })
 
+vim.keymap.set('n', '<leader>u',  require('utils.markdown').fetch_and_paste_url_title, {desc = 'Fetch and paste URL title'})
+
 return { keymap = def_map }
 
 -- no longer used

lua/keymap/keys.lua

@@ -26,7 +26,14 @@ function config.nvim_cmp()
   end
 
   local sources = {
-    { name = 'nvim_lsp' },
+    {
+      name = 'nvim_lsp',
+      option = {
+        markdown_oxide = {
+          keyword_pattern = [[\(\k\| \|\/\|#\)\+]],
+        },
+      },
+    },
     { name = 'luasnip' },
     { name = 'treesitter', keyword_length = 2 },
 
@@ -54,6 +61,8 @@ function config.nvim_cmp()
     table.insert(sources, { name = 'spell' })
     -- table.insert(sources, { name = 'look' })
     table.insert(sources, { name = 'latex_symbols' })
+    table.insert(sources, { name = 'emoji' })
+    -- table.insert(sources, { name = 'mkdnflow' })
   end
   if vim.o.ft == 'lua' then
     table.insert(sources, { name = 'nvim_lua' })
@@ -116,11 +125,6 @@ function config.nvim_cmp()
         if cmp.visible() then
           cmp.abort()
           cmp.close()
-          -- vim.api.nvim_feedkeys(
-          --   vim.api.nvim_replace_termcodes('<C-e>', true, true, true),
-          --   'n',
-          --   true
-          -- )
         else
           vim.api.nvim_feedkeys(
             vim.api.nvim_replace_termcodes('<End>', true, true, true),

lua/modules/completion/config.lua

@@ -28,5 +28,26 @@ M.setup = function()
   require('lspconfig').grammarly.setup({
     filetypes = { 'markdown', 'text', 'html', 'latex', 'org' },
   })
+  -- configs["markdown_oxide"] = {
+  --   default_config = {
+  --     -- root_dir = function() return vim.fn.getcwd() end,
+  --     root_dir = lspconfig.util.root_pattern('.git', vim.fn.getcwd()),
+  --     filetypes = {"markdown"},
+  --     -- cmd = {(function()
+  --     --   if vim.env.MOXIDE_DEBUG then
+  --     --     return "/home/felix/coding/LargerIdeas/ObsidianLS/obsidian-ls/target/debug/markdown-oxide"
+  --     --   else
+  --     --     return "/home/felix/coding/LargerIdeas/ObsidianLS/obsidian-ls/target/release/markdown-oxide"
+  --     --   end
+  --     -- end)()}
+  --   },
+  --   on_attach = on_attach,
+  --   capabilities = capabilities,
+  -- }
+  require("lspconfig").markdown_oxide.setup({
+      -- root_dir = function() return vim.fn.getcwd() end,
+      root_dir = lspconfig.util.root_pattern('.marksman.toml','.git', vim.fn.getcwd()),
+      filetypes = {"markdown"}
+  })
 end
 return M

lua/modules/completion/lsp.lua

@@ -35,7 +35,8 @@ return function(use)
       { 'ray-x/cmp-treesitter', dev = (plugin_folder():find('github') ~= nil), lazy = true },
       { 'hrsh7th/cmp-nvim-lsp', lazy = true },
       { 'saadparwaiz1/cmp_luasnip', lazy = true },
-      { 'kdheepak/cmp-latex-symbols' },
+      { 'kdheepak/cmp-latex-symbols', lazy = true, ft = {'markdown'} },
+      { 'hrsh7th/cmp-emoji' },
       { 'windwp/nvim-autopairs', event = 'InsertEnter', module = true, config = function()  require('modules.completion.config').autopairs() end },
     },
     -- stylua: ignore end
@@ -158,13 +159,11 @@ return function(use)
       vim.g.copilot_no_tab_map = true
     end,
   })
-  use({
-    'hinell/lsp-timeout.nvim', -- reset lsp from time to time
-    dependencies = { 'neovim/nvim-lspconfig' },
-    event = 'InsertEnter',
-  })
+  -- use({
+  --   'hinell/lsp-timeout.nvim', -- reset lsp from time to time
+  --   dependencies = { 'neovim/nvim-lspconfig' },
+  --   event = 'InsertEnter',
+  -- })
 end
 
--- { 'hrsh7th/cmp-calc', lazy = true },
--- { 'hrsh7th/cmp-emoji', lazy = true },
--- { 'tzachar/cmp-fuzzy-buffer', lazy = true, dependencies = { 'tzachar/fuzzy.nvim' } },
+