mirror of
https://github.com/kristoferssolo/SoloVim.git
synced 2025-10-21 20:10:41 +00:00
chore: fix cmp auto imports
This commit is contained in:
Kristofers Solo
parent
1c8d7d92a8
commit
3618480fd4
@ -6,7 +6,7 @@
|
||||
"cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" },
|
||||
"cheatsheet.nvim": { "branch": "master", "commit": "53325f0c7bef73f875d798f2a951362f4f3f50bc" },
|
||||
"clangd_extensions.nvim": { "branch": "main", "commit": "34c8eaa12be192e83cd4865ce2375e9f53e728f2" },
|
||||
"cloak.nvim": { "branch": "main", "commit": "462e84e1659d984196d09f7d16690b19b9aee804" },
|
||||
"cloak.nvim": { "branch": "main", "commit": "6e5bcd50bebc5cdb7cd3a00eb3d97ab7c4cc3b94" },
|
||||
"cmake-tools.nvim": { "branch": "master", "commit": "a4cd0b3a2c8a166a54b36bc00579954426748959" },
|
||||
"cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||
@ -38,51 +38,52 @@
|
||||
"hlargs.nvim": { "branch": "main", "commit": "0f2dbf02ff948e8fc8ebe07b215f3174a12bbe3c" },
|
||||
"hypersonic.nvim": { "branch": "main", "commit": "aee42425b24a92febc46a42a9cabebe5f96f021b" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
|
||||
"inlay-hints.nvim": { "branch": "main", "commit": "006b0898f5d3874e8e528352103733142e705834" },
|
||||
"kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "3132d7d27d56d6bb4bdd0a09623d162b3cf1c588" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "af6afefbb46ab29a8a1db69536b04290a9403876" },
|
||||
"lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" },
|
||||
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
||||
"markdown-togglecheck": { "branch": "main", "commit": "5e9ee3184109a102952c01ef816babe8835b299a" },
|
||||
"markdown.nvim": { "branch": "master", "commit": "fd3d4c65041c62c4f51824ede751c2cf032b7c62" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "2ba17cecfde8b8c7c7c287909a1e4de895223df6" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" },
|
||||
"mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" },
|
||||
"mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
|
||||
"mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
|
||||
"melange-nvim": { "branch": "master", "commit": "ec15b091304580f1d37e711c3a54bc828b09e255" },
|
||||
"neoconf.nvim": { "branch": "main", "commit": "9a419c4fa772c4c61839a8f7fdd8e863679a8c94" },
|
||||
"neodev.nvim": { "branch": "main", "commit": "6a533ed9d3435dcaa456380d833ea04da37ea2ed" },
|
||||
"neogen": { "branch": "main", "commit": "e5460f2ad8de3afaf0864497d2c9c0490b702625" },
|
||||
"neogit": { "branch": "master", "commit": "bf2a353108b9046e907fc112701f6d876b50e465" },
|
||||
"neogen": { "branch": "main", "commit": "0daffcec249bf42275e322361fe55b89a05ff278" },
|
||||
"neogit": { "branch": "master", "commit": "20ab5a688c2de6fa371865528c737ae901989aa5" },
|
||||
"neorg": { "branch": "main", "commit": "086891d396ac9fccd91faf1520f563b6eb9eb942" },
|
||||
"nightfly": { "branch": "master", "commit": "e61adcb7bfadc0526572aa98ff83d513de421be7" },
|
||||
"nightfly": { "branch": "master", "commit": "e6be35b24e5ff3736aa9be0d9f39f5c105069f98" },
|
||||
"nightfox.nvim": { "branch": "main", "commit": "e352a32e0f54feb2550ebdab815ae8f7f26ed63b" },
|
||||
"none-ls-extras.nvim": { "branch": "main", "commit": "4f6ba0c4a317a630157bc02fad110fcd826e9494" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "18910d09d21d7df339805343bfe4a2b2e41c057b" },
|
||||
"nvim": { "branch": "main", "commit": "56fb98218d22d5c326387bf9e4076227e7372e6b" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "b356f2c80cb6c5bae2a65d7f9c82dd5c3fdd6038" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "c34fa793eafe4623979f780a67f4be6465df5ab5" },
|
||||
"nvim-cmp-rust": { "branch": "main", "commit": "1c431ba192a90da36194d8f2fcf14c4ec5afb4a5" },
|
||||
"nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
|
||||
"nvim-dap": { "branch": "master", "commit": "c1695e500c7d552a0a19953a9aefcc89178fb1af" },
|
||||
"nvim-dap-python": { "branch": "master", "commit": "66560f0ebddf96604f7037e1efad3ba6942761e6" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" },
|
||||
"nvim-dap-virtual-text": { "branch": "master", "commit": "baa5b0dc6663284cce32e0d00ac1f2511b13496f" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "24662f92c18edd397ef12d635b11dbdedef2d094" },
|
||||
"nvim-nio": { "branch": "master", "commit": "7054695117581bdb0183b8d27d8d82b4a2ac8958" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "6e5c78ebc9936ca74add66bda22c566f951b6ee5" },
|
||||
"nvim-nio": { "branch": "master", "commit": "33c62b3eadd8154169e42144de16ba4db6784bec" },
|
||||
"nvim-silicon": { "branch": "main", "commit": "ab664633e5090809da7470288404fe5b8735a8c8" },
|
||||
"nvim-surround": { "branch": "main", "commit": "d47001f8ddf9646c24f16d2732d4d0255acd2121" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "6e7b41106e9b15a5b47d149378d53482c9d9c7a3" },
|
||||
"nvim-treesitter-context": { "branch": "master", "commit": "ce37c771550443d0b026c7999deceec1fd57981b" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "5e4f959d5979730ddb2ee9ae60f5133081502b23" },
|
||||
"nvim-treesitter-context": { "branch": "master", "commit": "f19766163c18515fb4d3c12d572bf9cba6cdb990" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" },
|
||||
"nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
|
||||
"nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "6ed787740a3b275b748328eb2dc7dd22dae1c064" },
|
||||
"oil.nvim": { "branch": "master", "commit": "e462a3446505185adf063566f5007771b69027a1" },
|
||||
"onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
|
||||
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
|
||||
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
|
||||
"project-starter.nvim": { "branch": "main", "commit": "240f2d2f3354184d70ffa661933b4b5097de2c4d" },
|
||||
"rainbow_csv": { "branch": "master", "commit": "6955d13a65e0161e8dad488b6045441d527d62ec" },
|
||||
"rainbow_csv": { "branch": "master", "commit": "1fa5483d470d57c54ca65a21aca03bb9c67dc346" },
|
||||
"runner.nvim": { "branch": "main", "commit": "8358ab780793bc2473ad8117ee487f1a468305bf" },
|
||||
"rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
|
||||
"tagbar": { "branch": "master", "commit": "12edcb59449b335555652898f82dd6d5c59d519a" },
|
||||
@ -99,7 +100,7 @@
|
||||
"telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "fbe3a27378fdd51a8ddd04f57012455436916a62" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "623c3cd60a8081b68edcaf544856c053249a659e" },
|
||||
"tree-sitter-hyprlang": { "branch": "master", "commit": "27af9b74acf89fa6bed4fb8cb8631994fcb2e6f3" },
|
||||
"treesitter-utils": { "branch": "main", "commit": "0e1ac3ae9ae55a371f09aa1d7bbc757275567627" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
return {
|
||||
"hrsh7th/nvim-cmp",
|
||||
event = { "InsertEnter", "CmdlineEnter" },
|
||||
commit = "b356f2c",
|
||||
-- commit = "b356f2c",
|
||||
dependencies = {
|
||||
"hrsh7th/cmp-buffer", -- buffer completions
|
||||
"hrsh7th/cmp-cmdline",
|
||||
|
||||
@ -11,7 +11,7 @@ return {
|
||||
"williamboman/mason.nvim",
|
||||
{ "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" } },
|
||||
"mfussenegger/nvim-dap",
|
||||
{ "simrat39/rust-tools.nvim", ft = "rust" },
|
||||
-- { "simrat39/rust-tools.nvim", ft = "rust" },
|
||||
{ "mfussenegger/nvim-dap-python", ft = "python" },
|
||||
"theHamsta/nvim-dap-virtual-text",
|
||||
"williamboman/mason.nvim",
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
return {
|
||||
"tpope/vim-fugitive",
|
||||
lazy = false,
|
||||
enabled = false,
|
||||
keys = {
|
||||
{ "<leader>gg", vim.cmd.G, desc = "[G]it" },
|
||||
{ "<leader>gd", vim.cmd.Gdiffsplit, desc = "[G]it [D]iff" },
|
||||
{
|
||||
"<leader>gh",
|
||||
function()
|
||||
vim.cmd.diffget("//2")
|
||||
end,
|
||||
desc = "[G]it Select Left",
|
||||
},
|
||||
{
|
||||
"<leader>gl",
|
||||
function()
|
||||
vim.cmd.diffget("//3")
|
||||
end,
|
||||
desc = "[G]it Select Right",
|
||||
},
|
||||
{
|
||||
"<leader>gp",
|
||||
function()
|
||||
vim.cmd.Git("pull --rebase")
|
||||
end,
|
||||
desc = "[G]it [P]ull",
|
||||
},
|
||||
{
|
||||
"<leader>gP",
|
||||
function()
|
||||
vim.cmd.Git("push -u origin")
|
||||
end,
|
||||
desc = "[G]it [P]ush",
|
||||
},
|
||||
},
|
||||
}
|
||||
38
lua/plugins/inlay_hints.lua
Normal file
38
lua/plugins/inlay_hints.lua
Normal file
@ -0,0 +1,38 @@
|
||||
return {
|
||||
"simrat39/inlay-hints.nvim",
|
||||
opts = {
|
||||
hints = {
|
||||
parameter = {
|
||||
show = true,
|
||||
highlight = "Comment",
|
||||
},
|
||||
type = {
|
||||
show = true,
|
||||
highlight = "Comment",
|
||||
},
|
||||
},
|
||||
only_current_line = true,
|
||||
|
||||
eol = {
|
||||
-- whether to align to the extreme right or not
|
||||
right_align = false,
|
||||
|
||||
-- padding from the right if right_align is true
|
||||
right_align_padding = 7,
|
||||
|
||||
parameter = {
|
||||
separator = ", ",
|
||||
format = function(hints)
|
||||
return string.format(" <- (%s)", hints)
|
||||
end,
|
||||
},
|
||||
|
||||
type = {
|
||||
separator = ", ",
|
||||
format = function(hints)
|
||||
return string.format(" => (%s)", hints)
|
||||
end,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
@ -34,6 +34,9 @@ M.setup = function(lsp, capabilities)
|
||||
format = {
|
||||
enable = false,
|
||||
},
|
||||
hint = {
|
||||
enable = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
12
lua/plugins/lsp/rust.lua
Normal file
12
lua/plugins/lsp/rust.lua
Normal file
@ -0,0 +1,12 @@
|
||||
local M = {}
|
||||
|
||||
M.setup = function(lsp, capabilities)
|
||||
lsp.rust.setup({
|
||||
capabilities = capabilities,
|
||||
hint = {
|
||||
enable = true,
|
||||
},
|
||||
})
|
||||
end
|
||||
|
||||
return M
|
||||
@ -7,12 +7,13 @@ return {
|
||||
"folke/neodev.nvim",
|
||||
"nvim-telescope/telescope.nvim",
|
||||
"folke/trouble.nvim",
|
||||
"folke/neoconf.nvim",
|
||||
},
|
||||
|
||||
config = function()
|
||||
require("mason").setup()
|
||||
local lsp_capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||
local lsp = require("lspconfig")
|
||||
local lsp_capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||
|
||||
local default_setup = function(server)
|
||||
lsp[server].setup({
|
||||
@ -93,9 +94,7 @@ return {
|
||||
|
||||
vim.diagnostic.config({
|
||||
virtual_text = true, -- virtual text
|
||||
signs = {
|
||||
active = signs, -- show signs
|
||||
},
|
||||
signs = { active = signs }, -- show signs
|
||||
update_in_insert = true,
|
||||
underline = true,
|
||||
severity_sort = true,
|
||||
@ -133,6 +132,7 @@ return {
|
||||
"tailwindcss",
|
||||
"texlab",
|
||||
"tsserver",
|
||||
"rust_analyzer",
|
||||
},
|
||||
handlers = {
|
||||
default_setup,
|
||||
|
||||
43
lua/plugins/neoconf.lua
Normal file
43
lua/plugins/neoconf.lua
Normal file
@ -0,0 +1,43 @@
|
||||
return {
|
||||
"folke/neoconf.nvim",
|
||||
cmd = { "Neoconf" },
|
||||
opts = {
|
||||
-- name of the local settings files
|
||||
local_settings = ".neoconf.json",
|
||||
-- name of the global settings file in your Neovim config directory
|
||||
global_settings = "neoconf.json",
|
||||
-- import existing settings from other plugins
|
||||
import = {
|
||||
vscode = true, -- local .vscode/settings.json
|
||||
coc = true, -- global/local coc-settings.json
|
||||
nlsp = true, -- global/local nlsp-settings.nvim json settings
|
||||
},
|
||||
-- send new configuration to lsp clients when changing json settings
|
||||
live_reload = true,
|
||||
-- set the filetype to jsonc for settings files, so you can use comments
|
||||
-- make sure you have the jsonc treesitter parser installed!
|
||||
filetype_jsonc = true,
|
||||
plugins = {
|
||||
-- configures lsp clients with settings in the following order:
|
||||
-- - lua settings passed in lspconfig setup
|
||||
-- - global json settings
|
||||
-- - local json settings
|
||||
lspconfig = {
|
||||
enabled = true,
|
||||
},
|
||||
-- configures jsonls to get completion in .nvim.settings.json files
|
||||
jsonls = {
|
||||
enabled = true,
|
||||
-- only show completion in json settings for configured lsp servers
|
||||
configured_servers_only = true,
|
||||
},
|
||||
-- configures lua_ls to get completion of lspconfig server settings
|
||||
lua_ls = {
|
||||
-- by default, lua_ls annotations are only enabled in your neovim config directory
|
||||
enabled_for_neovim_config = true,
|
||||
-- explicitely enable adding annotations. Mostly relevant to put in your local .nvim.settings.json file
|
||||
enabled = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
return {
|
||||
"rest-nvim/rest.nvim",
|
||||
enabled = false,
|
||||
dependencies = { "nvim-lua/plenary.nvim" },
|
||||
opts = {
|
||||
-- Open request results in a horizontal split
|
||||
result_split_horizontal = false,
|
||||
-- Keep the http file buffer above|left when split horizontal|vertical
|
||||
result_split_in_place = false,
|
||||
-- Skip SSL verification, useful for unknown certificates
|
||||
skip_ssl_verification = false,
|
||||
-- Encode URL before making request
|
||||
encode_url = true,
|
||||
-- Highlight request on run
|
||||
highlight = {
|
||||
enabled = true,
|
||||
timeout = 150,
|
||||
},
|
||||
result = {
|
||||
-- toggle showing URL, HTTP info, headers at top the of result window
|
||||
show_url = true,
|
||||
-- show the generated curl command in case you want to launch
|
||||
-- the same request via the terminal (can be verbose)
|
||||
show_curl_command = false,
|
||||
show_http_info = true,
|
||||
show_headers = true,
|
||||
-- executables or functions for formatting response body [optional]
|
||||
-- set them to false if you want to disable them
|
||||
formatters = {
|
||||
json = "jq",
|
||||
html = function(body)
|
||||
return vim.fn.system({ "tidy", "-i", "-q", "-" }, body)
|
||||
end,
|
||||
},
|
||||
},
|
||||
-- Jump to request line on run
|
||||
jump_to_request = false,
|
||||
env_file = ".env",
|
||||
custom_dynamic_variables = {},
|
||||
yank_dry_run = true,
|
||||
},
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
return {
|
||||
"mrcjkb/rustaceanvim",
|
||||
version = "^4",
|
||||
enabled = false,
|
||||
-- TODO: configure rustaceanvim
|
||||
ft = { "rust" },
|
||||
--[[ keys = {
|
||||
{
|
||||
"",
|
||||
function()
|
||||
vim.cmd.RustLsp("codeAction")
|
||||
end,
|
||||
desc = "",
|
||||
},
|
||||
}, ]]
|
||||
}
|
||||
@ -2,7 +2,5 @@ return {
|
||||
"kylechui/nvim-surround",
|
||||
version = "*", -- Use for stability; omit to use `main` branch for the latest features
|
||||
event = "VeryLazy",
|
||||
config = function()
|
||||
require("nvim-surround").setup({})
|
||||
end,
|
||||
opts = {},
|
||||
}
|
||||
|
||||
@ -14,5 +14,20 @@ if not vim.loop.fs_stat(lazypath) then
|
||||
})
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
local opts = {
|
||||
ui = {
|
||||
-- The border to use for the UI window. Accepts same border values as |nvim_open_win()|.
|
||||
border = "rounded",
|
||||
},
|
||||
change_detection = {
|
||||
-- automatically check for config file changes and reload the ui
|
||||
enabled = false,
|
||||
notify = true, -- get a notification when changes are found
|
||||
},
|
||||
install = {
|
||||
-- try to load one of these colorschemes when starting an installation during startup
|
||||
colorscheme = { "tokyonight" },
|
||||
},
|
||||
}
|
||||
|
||||
require("lazy").setup("plugins")
|
||||
require("lazy").setup("plugins", opts)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user