iang
/
neovim-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated

This commit is contained in:
Ian Griffin 2025-06-07 14:39:08 +08:00
parent d25bf6d7b1
commit 9b1e5c7069
5 changed files with 92 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lua/binds.lua
View File

@ -8,27 +8,27 @@ local defs = require('defs')
-- Maps
--
-- select all
ct.map('n', '<Leader>a', '<esc>ggVG<LF>')
ct.map('n', '<Leader>a', '<esc>ggVG<CR>')
--[[
-- spawn terminal
ct.map('n', '<C-M-t>', ':!' .. defs.external_term .. ' . &<LF><LF>')
ct.map('n', '<C-M-t>', ':!' .. defs.external_term .. ' . &<CR><CR>')
-- spwan file manager
ct.map('n', '<C-M-f>', ':!' .. defs.external_filemgr .. ' . &<LF><LF>')
ct.map('n', '<C-M-f>', ':!' .. defs.external_filemgr .. ' . &<CR><CR>')
]]
-- spellchecking
ct.map('n', '<Leader>s', ':set spell!<LF>')
ct.map('n', '<Leader>s', ':set spell!<CR>')
-- Buffer Navigation
ct.map('n', '<Leader>w', ':bnext<LF>')
ct.map('n', '<Leader>W', ':bprevious<LF>')
ct.map('n', '<Leader>w', ':bnext<CR>')
ct.map('n', '<Leader>W', ':bprevious<CR>')
-- close buffer
ct.map('n', '<Leader>q', ':bd<LF>')
ct.map('n', '<Leader>wq', '<cmd>w<LF><cmd>bd<LF>')
ct.map('n', '<Leader>q', ':bd<CR>')
ct.map('n', '<Leader>wq', '<cmd>w<CR><cmd>bd<CR>')
--
-- Commands
--
-- ct.defcmd('Xrdb', '!xrdb %')
ct.defcmd('ExTerm', '!' .. defs.external_term .. '&<LF><LF>')
ct.defcmd('ExFileMgr', '!' .. defs.external_filemgr .. '. &<LF><LF>')
ct.defcmd('ExTerm', '!' .. defs.external_term .. '&<CR><CR>')
ct.defcmd('ExFileMgr', '!' .. defs.external_filemgr .. '. &<CR><CR>')

2
lua/misc.lua
View File

@ -33,7 +33,7 @@ ct.set({'spellsuggest', {'best', 5}})
--
vim.g.netrw_liststyle = 3 -- tree style display
vim.g.netrw_banner = 0 -- no banner needed
vim.g.netrw_browse_split = 4
vim.g.netrw_browse_split = 0
-- vim.g.netrw_chgwin = 1
--

125
lua/plugins/10_ide.lua
View File

