fixes, disabling non-working plugins

This commit is contained in:
Ian Griffin 2025-04-07 09:18:41 +08:00
parent e90bc1bb5f
commit 70b71d56e5
5 changed files with 62 additions and 54 deletions

View File

@ -12,7 +12,7 @@ if gtk_colorscheme == "'prefer-dark'"
set background=dark set background=dark
else else
set background=light set background=light
hi ColorColumn guibg=#c0bfbc "" hi ColorColumn guibg=#c0bfbc
endif endif
"" ""
@ -21,7 +21,7 @@ endif
"" parameters "" parameters
let s:defaultfontsize = 10 let s:defaultfontsize = 10
let s:fontname = "Source Code Pro" let s:fontname = "Roboto Mono [GOOG]"
"" set default font "" set default font
:execute "Guifont " . s:fontname . ":h" . s:defaultfontsize :execute "Guifont " . s:fontname . ":h" . s:defaultfontsize

View File

@ -124,56 +124,56 @@ return {
vim.diagnostic.config({ virtual_text = false }) vim.diagnostic.config({ virtual_text = false })
end end
}, },
{ -- {
'hrsh7th/cmp-nvim-lsp', -- 'hrsh7th/cmp-nvim-lsp',
dependencies = { -- dependencies = {
'hrsh7th/nvim-cmp', -- 'hrsh7th/nvim-cmp',
} -- }
}, -- },
{ -- {
'jacob411/Ollama-Copilot', -- 'jacob411/Ollama-Copilot',
dependencies = { -- dependencies = {
'hrsh7th/cmp-nvim-lsp', -- 'hrsh7th/cmp-nvim-lsp',
}, -- },
opts = { -- opts = {
model_name = "qwen2.5-coder:14b", -- model_name = "qwen2.5-coder:14b",
stream_suggestion = false, -- stream_suggestion = false,
python_command = "python3", -- python_command = "python3",
filetypes = { -- filetypes = {
"bash", -- "bash",
"c", -- "c",
"cpp", -- "cpp",
"cs", -- "cs",
"dart", -- "dart",
"go", -- "go",
"html", -- "html",
"javascript", -- "javascript",
"javascriptreact", -- "javascriptreact",
"json", -- "json",
"lua", -- "lua",
"python", -- "python",
"tex", -- "tex",
"typescript", -- "typescript",
"typescriptreact", -- "typescriptreact",
}, -- },
ollama_model_opts = { -- ollama_model_opts = {
num_predict = 40, -- num_predict = 40,
temperature = 0.1, -- temperature = 0.1,
}, -- },
keymaps = { -- keymaps = {
suggestion = '<leader>os', -- suggestion = '<leader>os',
reject = '<leader>or', -- reject = '<leader>or',
insert_accept = '<Leader><Tab>', -- insert_accept = '<Leader><Tab>',
}, -- },
}, -- },
}, -- },
{ {
'williamboman/mason-lspconfig.nvim', 'williamboman/mason-lspconfig.nvim',
dependencies = { dependencies = {
'ms-jpq/coq_nvim', 'ms-jpq/coq_nvim',
'nanotee/nvim-lsp-basics', 'nanotee/nvim-lsp-basics',
'jacob411/Ollama-Copilot', -- 'jacob411/Ollama-Copilot',
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
'stevearc/aerial.nvim', 'stevearc/aerial.nvim',
'williamboman/mason.nvim', 'williamboman/mason.nvim',

View File

@ -7,7 +7,7 @@ return {
lazy = false, lazy = false,
config = function() config = function()
local ct = require('conftool') local ct = require('conftool')
ct.set({'background', 'light'}) ct.set({'background', 'dark'})
vim.cmd [[colo onedark]] vim.cmd [[colo onedark]]
end, end,
keys = { keys = {
@ -48,6 +48,13 @@ return {
{ {
'hiphish/rainbow-delimiters.nvim', 'hiphish/rainbow-delimiters.nvim',
lazy = false, lazy = false,
} },
--
-- Neovim Qt
--
{
'equalsraf/neovim-gui-shim',
lazy = false,
},
} }

View File

@ -10,10 +10,10 @@ return {
-- --
-- Multi-cursor -- Multi-cursor
-- --
{ -- {
'mg979/vim-visual-multi', -- 'mg979/vim-visual-multi',
lazy = false -- lazy = false
}, -- },
{ 'Raimondi/delimitMate', lazy = false } { 'Raimondi/delimitMate', lazy = false }
} }

View File

@ -16,10 +16,11 @@ vim.opt.list = true
-- --
-- Misc. -- Misc.
-- --
ct.set('ruler', 'showcmd', 'cursorline', 'number', 'title') ct.set('ruler', 'showcmd', 'cursorline', 'title')
-- ct.set('number')
ct.set( ct.set(
{'termguicolors', true}, {'termguicolors', true},
{'signcolumn', 'yes:1'}, {'signcolumn', 'number'},
{'conceallevel', 0}, {'conceallevel', 0},
{'colorcolumn', '81,121'}, {'colorcolumn', '81,121'},
{'textwidth', 0}, {'textwidth', 0},