Skip to content

Commit

Permalink
chore: improvements and move snippets into config
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin Manca authored and Kevin Manca committed Dec 30, 2024
1 parent 2193abb commit 36de0d0
Show file tree
Hide file tree
Showing 81 changed files with 19,784 additions and 113 deletions.
28 changes: 13 additions & 15 deletions lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,33 @@
{
"SchemaStore.nvim": { "branch": "main", "commit": "545d8814f624fb5239c4691fa0914549540e6f53" },
"SchemaStore.nvim": { "branch": "main", "commit": "e43f3e47991bc9f6cbc1d8b4d0f6a0d8d6c29284" },
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
"blink.cmp": { "branch": "main", "commit": "5f442681df24fe705d1ee7ce5b4d435aa4b4dee4" },
"color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
"conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" },
"data-viewer.nvim": { "branch": "main", "commit": "40ddf37bb7ab6c04ff9e820812d1539afe691668" },
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
"go.nvim": { "branch": "master", "commit": "c6d5ca26377d01c4de1f7bff1cd62c8b43baa6bc" },
"hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
"image.nvim": { "branch": "master", "commit": "b991fc7f845bc6ab40c6ec00b39750dcd5190010" },
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
"kurayami.nvim": { "branch": "main", "commit": "cea7998ddbad73aa834e8fb3765711750c40c18a" },
"lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
"lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" },
"markdown.nvim": { "branch": "main", "commit": "ba6253d9673daf0cf394b87b2c2ecb7630944c7d" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "2daa8921b7afdcfa47419a21ea343c3df6d74fa0" },
"markdown.nvim": { "branch": "main", "commit": "6fbd1491abc104409f119685de5353c35c97c005" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"mini.icons": { "branch": "main", "commit": "44c0160526f7ae17ca8e8eab9ab235d047fcf7a6" },
"mini.icons": { "branch": "main", "commit": "6787321f70d674a481776b7cc2c781fb7002c644" },
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
"mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
"molten-nvim": { "branch": "main", "commit": "66ee5c0a0fbe3e014b867d04db44592f2d3eb30f" },
"molten-nvim": { "branch": "main", "commit": "c621baf53459a6c45dfd98dcc11cbba7a7ae9470" },
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-dap": { "branch": "master", "commit": "665d3569a86395fe0dab85efbdb26d7d2ee57e49" },
"nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
"nvim-dap": { "branch": "master", "commit": "ffb077e65259f13be096ea6d603e3575a76b214a" },
"nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" },
"nvim-dbee": { "branch": "master", "commit": "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853" },
"nvim-jdtls": { "branch": "master", "commit": "ece818f909c6414cbad4e1fb240d87e003e10fda" },
"nvim-jdtls": { "branch": "master", "commit": "8f14aa1922ee5491ded1079a6576fae834535658" },
"nvim-lint": { "branch": "master", "commit": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55" },
"nvim-lspconfig": { "branch": "master", "commit": "ff2b85abaa810f6611233dbe6d31c07510ebf43d" },
"nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" },
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
"nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
"nvim-treesitter": { "branch": "master", "commit": "17678b00fa5c2712890a0ec2e269d0a4de1207df" },
"nvim-notify": { "branch": "master", "commit": "c3797193536711b5d8983975791c4b11dc35ab3a" },
"nvim-treesitter": { "branch": "master", "commit": "4b222913486ec0a5983efa82b0649a2ab87cf1f0" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
"nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" },
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
Expand All @@ -38,7 +36,7 @@
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
"quarto-nvim": { "branch": "main", "commit": "1cb2d24d7793241bd43f38e3a6f99a6d11f84458" },
"sqls.nvim": { "branch": "main", "commit": "a514379f5f89bf72955ed3bf5c1c31a40b8a1472" },
"rest.nvim": { "branch": "main", "commit": "c7944769dc489b9e4bc493e40820c2818eab2569" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
Expand Down
3 changes: 2 additions & 1 deletion lua/config/lazy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ require("lazy").setup({
fallback = true,
},
rocks = {
hererocks = true,
hererocks = false,
},
install = {
missing = false,
colorscheme = { "knvim", "default" },
},
change_detection = { notify = false },
concurrency = 3,
ui = {
title = "Plugin Manager",
size = { width = 0.8, height = 0.8 },
Expand Down
185 changes: 89 additions & 96 deletions lua/plugins/editor/completion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,117 +5,110 @@
-- Last Modified: 21 Dec 2024, 14:30
-------------------------------------

local snippets_path = vim.fn.has "mac" == 1 and vim.fn.expand "~/dev/snippets"
or vim.fn.stdpath "data" .. "/lazy/snippets"

return {
{ "kevinm6/snippets", dev = true },
{
"saghen/blink.cmp",
event = { "InsertEnter", "CmdlineEnter" },
version = "v0.*",
opts = {
keymap = {
preset = "default",
["<Up>"] = {},
["<Down>"] = {},
"saghen/blink.cmp",
event = { "InsertEnter", "CmdlineEnter" },
version = "v0.*",
opts = {
keymap = {
preset = "default",
["<Up>"] = {},
["<Down>"] = {},
["<C-k>"] = { "select_prev", "fallback" },
["<C-j>"] = { "select_next", "fallback" },
["<C-l>"] = { "select_and_accept" },
["<C-i>"] = { "snippet_forward", "fallback" },
["<C-S-i>"] = { "snippet_backward", "fallback" },
["<C-Space>"] = { "show", "show_documentation", "hide_documentation" },

cmdline = {
["<C-i>"] = { "select_and_accept", "fallback" },
["<C-k>"] = { "select_prev", "fallback" },
["<C-j>"] = { "select_next", "fallback" },
["<C-l>"] = { "select_and_accept" },
["<C-i>"] = { "snippet_forward", "fallback" },
["<C-S-i>"] = { "snippet_backward", "fallback" },
["<C-Space>"] = { "show", "show_documentation", "hide_documentation" },

cmdline = {
["<C-i>"] = { "select_and_accept", "fallback" },
["<C-k>"] = { "select_prev", "fallback" },
["<C-j>"] = { "select_next", "fallback" },
["<C-Space>"] = { "show", "hide" },
["<C-e>"] = { "cancel" },
},
},
appearance = {
nerd_font_variant = "mono",
["<C-Space>"] = { "show", "hide" },
["<C-e>"] = { "cancel" },
},
},
appearance = {
nerd_font_variant = "mono",
},

sources = {
default = { "snippets", "lsp", "path", "buffer", "lazydev" },
providers = {
lazydev = {
name = "LazyDev",
module = "lazydev.integrations.blink",
score_offset = 100,
},
snippets = {
opts = {
search_paths = { snippets_path },
extended_filetypes = {
lua = { "luadoc", "nvim_lua" },
sh = { "shelldoc" },
java = { "javadoc", "java_tests" },
},
sources = {
default = { "snippets", "lsp", "path", "buffer", "lazydev" },
providers = {
lazydev = {
name = "LazyDev",
module = "lazydev.integrations.blink",
score_offset = 100,
},
snippets = {
opts = {
extended_filetypes = {
lua = { "luadoc", "nvim_lua" },
sh = { "shelldoc" },
java = { "javadoc", "java_tests" },
},
},
},
min_keyword_length = function(ctx)
return ctx.mode == "cmdline" and 2 or 0
end,
},
signature = {
enabled = true,
window = {
max_width = math.ceil(vim.o.columns * 0.6),
max_height = math.ceil(vim.o.lines * 0.4),
},
min_keyword_length = function(ctx)
return ctx.mode == "cmdline" and 2 or 0
end,
},
signature = {
enabled = true,
window = {
max_width = math.ceil(vim.o.columns * 0.6),
max_height = math.ceil(vim.o.lines * 0.4),
},
completion = {
keyword = {
regex = "[-_/]\\|\\k",
exclude_from_prefix_regex = "[\\.]",
},
accept = {
auto_brackets = { enabled = true },
},
list = {
selection = function(ctx)
return ctx.mode == "cmdline" and "auto_insert" or "preselect"
end,
},
menu = {
scrollbar = false,
min_width = 32,
winblend = vim.o.pumblend,
draw = {
treesitter = { "lsp" },
-- align_to_component = "kind_icon",
-- columns = { { "label", "label_description", gap = 1 }, { "kind_icon", "kind" } },
columns = { { "kind_icon" }, { "label", "label_description", gap = 1 } },
components = {
label = { ellipsis = true, width = { fill = true, max = 32 } },
label_description = { ellipsis = true, width = { fill = true, max = 26 } },
kind_icon = {
ellipsis = false,
text = function(ctx)
local kind_icon, _, _ = require("mini.icons").get("lsp", ctx.kind)
return kind_icon
end,
},
},
completion = {
keyword = {
regex = "[-_/]\\|\\k",
exclude_from_prefix_regex = "[\\.]",
},
accept = {
auto_brackets = { enabled = true },
},
list = {
selection = function(ctx)
return ctx.mode == "cmdline" and "auto_insert" or "preselect"
end,
},
menu = {
scrollbar = false,
min_width = 32,
winblend = vim.o.pumblend,
draw = {
treesitter = { "lsp" },
-- align_to_component = "kind_icon",
-- columns = { { "label", "label_description", gap = 1 }, { "kind_icon", "kind" } },
columns = { { "kind_icon" }, { "label", "label_description", gap = 1 } },
components = {
label = { ellipsis = true, width = { fill = true, max = 32 } },
label_description = { ellipsis = true, width = { fill = true, max = 26 } },
kind_icon = {
ellipsis = false,
text = function(ctx)
local kind_icon, _, _ = require("mini.icons").get("lsp", ctx.kind)
return kind_icon
end,
},
},
},
documentation = {
auto_show = true,
window = {
min_width = 24,
scrollbar = false,
direction_priority = {
menu_north = { "e", "n", "w", "s" },
menu_south = { "e", "n", "s", "w" },
},
},
documentation = {
auto_show = true,
window = {
min_width = 24,
scrollbar = false,
direction_priority = {
menu_north = { "e", "n", "w", "s" },
menu_south = { "e", "n", "s", "w" },
},
},
ghost_text = { enabled = true },
},
ghost_text = { enabled = true },
},
},
}
}
5 changes: 4 additions & 1 deletion lua/plugins/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ local M = {
"3rd/image.nvim",
-- pin = true, -- DON'T update for now -> https://github.com/3rd/image.nvim/issues/191
-- dev = true,
enabled = function()
return vim.fn.has "win32" ~= 1
end,
ft = { "markdown", "vimwiki", "png", "jpeg", "jpg", "image_nvim" },
opts = function(_, o)
o.backend = "kitty"
Expand Down Expand Up @@ -406,4 +409,4 @@ local M = {
},
}

return M
return M
6 changes: 6 additions & 0 deletions lua/plugins/lsp/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,9 @@ return {
---Go
{
"ray-x/go.nvim",
enabled = function()
return vim.fn.has "win32" ~= 1
end,
ft = { "go", "gomod" },
build = ':lua require("go.install").update_all_sync()', -- if you need to install/update all binaries
opts = function(_, o)
Expand Down Expand Up @@ -681,6 +684,9 @@ return {
---SQL
{
"nanotee/sqls.nvim",
enabled = function()
return vim.fn.has "win32" ~= 1
end,
ft = { "sql", "mysql" },
},

Expand Down
3 changes: 3 additions & 0 deletions lua/plugins/utils/webdev.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
return {
"kevinm6/rest.nvim",
dev = true,
enabled = function()
return vim.fn.has "win32" ~= 1
end,
ft = { "http", "https" },
config = function(_, o)
o.skip_ssl_verification = true
Expand Down
Loading

0 comments on commit 36de0d0

Please sign in to comment.