Add settings for Neorg and keybinds
This commit is contained in:
Archie Fox
@@ -1,6 +1,6 @@
|
||||
return {
|
||||
-- disable trouble
|
||||
{ "akinsho/bufferline.nvim", enabled = true },
|
||||
{ "hrsh7th/nvim-cmp", enabled = false },
|
||||
{ "hrsh7th/nvim-cmp", enabled = true },
|
||||
{ "folke/snacks.nvim", enabled = true },
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
return {
|
||||
{ "norcalli/nvim-colorizer.lua" },
|
||||
{ "onsails/lspkind.nvim" },
|
||||
}
|
||||
|
||||
@@ -17,12 +17,18 @@ return {
|
||||
["core.dirman"] = {
|
||||
config = {
|
||||
workspaces = {
|
||||
default = "~/Share/notes/default",
|
||||
journal = "~/Share/notes/journal",
|
||||
default = "~/Share/Notes",
|
||||
journal = "~/Share/Notes/journal",
|
||||
},
|
||||
default_workspace = "default",
|
||||
},
|
||||
},
|
||||
["core.qol.todo_items"] = {
|
||||
config = {
|
||||
create_todo_items = true,
|
||||
create_todo_parents = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
local lspkind = require("lspkind")
|
||||
return {
|
||||
"hrsh7th/nvim-cmp",
|
||||
version = false, -- last release is way too old
|
||||
@@ -18,7 +19,7 @@ return {
|
||||
vim.api.nvim_set_hl(0, "CmpGhostText", { link = "Comment", default = true })
|
||||
local cmp = require("cmp")
|
||||
local defaults = require("cmp.config.default")()
|
||||
local lspkind = require("lspkind")
|
||||
-- local lspkind = require("lspkind")
|
||||
|
||||
-- Проверяем наличие luasnip
|
||||
local has_luasnip = pcall(require, "luasnip")
|
||||
@@ -196,79 +197,79 @@ return {
|
||||
}
|
||||
|
||||
-- Добавляем luasnip только если он доступен
|
||||
if has_luasnip then
|
||||
table.insert(go_sources, 2, { name = "luasnip", priority = 750 })
|
||||
end
|
||||
|
||||
cmp.setup.filetype("go", {
|
||||
sources = cmp.config.sources(go_sources, {
|
||||
{ name = "buffer", priority = 500, keyword_length = 2 }, -- Меньше символов для Go
|
||||
{ name = "path", priority = 400 },
|
||||
}),
|
||||
formatting = {
|
||||
format = lspkind.cmp_format({
|
||||
mode = "symbol_text",
|
||||
maxwidth = 60, -- Больше места для Go типов
|
||||
ellipsis_char = "...",
|
||||
before = function(entry, vim_item)
|
||||
if entry.source.name == "nvim_lsp" then
|
||||
local completion_item = entry.completion_item
|
||||
if completion_item.detail then
|
||||
local detail = completion_item.detail
|
||||
-- Специальная обработка Go типов
|
||||
if string.match(detail, "^func") then
|
||||
vim_item.menu = "[func] " .. detail:sub(1, 40)
|
||||
elseif string.match(detail, "^type") then
|
||||
vim_item.menu = "[type] " .. detail:sub(1, 40)
|
||||
elseif string.match(detail, "^var") then
|
||||
vim_item.menu = "[var] " .. detail:sub(1, 40)
|
||||
elseif string.match(detail, "^const") then
|
||||
vim_item.menu = "[const] " .. detail:sub(1, 40)
|
||||
else
|
||||
vim_item.menu = detail:sub(1, 50)
|
||||
end
|
||||
else
|
||||
vim_item.menu = "[LSP]"
|
||||
end
|
||||
else
|
||||
vim_item.menu = ({
|
||||
luasnip = "[Snippet]",
|
||||
buffer = "[Buffer]",
|
||||
path = "[Path]",
|
||||
nvim_lsp_signature_help = "[Signature]",
|
||||
})[entry.source.name] or "[Unknown]"
|
||||
end
|
||||
return vim_item
|
||||
end,
|
||||
}),
|
||||
},
|
||||
matching = {
|
||||
disallow_fuzzy_matching = false,
|
||||
disallow_fullfuzzy_matching = false,
|
||||
disallow_partial_fuzzy_matching = false, -- Разрешаем для Go
|
||||
disallow_partial_matching = false,
|
||||
disallow_prefix_unmatching = false,
|
||||
},
|
||||
})
|
||||
-- if has_luasnip then
|
||||
-- table.insert(go_sources, 2, { name = "luasnip", priority = 750 })
|
||||
-- end
|
||||
--
|
||||
-- cmp.setup.filetype("go", {
|
||||
-- sources = cmp.config.sources(go_sources, {
|
||||
-- { name = "buffer", priority = 500, keyword_length = 2 }, -- Меньше символов для Go
|
||||
-- { name = "path", priority = 400 },
|
||||
-- }),
|
||||
-- formatting = {
|
||||
-- format = lspkind.cmp_format({
|
||||
-- mode = "symbol_text",
|
||||
-- maxwidth = 60, -- Больше места для Go типов
|
||||
-- ellipsis_char = "...",
|
||||
-- before = function(entry, vim_item)
|
||||
-- if entry.source.name == "nvim_lsp" then
|
||||
-- local completion_item = entry.completion_item
|
||||
-- if completion_item.detail then
|
||||
-- local detail = completion_item.detail
|
||||
-- -- Специальная обработка Go типов
|
||||
-- if string.match(detail, "^func") then
|
||||
-- vim_item.menu = "[func] " .. detail:sub(1, 40)
|
||||
-- elseif string.match(detail, "^type") then
|
||||
-- vim_item.menu = "[type] " .. detail:sub(1, 40)
|
||||
-- elseif string.match(detail, "^var") then
|
||||
-- vim_item.menu = "[var] " .. detail:sub(1, 40)
|
||||
-- elseif string.match(detail, "^const") then
|
||||
-- vim_item.menu = "[const] " .. detail:sub(1, 40)
|
||||
-- else
|
||||
-- vim_item.menu = detail:sub(1, 50)
|
||||
-- end
|
||||
-- else
|
||||
-- vim_item.menu = "[LSP]"
|
||||
-- end
|
||||
-- else
|
||||
-- vim_item.menu = ({
|
||||
-- luasnip = "[Snippet]",
|
||||
-- buffer = "[Buffer]",
|
||||
-- path = "[Path]",
|
||||
-- nvim_lsp_signature_help = "[Signature]",
|
||||
-- })[entry.source.name] or "[Unknown]"
|
||||
-- end
|
||||
-- return vim_item
|
||||
-- end,
|
||||
-- }),
|
||||
-- },
|
||||
-- matching = {
|
||||
-- disallow_fuzzy_matching = false,
|
||||
-- disallow_fullfuzzy_matching = false,
|
||||
-- disallow_partial_fuzzy_matching = true, -- Разрешаем для Go
|
||||
-- disallow_partial_matching = false,
|
||||
-- disallow_prefix_unmatching = false,
|
||||
-- },
|
||||
-- })
|
||||
|
||||
-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
|
||||
cmp.setup.cmdline({ "/", "?" }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = "buffer" },
|
||||
},
|
||||
})
|
||||
-- cmp.setup.cmdline({ "/", "?" }, {
|
||||
-- mapping = cmp.mapping.preset.cmdline(),
|
||||
-- sources = {
|
||||
-- { name = "buffer" },
|
||||
-- },
|
||||
-- })
|
||||
|
||||
-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
|
||||
cmp.setup.cmdline(":", {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "path" },
|
||||
}, {
|
||||
{ name = "cmdline" },
|
||||
}),
|
||||
matching = { disallow_symbol_nonprefix_matching = false },
|
||||
})
|
||||
-- cmp.setup.cmdline(":", {
|
||||
-- mapping = cmp.mapping.preset.cmdline(),
|
||||
-- sources = cmp.config.sources({
|
||||
-- { name = "path" },
|
||||
-- }, {
|
||||
-- { name = "cmdline" },
|
||||
-- }),
|
||||
-- matching = { disallow_symbol_nonprefix_matching = false },
|
||||
-- })
|
||||
|
||||
-- Auto-pairs integration (проверяем наличие плагина)
|
||||
local has_autopairs, cmp_autopairs = pcall(require, "nvim-autopairs.completion.cmp")
|
||||
|
||||
@@ -7,39 +7,4 @@ return {
|
||||
"L3MON4D3/LuaSnip",
|
||||
"nvim-lua/plenary.nvim",
|
||||
},
|
||||
config = function()
|
||||
-- ваша конфигурация
|
||||
vim.opt_local.spell = false
|
||||
end,
|
||||
opts = {
|
||||
workspaces = {
|
||||
{
|
||||
name = "personal",
|
||||
path = "~/Share/Obsidian/default",
|
||||
},
|
||||
},
|
||||
|
||||
-- Настройка создания новых заметок
|
||||
note_id_func = function(title)
|
||||
return title
|
||||
end,
|
||||
|
||||
-- Настройка ссылок
|
||||
wiki_link_func = function(opts)
|
||||
return require("obsidian.util").wiki_link_id_prefix(opts)
|
||||
end,
|
||||
|
||||
-- Настройка шаблонов
|
||||
templates = {
|
||||
subdir = "Templates",
|
||||
date_format = "%Y-%m-%d",
|
||||
time_format = "%H:%M",
|
||||
},
|
||||
|
||||
-- Автодополнение
|
||||
completion = {
|
||||
nvim_cmp = false,
|
||||
min_chars = 2,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user