Compare commits
2
Commits
master
...
d6914cdad1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d6914cdad1 | ||
|
|
680f5e07f7 |
@@ -48,7 +48,8 @@ vim.cmd [=[
|
|||||||
nnoremap ,rl :checktime<CR>
|
nnoremap ,rl :checktime<CR>
|
||||||
nnoremap ,m :wa<CR>:make<CR>
|
nnoremap ,m :wa<CR>:make<CR>
|
||||||
nnoremap <silent> <Esc> :noh<CR><Esc>
|
nnoremap <silent> <Esc> :noh<CR><Esc>
|
||||||
inoremap <c-k> <c-x>
|
inoremap <c-o> <c-x><c-o>
|
||||||
|
inoremap <c-f> <c-x><c-f>
|
||||||
|
|
||||||
nnoremap ,cD :call setqflist(filter(getqflist(), 'v:val != getqflist()[getqflist({"idx": 0}).idx - 1]'))<CR>
|
nnoremap ,cD :call setqflist(filter(getqflist(), 'v:val != getqflist()[getqflist({"idx": 0}).idx - 1]'))<CR>
|
||||||
|
|
||||||
@@ -594,6 +595,9 @@ require'lazy'.setup{ --{{{1
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
require'mason-lspconfig'.setup()
|
require'mason-lspconfig'.setup()
|
||||||
|
vim.opt.completeopt = { 'menu', 'popup', 'preview', 'fuzzy' }
|
||||||
|
|
||||||
|
|
||||||
vim.lsp.config.zls = {
|
vim.lsp.config.zls = {
|
||||||
before_init = function(_, _)
|
before_init = function(_, _)
|
||||||
vim.g.zig_fmt_autosave = false -- may not be needed anymore?
|
vim.g.zig_fmt_autosave = false -- may not be needed anymore?
|
||||||
@@ -793,37 +797,6 @@ require'lazy'.setup{ --{{{1
|
|||||||
]]
|
]]
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
{ 'hrsh7th/nvim-cmp', --{{{2
|
|
||||||
dependencies = {
|
|
||||||
'hrsh7th/cmp-nvim-lsp',
|
|
||||||
'hrsh7th/cmp-path',
|
|
||||||
'dcampos/nvim-snippy',
|
|
||||||
'dcampos/cmp-snippy',
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
local cmp = require'cmp'
|
|
||||||
cmp.setup{
|
|
||||||
snippet = {
|
|
||||||
expand = function(args)
|
|
||||||
require'snippy'.expand_snippet(args.body)
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
mapping = {
|
|
||||||
['<C-y>'] = cmp.mapping.confirm{ select = true },
|
|
||||||
['<C-n>'] = cmp.mapping.select_next_item(),
|
|
||||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
|
||||||
},
|
|
||||||
sources = cmp.config.sources(
|
|
||||||
{
|
|
||||||
{ name = 'snippy', priority = 100000000000000000000 },
|
|
||||||
{ name = 'nvim_lsp', priority = 1000000000},
|
|
||||||
{ name = 'path', priority = 1},
|
|
||||||
}
|
|
||||||
),
|
|
||||||
preselect = cmp.PreselectMode.None,
|
|
||||||
}
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{ 'nvim-telescope/telescope.nvim', --{{{2
|
{ 'nvim-telescope/telescope.nvim', --{{{2
|
||||||
tag = 'v0.2.2',
|
tag = 'v0.2.2',
|
||||||
dependencies = {
|
dependencies = {
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
{
|
{
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
|
|
||||||
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
|
|
||||||
"cmp-snippy": { "branch": "master", "commit": "6e39210aa3a74e2bf6462f492eaf0d436cd2b7d3" },
|
|
||||||
"everforest": { "branch": "master", "commit": "85a86eb62409e3ec88713bff3d1b9d7374e112e4" },
|
"everforest": { "branch": "master", "commit": "85a86eb62409e3ec88713bff3d1b9d7374e112e4" },
|
||||||
"git-blame.nvim": { "branch": "main", "commit": "5c536e2d4134d064aa3f41575280bc8a2a0e03d7" },
|
"git-blame.nvim": { "branch": "main", "commit": "5c536e2d4134d064aa3f41575280bc8a2a0e03d7" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
||||||
@@ -9,12 +6,11 @@
|
|||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "40276c4df7e6bdce6801d6c035c6227f9115a855" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "40276c4df7e6bdce6801d6c035c6227f9115a855" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" },
|
"mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" },
|
||||||
"mini.align": { "branch": "main", "commit": "77d7446b9f2452193f13ced9fb73a8b3aa4a4f4d" },
|
"mini.align": { "branch": "main", "commit": "77d7446b9f2452193f13ced9fb73a8b3aa4a4f4d" },
|
||||||
"nvim-cmp": { "branch": "main", "commit": "2ffe79f1f021def8dd1fcd81deb16f1bb0d989f3" },
|
"nvim-dap": { "branch": "master", "commit": "c9a0738e45f1bd41d792a126941348dce661cf9b" },
|
||||||
"nvim-dap": { "branch": "master", "commit": "9e848e09a697ee95302a3ef2dd43fd6eb709e570" },
|
|
||||||
"nvim-dap-cs": { "branch": "main", "commit": "16e5debe8cb7fb73c8799d20969ee00883586602" },
|
"nvim-dap-cs": { "branch": "main", "commit": "16e5debe8cb7fb73c8799d20969ee00883586602" },
|
||||||
"nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" },
|
"nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" },
|
||||||
"nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" },
|
"nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "ee1e369181a9e64904cdd7b739e98c70778cfc71" },
|
"nvim-lspconfig": { "branch": "master", "commit": "85e732c62ac59ab7c12df71ddd020baa87948390" },
|
||||||
"nvim-snippy": { "branch": "master", "commit": "1f5a5c82cb4902522806a58cf25479f6f8fe16ac" },
|
"nvim-snippy": { "branch": "master", "commit": "1f5a5c82cb4902522806a58cf25479f6f8fe16ac" },
|
||||||
"nvim-surround": { "branch": "main", "commit": "2e93e154de9ff326def6480a4358bfc149d5da2c" },
|
"nvim-surround": { "branch": "main", "commit": "2e93e154de9ff326def6480a4358bfc149d5da2c" },
|
||||||
"oil.nvim": { "branch": "master", "commit": "b73018b75affd13fa38e2fc94ef753b465f770d7" },
|
"oil.nvim": { "branch": "master", "commit": "b73018b75affd13fa38e2fc94ef753b465f770d7" },
|
||||||
|
|||||||
Reference in New Issue
Block a user