diff --git a/after/plugin/remote-lsp.lua b/after/plugin/remote-lsp.lua index f7e86af..27a7967 100644 --- a/after/plugin/remote-lsp.lua +++ b/after/plugin/remote-lsp.lua @@ -1 +1,15 @@ --- require('scratch.remote-lsp').setup_lsp_dirhook() +local present, lspconfig = pcall(require, "lspconfig") + +if not present then + return +end + +-- local util = lspconfig.util +-- util.on_setup = util.add_hook_before(util.on_setup, function (config) +-- local o_root_dir = config.root_dir +-- config.root_dir = function(fname, bufnr) +-- -- P(fname) +-- local dir = o_root_dir(fname) +-- return "/source" +-- end +-- end) diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua index 472c8c1..9b1a7b9 100644 --- a/lua/core/mappings.lua +++ b/lua/core/mappings.lua @@ -817,7 +817,7 @@ M.nvterm = { --{{{ ["rv"] = {function() local nvterm_utils = require('spike.utils.nvterm') nvterm_utils.run_cmd(nil, { mode = "vertical" }) - end, "run cmd in floating terminal"}, + end, "run cmd in vertical terminal"}, [""] = {function() @@ -1052,6 +1052,7 @@ M.zk = { end, "zk new note"}, ["zK"] = {get_zk_notedirs, "zk new note, custom dir"}, ["zo"] = {"ZkNotes { sort = { 'modified' }}","zk list notes"}, + ["zt"] = {"ZkTags","zk list tags"}, -- ["zf"] = {"ZkNotes { sort = { 'modified' }, match = vim.fn.input('Search: ') }","zk notes matching a given query"}, ["zf"] = {function() vim.ui.input({ prompt = "zk match:"}, function (input) diff --git a/lua/custom/plugins/configs/navigator.lua b/lua/custom/plugins/configs/navigator.lua index 2dbdaef..7eb3314 100644 --- a/lua/custom/plugins/configs/navigator.lua +++ b/lua/custom/plugins/configs/navigator.lua @@ -151,6 +151,7 @@ local config = { -- disable auto start of lsp per language -- set global default on lspconfig (see lspconfig doc) gopls = { + cmd = { "nc", "localhost", "9999" }, -- cmd = {"socat", "-" ,"tcp:localhost:4444"}, -- on_attach = require("spike.lsp.go").custom_attach, on_attach = require("spike.lsp.go").gopls_onattach, diff --git a/lua/plugins/configs/lspconfig.lua b/lua/plugins/configs/lspconfig.lua index 8088489..4358142 100644 --- a/lua/plugins/configs/lspconfig.lua +++ b/lua/plugins/configs/lspconfig.lua @@ -17,6 +17,7 @@ function M.setup() { autostart = false }) + end diff --git a/mysnippets/lua.lua b/mysnippets/lua.lua index 7e5e891..bd1b0e2 100644 --- a/mysnippets/lua.lua +++ b/mysnippets/lua.lua @@ -1,5 +1,6 @@ ---@diagnostic disable: undefined-global +-- return two lists of snippets: first are normal snippets second are autosnippets return { s({ trig = "lm", dscr = "local lua module"}, fmt([[ @@ -49,4 +50,8 @@ return M i(0) })) +}, { -- autosnippets + -- s("autotrig", t("autotriggered")) } + +