updates
This commit is contained in:
parent
693fddbe6f
commit
d734377b2e
|
|
@ -28,7 +28,6 @@ ct.map('n', '<Leader>wq', '<cmd>w<CR><cmd>bd<CR>')
|
||||||
|
|
||||||
-- netrw
|
-- netrw
|
||||||
ct.map('n', '<Leader>e', '<cmd>Explore<CR>')
|
ct.map('n', '<Leader>e', '<cmd>Explore<CR>')
|
||||||
|
|
||||||
--
|
--
|
||||||
-- LSP
|
-- LSP
|
||||||
--
|
--
|
||||||
|
|
@ -78,6 +77,7 @@ ct.map('n', '<Leader>h', '<cmd>lua vim.lsp.buf.hover()<CR>')
|
||||||
--
|
--
|
||||||
-- Commands
|
-- Commands
|
||||||
--
|
--
|
||||||
|
ct.defcmd('CdMe', ':lcd %:p:h')
|
||||||
-- ct.defcmd('Xrdb', '!xrdb %')
|
-- ct.defcmd('Xrdb', '!xrdb %')
|
||||||
-- ct.defcmd('ExTerm', '!' .. defs.external_term .. '&<CR><CR>')
|
-- ct.defcmd('ExTerm', '!' .. defs.external_term .. '&<CR><CR>')
|
||||||
-- ct.defcmd('ExFileMgr', '!' .. defs.external_filemgr .. '. &<CR><CR>')
|
-- ct.defcmd('ExFileMgr', '!' .. defs.external_filemgr .. '. &<CR><CR>')
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ vim.opt.autowrite = true
|
||||||
vim.opt.foldmethod = "indent"
|
vim.opt.foldmethod = "indent"
|
||||||
vim.opt.foldlevelstart = 99
|
vim.opt.foldlevelstart = 99
|
||||||
-- auto cd to the current file's location
|
-- auto cd to the current file's location
|
||||||
vim.cmd('autocmd BufEnter * silent! lcd %:p:h')
|
-- vim.cmd('autocmd BufEnter * silent! lcd %:p:h')
|
||||||
-- highlighting for other langs in markdown docs
|
-- highlighting for other langs in markdown docs
|
||||||
vim.g.markdown_fenced_languages = {'html', 'vim', 'python', 'c', 'bash=sh'}
|
vim.g.markdown_fenced_languages = {'html', 'vim', 'python', 'c', 'bash=sh'}
|
||||||
-- auto close delimiters (eg. parentheses, brackets)
|
-- auto close delimiters (eg. parentheses, brackets)
|
||||||
|
|
|
||||||
|
|
@ -97,23 +97,23 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
-- {
|
||||||
"tzachar/cmp-ai",
|
-- "tzachar/cmp-ai",
|
||||||
dependencies = "nvim-lua/plenary.nvim",
|
-- dependencies = "nvim-lua/plenary.nvim",
|
||||||
config = function()
|
-- config = function()
|
||||||
local cmp_ai = require("cmp_ai.config")
|
-- local cmp_ai = require("cmp_ai.config")
|
||||||
|
--
|
||||||
cmp_ai:setup({
|
-- cmp_ai:setup({
|
||||||
max_lines = 1000,
|
-- max_lines = 1000,
|
||||||
provider = "Ollama", -- Change to 'Ollama', 'HF', etc. as needed
|
-- provider = "Ollama", -- Change to 'Ollama', 'HF', etc. as needed
|
||||||
provider_options = {
|
-- provider_options = {
|
||||||
model = "qwen2.5-coder:latest",
|
-- model = "qwen2.5-coder:latest",
|
||||||
},
|
-- },
|
||||||
notify = true,
|
-- notify = true,
|
||||||
run_on_every_keystroke = true,
|
-- run_on_every_keystroke = true,
|
||||||
})
|
-- })
|
||||||
end,
|
-- end,
|
||||||
},
|
-- },
|
||||||
{
|
{
|
||||||
"hrsh7th/nvim-cmp",
|
"hrsh7th/nvim-cmp",
|
||||||
event = { "InsertEnter", "CmdlineEnter" },
|
event = { "InsertEnter", "CmdlineEnter" },
|
||||||
|
|
@ -125,7 +125,7 @@ return {
|
||||||
"hrsh7th/cmp-nvim-lsp-document-symbol",
|
"hrsh7th/cmp-nvim-lsp-document-symbol",
|
||||||
"hrsh7th/cmp-cmdline",
|
"hrsh7th/cmp-cmdline",
|
||||||
"amarz45/nvim-cmp-fonts",
|
"amarz45/nvim-cmp-fonts",
|
||||||
"tzachar/cmp-ai",
|
-- "tzachar/cmp-ai",
|
||||||
"garymjr/nvim-snippets", -- Ensure the snippet source is loaded
|
"garymjr/nvim-snippets", -- Ensure the snippet source is loaded
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
|
|
@ -147,13 +147,13 @@ return {
|
||||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
["<C-Space>"] = cmp.mapping.complete(),
|
||||||
["<C-e>"] = cmp.mapping.abort(),
|
["<C-e>"] = cmp.mapping.abort(),
|
||||||
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
["<Right>"] = cmp.mapping.confirm({ select = true }),
|
||||||
}),
|
}),
|
||||||
sources = cmp.config.sources({
|
sources = cmp.config.sources({
|
||||||
{ name = "nvim_lsp" },
|
{ name = "nvim_lsp" },
|
||||||
{ name = "snippets" }, -- This comes from nvim-snippets
|
{ name = "snippets" }, -- This comes from nvim-snippets
|
||||||
{ name = "nvim_lsp_signature_help" },
|
{ name = "nvim_lsp_signature_help" },
|
||||||
{ name = "cmp_ai" },
|
-- { name = "cmp_ai" },
|
||||||
}, {
|
}, {
|
||||||
{ name = "buffer" },
|
{ name = "buffer" },
|
||||||
{ name = "path" },
|
{ name = "path" },
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,16 @@ return {
|
||||||
'wuelnerdotexe/vim-enfocado',
|
'wuelnerdotexe/vim-enfocado',
|
||||||
lazy = false,
|
lazy = false,
|
||||||
config = function()
|
config = function()
|
||||||
vim.g.enfocad_style = 'nature'
|
vim.g.enfocado_style = 'nature'
|
||||||
vim.cmd 'colo enfocado'
|
vim.cmd 'colo enfocado'
|
||||||
|
vim.cmd [[highlight Normal ctermbg=NONE guibg=NONE]]
|
||||||
|
|
||||||
|
|
||||||
|
local ct = require('conftool')
|
||||||
|
ct.augroup('templates', {
|
||||||
|
'ColorScheme', 'enfocado',
|
||||||
|
'highlight', 'Normal', 'ctermbg=NONE', 'guibg=NONE'
|
||||||
|
})
|
||||||
end,
|
end,
|
||||||
keys = {
|
keys = {
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -35,5 +35,6 @@ vim.api.nvim_create_autocmd({'BufEnter'}, {
|
||||||
callback = function(ev) ct.set 'wrap' end,
|
callback = function(ev) ct.set 'wrap' end,
|
||||||
desc = 'set wrap text',
|
desc = 'set wrap text',
|
||||||
})
|
})
|
||||||
|
|
||||||
-- turn on mouse
|
-- turn on mouse
|
||||||
vim.opt.mouse = 'a'
|
vim.opt.mouse = 'a'
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue