updates
This commit is contained in:
parent
9b1e5c7069
commit
13b27243ea
|
|
@ -19,16 +19,19 @@ ct.map('n', '<C-M-f>', ':!' .. defs.external_filemgr .. ' . &<CR><CR>')
|
|||
ct.map('n', '<Leader>s', ':set spell!<CR>')
|
||||
|
||||
-- Buffer Navigation
|
||||
ct.map('n', '<Leader>w', ':bnext<CR>')
|
||||
ct.map('n', '<Leader>W', ':bprevious<CR>')
|
||||
ct.map('n', '<Leader>w', '<cmd>bnext<CR>')
|
||||
ct.map('n', '<Leader>W', '<cmd>bprevious<CR>')
|
||||
|
||||
-- close buffer
|
||||
ct.map('n', '<Leader>q', ':bd<CR>')
|
||||
ct.map('n', '<Leader>wq', '<cmd>w<CR><cmd>bd<CR>')
|
||||
|
||||
-- netrw
|
||||
ct.map('n', '<Leader>e', '<cmd>Explore<CR>')
|
||||
|
||||
--
|
||||
-- Commands
|
||||
--
|
||||
-- ct.defcmd('Xrdb', '!xrdb %')
|
||||
ct.defcmd('ExTerm', '!' .. defs.external_term .. '&<CR><CR>')
|
||||
ct.defcmd('ExFileMgr', '!' .. defs.external_filemgr .. '. &<CR><CR>')
|
||||
-- ct.defcmd('ExTerm', '!' .. defs.external_term .. '&<CR><CR>')
|
||||
-- ct.defcmd('ExFileMgr', '!' .. defs.external_filemgr .. '. &<CR><CR>')
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
return {
|
||||
{
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
build = ':TSUpdate',
|
||||
-- build = ':TSUpdate',
|
||||
event = { "VeryLazy" },
|
||||
lazy = vim.fn.argc(-1) == 0,
|
||||
opts = {
|
||||
|
|
@ -19,6 +19,7 @@ return {
|
|||
"json",
|
||||
"latex",
|
||||
"lua",
|
||||
"php",
|
||||
"python",
|
||||
"typescript",
|
||||
"tsx",
|
||||
|
|
@ -102,13 +103,14 @@ return {
|
|||
},
|
||||
},
|
||||
keys = {
|
||||
{'<Leader>e', ':AerialToggle<LF>'},
|
||||
{'<Leader>o', ':AerialToggle<LF>'},
|
||||
}
|
||||
},
|
||||
|
||||
-- Language Server Installer
|
||||
{
|
||||
'williamboman/mason.nvim',
|
||||
lazy = false,
|
||||
cmd = {
|
||||
"Mason",
|
||||
"MasonInstall",
|
||||
|
|
@ -132,7 +134,7 @@ return {
|
|||
vim.diagnostic.config({ virtual_text = false })
|
||||
end
|
||||
},
|
||||
--[[{
|
||||
{
|
||||
'huggingface/llm.nvim',
|
||||
opts = {
|
||||
model = 'qwen2.5-coder:7b',
|
||||
|
|
@ -142,16 +144,16 @@ return {
|
|||
bin_path = vim.api.nvim_call_function("stdpath", { "data" }) .. "/mason/bin/llm-ls",
|
||||
}
|
||||
},
|
||||
},]]--
|
||||
},
|
||||
{
|
||||
'mason-org/mason-lspconfig.nvim',
|
||||
dependencies = {
|
||||
'williamboman/mason.nvim',
|
||||
'ms-jpq/coq_nvim',
|
||||
'nanotee/nvim-lsp-basics',
|
||||
'neovim/nvim-lspconfig',
|
||||
-- 'huggingface/llm.nvim',
|
||||
'stevearc/aerial.nvim',
|
||||
'williamboman/mason.nvim',
|
||||
},
|
||||
opts = {
|
||||
ensure_installed = {
|
||||
|
|
@ -161,6 +163,7 @@ return {
|
|||
"html",
|
||||
"jsonls",
|
||||
"lua_ls",
|
||||
"phpactor",
|
||||
"pyright",
|
||||
"texlab",
|
||||
"ts_ls"
|
||||
|
|
@ -178,6 +181,7 @@ return {
|
|||
"javascriptreact",
|
||||
"json",
|
||||
"lua",
|
||||
"php",
|
||||
"python",
|
||||
"tex",
|
||||
"typescript",
|
||||
|
|
@ -237,44 +241,44 @@ return {
|
|||
--
|
||||
-- Misc
|
||||
--
|
||||
{
|
||||
"rest-nvim/rest.nvim",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-treesitter/nvim-treesitter"
|
||||
},
|
||||
ft = { "http" },
|
||||
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 = true,
|
||||
result = {
|
||||
show_curl_command = false,
|
||||
},
|
||||
},
|
||||
keys = {
|
||||
{'<Leader>r', ':hor Rest run<CR>'},
|
||||
},
|
||||
-- {
|
||||
-- "rest-nvim/rest.nvim",
|
||||
-- dependencies = {
|
||||
-- "nvim-lua/plenary.nvim",
|
||||
-- "nvim-treesitter/nvim-treesitter"
|
||||
-- },
|
||||
-- ft = { "http" },
|
||||
-- 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 = true,
|
||||
-- result = {
|
||||
-- show_curl_command = false,
|
||||
-- },
|
||||
-- },
|
||||
-- keys = {
|
||||
-- {'<Leader>r', ':hor Rest run<CR>'},
|
||||
-- },
|
||||
|
||||
--[[ opts = function (_, opts)
|
||||
opts.ensure_installed = opts.ensure_installed or {}
|
||||
table.insert(opts.ensure_installed, "http")
|
||||
table.insert(opts.result_split_horizontal, true)
|
||||
table.insert(opts.result_split_in_place, true)
|
||||
end, ]]--
|
||||
--[[ keys = {
|
||||
{'<Leader>r', '<Plug>RestNvim<CR>'},
|
||||
{'<Leader>R', '<Plug>RestNvimLast<CR>'},
|
||||
{'<Leader><A-r>', '<Plug>RestNvimPreview<CR>'},
|
||||
},
|
||||
config = function()
|
||||
-- commands
|
||||
local ct = require('conftool')
|
||||
ct.defcmd('RestNvim', 'lua require(\'rest-nvim\').run()<CR>')
|
||||
ct.defcmd('RestNvimPreview', 'lua require(\'rest-nvim\').run(true)<CR>')
|
||||
ct.defcmd('RestNvimLast', 'lua require(\'rest-nvim\').last()<CR>')
|
||||
end, ]]--
|
||||
},
|
||||
-- --[[ opts = function (_, opts)
|
||||
-- opts.ensure_installed = opts.ensure_installed or {}
|
||||
-- table.insert(opts.ensure_installed, "http")
|
||||
-- table.insert(opts.result_split_horizontal, true)
|
||||
-- table.insert(opts.result_split_in_place, true)
|
||||
-- end, ]]--
|
||||
-- --[[ keys = {
|
||||
-- {'<Leader>r', '<Plug>RestNvim<CR>'},
|
||||
-- {'<Leader>R', '<Plug>RestNvimLast<CR>'},
|
||||
-- {'<Leader><A-r>', '<Plug>RestNvimPreview<CR>'},
|
||||
-- },
|
||||
-- config = function()
|
||||
-- -- commands
|
||||
-- local ct = require('conftool')
|
||||
-- ct.defcmd('RestNvim', 'lua require(\'rest-nvim\').run()<CR>')
|
||||
-- ct.defcmd('RestNvimPreview', 'lua require(\'rest-nvim\').run(true)<CR>')
|
||||
-- ct.defcmd('RestNvimLast', 'lua require(\'rest-nvim\').last()<CR>')
|
||||
-- end, ]]--
|
||||
-- },
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,9 @@
|
|||
return {
|
||||
--
|
||||
-- Theme
|
||||
--
|
||||
{
|
||||
'wuelnerdotexe/vim-enfocado',
|
||||
lazy = false,
|
||||
config = function()
|
||||
vim.o.background = 'light'
|
||||
vim.g.enfocad_style = 'nature'
|
||||
vim.cmd 'colo enfocado'
|
||||
end,
|
||||
|
|
@ -40,9 +37,7 @@ return {
|
|||
-- require('onedark').load()
|
||||
-- end,
|
||||
|
||||
--
|
||||
-- Indentation
|
||||
--
|
||||
{
|
||||
'nathanaelkane/vim-indent-guides',
|
||||
lazy = false,
|
||||
|
|
@ -53,19 +48,19 @@ return {
|
|||
vim.g.indent_guides_enable_on_vim_startup = 1
|
||||
end
|
||||
},
|
||||
--
|
||||
|
||||
-- Delimiters
|
||||
--
|
||||
{
|
||||
'hiphish/rainbow-delimiters.nvim',
|
||||
lazy = false,
|
||||
},
|
||||
|
||||
--
|
||||
-- Buffer tabs
|
||||
-- { 'ap/vim-buftabline', lazy = false },
|
||||
|
||||
-- Neovim Qt
|
||||
--
|
||||
{
|
||||
'equalsraf/neovim-gui-shim',
|
||||
lazy = false,
|
||||
},
|
||||
-- {
|
||||
-- 'equalsraf/neovim-gui-shim',
|
||||
-- lazy = false,
|
||||
-- },
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,5 +31,9 @@ ct.set(
|
|||
|
||||
-- dont show line number in terminal window
|
||||
vim.cmd('autocmd TermOpen * setlocal nonu')
|
||||
vim.api.nvim_create_autocmd({'BufEnter'}, {
|
||||
callback = function(ev) ct.set 'wrap' end,
|
||||
desc = 'set wrap text',
|
||||
})
|
||||
-- turn on mouse
|
||||
vim.opt.mouse = 'a'
|
||||
|
|
|
|||
Loading…
Reference in New Issue