Compare commits

...

3 Commits

2 changed files with 69 additions and 122 deletions

View File

@ -184,75 +184,39 @@ require("lazy").setup({
dependencies = { dependencies = {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
}, },
config = function() opts = {
require("fzf-lua").setup({
winopts = { winopts = {
preview = { preview = {
wrap = "wrap", wrap = "wrap",
},
}, },
defaults = { },
formatter = "path.filename_first", defaults = {
git_icons = false, formatter = "path.filename_first",
}, git_icons = false,
grep = { },
multiline = 1, grep = {
}, multiline = 1,
fzf_colors = true, },
}) fzf_colors = true,
end, },
}, },
-- https://github.com/hrsh7th/nvim-cmp -- https://github.com/Saghen/blink.cmp
{ {
"hrsh7th/nvim-cmp", "saghen/blink.cmp",
event = "InsertEnter", version = "v0.*",
dependencies = { opts = {
"hrsh7th/cmp-nvim-lsp", keymap = {
"hrsh7th/cmp-buffer", select_and_accept = { "<CR>" },
-- https://github.com/onsails/lspkind.nvim },
"onsails/lspkind.nvim", windows = {
autocomplete = {
auto_show = false,
},
},
nerd_font_variant = "mono",
}, },
config = function()
local cmp = require("cmp")
local lspkind = require("lspkind")
cmp.setup({
-- Custom
completion = {
autocomplete = false,
},
preselect = cmp.PreselectMode.None,
-- Largely copy from GitHub
mapping = cmp.mapping.preset.insert({
["<C-Space>"] = cmp.mapping.complete(),
["<CR>"] = cmp.mapping.confirm(),
["<C-e>"] = cmp.mapping.abort(),
}),
sources = cmp.config.sources({
{ name = "nvim_lsp" },
}, {
{
name = "buffer",
option = {
-- All buffers
get_bufnrs = function()
return vim.api.nvim_list_bufs()
end,
},
},
}),
formatting = {
format = lspkind.cmp_format({
mode = "symbol",
maxwidth = 50,
ellipsis_char = "...",
show_labelDetails = true,
}),
},
})
end,
}, },
-- https://github.com/tpope/vim-projectionist -- https://github.com/tpope/vim-projectionist
@ -286,12 +250,10 @@ require("lazy").setup({
-- https://github.com/svban/YankAssassin.nvim -- https://github.com/svban/YankAssassin.nvim
{ {
"svban/YankAssassin.nvim", "svban/YankAssassin.nvim",
config = function() opts = {
require("YankAssassin").setup({ auto_normal = true,
auto_normal = true, auto_visual = true,
auto_visual = true, },
})
end,
}, },
-- https://github.com/echasnovski/mini.nvim -- https://github.com/echasnovski/mini.nvim
@ -446,39 +408,37 @@ require("lazy").setup({
build = { build = {
":TSUpdate", ":TSUpdate",
}, },
config = function() opts = {
require("nvim-treesitter.configs").setup({ ensure_installed = {
ensure_installed = { "bash",
"bash", "c",
"c", "git_config",
"git_config", "gitcommit",
"gitcommit", "go",
"go", "json",
"json", "lua",
"lua", "make",
"make", "markdown",
"markdown", "markdown_inline",
"markdown_inline", "proto",
"proto", "python",
"python", "query",
"query", "toml",
"toml", "typst",
"typst", "vim",
"vim", "vimdoc",
"vimdoc", },
}, highlight = {
highlight = { enabled = true,
enabled = true, disable = function(lang, bufnr)
disable = function(lang, bufnr) -- Skip big files with many lines
-- Skip big files with many lines return vim.api.nvim_buf_line_count(bufnr) > 10000
return vim.api.nvim_buf_line_count(bufnr) > 10000 end,
end, },
}, incremental_selection = { enable = false },
incremental_selection = { enable = false }, textobjects = { enable = false },
textobjects = { enable = false }, indent = { enable = false },
indent = { enable = false }, },
})
end,
}, },
-- https://github.com/nvim-treesitter/nvim-treesitter-context -- https://github.com/nvim-treesitter/nvim-treesitter-context
@ -487,12 +447,10 @@ require("lazy").setup({
dependencies = { dependencies = {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
}, },
config = function() opts = {
require("treesitter-context").setup({ enable = true,
enable = true, max_lines = 2,
max_lines = 2, },
})
end,
}, },
-- https://github.com/neovim/nvim-lspconfig -- https://github.com/neovim/nvim-lspconfig
@ -504,30 +462,19 @@ require("lazy").setup({
"python", "python",
"typst", "typst",
}, },
dependencies = {
"hrsh7th/nvim-cmp",
},
config = function() config = function()
local lspconfig = require("lspconfig") local lspconfig = require("lspconfig")
-- https://github.com/hrsh7th/cmp-nvim-lsp
-- https://github.com/hrsh7th/nvim-cmp/discussions/759
local capabilities = require("cmp_nvim_lsp").default_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = false
-- Go -- Go
-- https://github.com/golang/tools/blob/master/gopls/doc/vim.md -- https://github.com/golang/tools/blob/master/gopls/doc/vim.md
-- https://github.com/golang/tools/blob/master/gopls/doc/settings.md -- https://github.com/golang/tools/blob/master/gopls/doc/settings.md
-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#gopls -- https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#gopls
-- https://github.com/neovim/nvim-lspconfig/issues/2542 -- https://github.com/neovim/nvim-lspconfig/issues/2542
lspconfig.gopls.setup({ lspconfig.gopls.setup({})
capabilities = capabilities,
})
-- Python -- Python
-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#pyright -- https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#pyright
lspconfig.pyright.setup({ lspconfig.pyright.setup({
capabilities = capabilities,
settings = { settings = {
pyright = { pyright = {
-- Conflicts with Ruff -- Conflicts with Ruff

View File

@ -11,5 +11,5 @@ brew install \
fnm oven-sh/bun/bun deno uv \ fnm oven-sh/bun/bun deno uv \
just typst asciidoctor clang-format stylua taplo typos-cli typstyle marksman tinymist \ just typst asciidoctor clang-format stylua taplo typos-cli typstyle marksman tinymist \
ollama gitleaks gh glab \ ollama gitleaks gh glab \
qmk/qmk/qmk daktilo \ qmk/qmk/qmk daktilo asciinema \
redis mysql-client redis mysql-client