This commit is contained in:
Ian Griffin 2025-07-18 22:03:45 +07:00
parent 9b1e5c7069
commit 13b27243ea
4 changed files with 67 additions and 61 deletions

View File

@ -19,16 +19,19 @@ ct.map('n', '<C-M-f>', ':!' .. defs.external_filemgr .. ' . &<CR><CR>')
ct.map('n', '<Leader>s', ':set spell!<CR>') ct.map('n', '<Leader>s', ':set spell!<CR>')
-- Buffer Navigation -- Buffer Navigation
ct.map('n', '<Leader>w', ':bnext<CR>') ct.map('n', '<Leader>w', '<cmd>bnext<CR>')
ct.map('n', '<Leader>W', ':bprevious<CR>') ct.map('n', '<Leader>W', '<cmd>bprevious<CR>')
-- close buffer -- close buffer
ct.map('n', '<Leader>q', ':bd<CR>') ct.map('n', '<Leader>q', ':bd<CR>')
ct.map('n', '<Leader>wq', '<cmd>w<CR><cmd>bd<CR>') ct.map('n', '<Leader>wq', '<cmd>w<CR><cmd>bd<CR>')
-- netrw
ct.map('n', '<Leader>e', '<cmd>Explore<CR>')
-- --
-- Commands -- Commands
-- --
-- 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>')

View File