@ -43,12 +43,13 @@ return {
dependencies = { 'ms-jpq/coq.artifacts' },
branch = 'coq',
build = ':COQdeps',
event = { "VimEnter" },
event = { "BufEnter" },
config = function()
vim.cmd([[autocmd VimEnter * COQnow -s]])
end
},
--
-- Language Configurations
--
{ 'ap/vim-css-color', lazy = false },
@ -93,9 +94,11 @@ return {
{
'stevearc/aerial.nvim',
opts = {
backends = { 'lsp', 'markdown', 'man' },
close_on_select = true,
-- backends = { 'lsp', 'markdown', 'man' },
layout = {
min_width = 25
-- default_direction = 'prefer_right',
min_width = 25,
},
},
keys = {
@ -129,57 +132,24 @@ return {
vim.diagnostic.config({ virtual_text = false })
end
},
-- {
-- 'hrsh7th/cmp-nvim-lsp',
-- dependencies = {
-- 'hrsh7th/nvim-cmp',
-- }
-- },
-- {
-- 'jacob411/Ollama-Copilot',
-- dependencies = {
-- 'hrsh7th/cmp-nvim-lsp',
-- },
-- opts = {
-- model_name = "qwen2.5-coder:14b",
-- stream_suggestion = false,
-- python_command = "python3",
-- filetypes = {
-- "bash",
-- "c",
-- "cpp",
-- "cs",
-- "dart",
-- "go",
-- "html",
-- "javascript",
-- "javascriptreact",
-- "json",
-- "lua",
-- "python",
-- "tex",
-- "typescript",
-- "typescriptreact",
-- },
-- ollama_model_opts = {
-- num_predict = 40,
-- temperature = 0.1,
-- },
-- keymaps = {
-- suggestion = '<leader>os',
-- reject = '<leader>or',
-- insert_accept = '<Leader><Tab>',
-- },
-- },
-- },
--[[{
'huggingface/llm.nvim',
opts = {
model = 'qwen2.5-coder:7b',
backend = 'ollama',
url = 'http://localhost:11434',
lsp = {
bin_path = vim.api.nvim_call_function("stdpath", { "data" }) .. "/mason/bin/llm-ls",
}
},
},]]--
{
'williamboman/mason-lspconfig.nvim',
'mason-org/mason-lspconfig.nvim',
dependencies = {
'ms-jpq/coq_nvim',
'nanotee/nvim-lsp-basics',
-- 'jacob411/Ollama-Copilot',
'neovim/nvim-lspconfig',
-- 'huggingface/llm.nvim',
'stevearc/aerial.nvim',
'williamboman/mason.nvim',
},
@ -187,14 +157,13 @@ return {
ensure_installed = {
"bashls",
"clangd",
"ast_grep",
"gopls",
"html",
"jsonls",
"lua_ls",
"pyright",
"texlab",
"tsserver"
"ts_ls"
},
},
ft = {
@ -214,23 +183,23 @@ return {
"typescript",
"typescriptreact",
},
config = function()
local masonlsp = require 'mason-lspconfig'
--[[
masonlsp.setup
--]]
masonlsp.setup_handlers {
function(server_name)
require('lspconfig')[server_name].setup(require('coq').lsp_ensure_capabilities {
on_attach = function(client, bufnr)
local basics = require('lsp_basics')
basics.make_lsp_commands(client, bufnr)
basics.make_lsp_mappings(client, bufnr)
end
})
end
}
end
-- config = function()
-- local masonlsp = require 'mason-lspconfig'
-- --[[
-- masonlsp.setup
-- --]]
-- masonlsp.setup_handlers {
-- function(server_name)
-- require('lspconfig')[server_name].setup(require('coq').lsp_ensure_capabilities {
-- on_attach = function(client, bufnr)
-- local basics = require('lsp_basics')
-- basics.make_lsp_commands(client, bufnr)
-- basics.make_lsp_mappings(client, bufnr)
-- end
-- })
-- end
-- }
-- end,
},
-- Show code diagnostics in a separate buffer window
@ -270,10 +239,14 @@ return {
--
{
"rest-nvim/rest.nvim",
dependencies = { "nvim-lua/plenary.nvim" },
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-treesitter/nvim-treesitter"
},
ft = { "http" },
opts = {
-- Open request results in a horizontal split
result_split_horizontal = true,
result_split_horizontal = false,
-- Keep the http file buffer above|left when split horizontal|vertical
--
result_split_in_place = true,
@ -282,6 +255,16 @@ return {
},
},
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>'},
@ -292,6 +275,6 @@ return {
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,
end, ]]--
},
}

44
lua/plugins/50_ui.lua
View File

@ -2,6 +2,32 @@ return {
--
-- Theme
--
{
'wuelnerdotexe/vim-enfocado',
lazy = false,
config = function()
vim.o.background = 'light'
vim.g.enfocad_style = 'nature'
vim.cmd 'colo enfocado'
end,
keys = {
{
'<Leader>c',
function()
if vim.o.background == 'light' then
vim.o.background = 'dark'
else
vim.o.background = 'light'
-- vim.api.nvim_set_hl(0, 'ColorColumn', {bg = '#c0bfbc'})
vim.cmd('redraw')
vim.cmd('redraw')
end
end,
desc = 'toggle color themes'
},
},
},
-- {
-- 'navarasu/onedark.nvim',
-- lazy = false,
@ -13,24 +39,6 @@ return {
-- config = function()
-- require('onedark').load()
-- end,
-- --[[ keys = {
-- {
-- '<Leader>c',
-- function()
-- if vim.o.background == 'light' then
-- vim.o.background = 'dark'
-- else
-- vim.o.background = 'light'
-- -- vim.api.nvim_set_hl(0, 'ColorColumn', {bg = '#c0bfbc'})
-- vim.cmd('redraw')
-- vim.cmd('redraw')
-- end
-- end,
-- desc = 'toggle color themes'
-- },
-- }, --]]
-- },
--
-- Indentation

2
lua/ui.lua
View File

@ -17,7 +17,7 @@ vim.opt.list = true
-- Misc.
--
ct.set('ruler', 'showcmd', 'cursorline', 'title')
vim.cmd [[ colo selenized_bw ]]
-- vim.cmd [[ colo selenized_bw ]]
-- ct.set('number')
ct.set(
-- {'termguicolors', true},