@ -1,7 +1,7 @@
return { return {
{ {
'nvim-treesitter/nvim-treesitter', 'nvim-treesitter/nvim-treesitter',
build = ':TSUpdate', -- build = ':TSUpdate',
event = { "VeryLazy" }, event = { "VeryLazy" },
lazy = vim.fn.argc(-1) == 0, lazy = vim.fn.argc(-1) == 0,
opts = { opts = {
@ -19,6 +19,7 @@ return {
"json", "json",
"latex", "latex",
"lua", "lua",
"php",
"python", "python",
"typescript", "typescript",
"tsx", "tsx",
@ -102,13 +103,14 @@ return {
}, },
}, },
keys = { keys = {
{'<Leader>e', ':AerialToggle<LF>'}, {'<Leader>o', ':AerialToggle<LF>'},
} }
}, },
-- Language Server Installer -- Language Server Installer
{ {
'williamboman/mason.nvim', 'williamboman/mason.nvim',
lazy = false,
cmd = { cmd = {
"Mason", "Mason",
"MasonInstall", "MasonInstall",
@ -132,7 +134,7 @@ return {
vim.diagnostic.config({ virtual_text = false }) vim.diagnostic.config({ virtual_text = false })
end end
}, },
--[[{ {
'huggingface/llm.nvim', 'huggingface/llm.nvim',
opts = { opts = {
model = 'qwen2.5-coder:7b', model = 'qwen2.5-coder:7b',
@ -142,16 +144,16 @@ return {
bin_path = vim.api.nvim_call_function("stdpath", { "data" }) .. "/mason/bin/llm-ls", bin_path = vim.api.nvim_call_function("stdpath", { "data" }) .. "/mason/bin/llm-ls",
} }
}, },
},]]-- },
{ {
'mason-org/mason-lspconfig.nvim', 'mason-org/mason-lspconfig.nvim',
dependencies = { dependencies = {
'williamboman/mason.nvim',
'ms-jpq/coq_nvim', 'ms-jpq/coq_nvim',
'nanotee/nvim-lsp-basics', 'nanotee/nvim-lsp-basics',
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
-- 'huggingface/llm.nvim', -- 'huggingface/llm.nvim',
'stevearc/aerial.nvim', 'stevearc/aerial.nvim',
'williamboman/mason.nvim',
}, },
opts = { opts = {
ensure_installed = { ensure_installed = {
@ -161,6 +163,7 @@ return {
"html", "html",
"jsonls", "jsonls",
"lua_ls", "lua_ls",
"phpactor",
"pyright", "pyright",
"texlab", "texlab",
"ts_ls" "ts_ls"
@ -178,6 +181,7 @@ return {
"javascriptreact", "javascriptreact",
"json", "json",
"lua", "lua",
"php",
"python", "python",
"tex", "tex",
"typescript", "typescript",
@ -237,44 +241,44 @@ return {
-- --
-- Misc -- Misc
-- --
{ -- {
"rest-nvim/rest.nvim", -- "rest-nvim/rest.nvim",
dependencies = { -- dependencies = {
"nvim-lua/plenary.nvim", -- "nvim-lua/plenary.nvim",
"nvim-treesitter/nvim-treesitter" -- "nvim-treesitter/nvim-treesitter"
}, -- },
ft = { "http" }, -- ft = { "http" },
opts = { -- opts = {
-- Open request results in a horizontal split -- -- Open request results in a horizontal split
result_split_horizontal = false, -- result_split_horizontal = false,
-- Keep the http file buffer above|left when split horizontal|vertical -- -- Keep the http file buffer above|left when split horizontal|vertical
-- -- --
result_split_in_place = true, -- result_split_in_place = true,
result = { -- result = {
show_curl_command = false, -- show_curl_command = false,
}, -- },
}, -- },
keys = { -- keys = {
{'<Leader>r', ':hor Rest run<CR>'}, -- {'<Leader>r', ':hor Rest run<CR>'},
}, -- },
--[[ opts = function (_, opts) -- --[[ opts = function (_, opts)
opts.ensure_installed = opts.ensure_installed or {} -- opts.ensure_installed = opts.ensure_installed or {}
table.insert(opts.ensure_installed, "http") -- table.insert(opts.ensure_installed, "http")
table.insert(opts.result_split_horizontal, true) -- table.insert(opts.result_split_horizontal, true)
table.insert(opts.result_split_in_place, true) -- table.insert(opts.result_split_in_place, true)
end, ]]-- -- end, ]]--
--[[ keys = { -- --[[ keys = {
{'<Leader>r', '<Plug>RestNvim<CR>'}, -- {'<Leader>r', '<Plug>RestNvim<CR>'},
{'<Leader>R', '<Plug>RestNvimLast<CR>'}, -- {'<Leader>R', '<Plug>RestNvimLast<CR>'},
{'<Leader><A-r>', '<Plug>RestNvimPreview<CR>'}, -- {'<Leader><A-r>', '<Plug>RestNvimPreview<CR>'},
}, -- },
config = function() -- config = function()
-- commands -- -- commands
local ct = require('conftool') -- local ct = require('conftool')
ct.defcmd('RestNvim', 'lua require(\'rest-nvim\').run()<CR>') -- ct.defcmd('RestNvim', 'lua require(\'rest-nvim\').run()<CR>')
ct.defcmd('RestNvimPreview', 'lua require(\'rest-nvim\').run(true)<CR>') -- ct.defcmd('RestNvimPreview', 'lua require(\'rest-nvim\').run(true)<CR>')
ct.defcmd('RestNvimLast', 'lua require(\'rest-nvim\').last()<CR>') -- ct.defcmd('RestNvimLast', 'lua require(\'rest-nvim\').last()<CR>')
end, ]]-- -- end, ]]--
}, -- },
} }

View File

@ -1,12 +1,9 @@
return { return {
--
-- Theme -- Theme
--
{ {
'wuelnerdotexe/vim-enfocado', 'wuelnerdotexe/vim-enfocado',
lazy = false, lazy = false,
config = function() config = function()
vim.o.background = 'light'
vim.g.enfocad_style = 'nature' vim.g.enfocad_style = 'nature'
vim.cmd 'colo enfocado' vim.cmd 'colo enfocado'
end, end,
@ -40,9 +37,7 @@ return {
-- require('onedark').load() -- require('onedark').load()
-- end, -- end,
--
-- Indentation -- Indentation
--
{ {
'nathanaelkane/vim-indent-guides', 'nathanaelkane/vim-indent-guides',
lazy = false, lazy = false,
@ -53,19 +48,19 @@ return {
vim.g.indent_guides_enable_on_vim_startup = 1 vim.g.indent_guides_enable_on_vim_startup = 1
end end
}, },
--
-- Delimiters -- Delimiters
--
{ {
'hiphish/rainbow-delimiters.nvim', 'hiphish/rainbow-delimiters.nvim',
lazy = false, lazy = false,
}, },
-- -- Buffer tabs
-- { 'ap/vim-buftabline', lazy = false },
-- Neovim Qt -- Neovim Qt
-- -- {
{ -- 'equalsraf/neovim-gui-shim',
'equalsraf/neovim-gui-shim', -- lazy = false,
lazy = false, -- },
},
} }

View File

@ -31,5 +31,9 @@ ct.set(
-- dont show line number in terminal window -- dont show line number in terminal window
vim.cmd('autocmd TermOpen * setlocal nonu') 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 -- turn on mouse
vim.opt.mouse = 'a' vim.opt.mouse = 'a'