diff options
Diffstat (limited to 'nvimrc')
| -rw-r--r-- | nvimrc | 122 |
1 files changed, 59 insertions, 63 deletions
@@ -80,13 +80,12 @@ lua <<EOF cmp.setup.filetype('gitcommit', { sources = cmp.config.sources({ - { name = 'git' }, -- You can specify the `git` source if [you were installed it](https://github.com/petertriho/cmp-git). + { name = 'git' }, }, { { name = 'buffer' }, }) }) - -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore). cmp.setup.cmdline({ '/', '?' }, { mapping = cmp.mapping.preset.cmdline(), sources = { @@ -94,7 +93,6 @@ lua <<EOF } }) - -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). cmp.setup.cmdline(':', { mapping = cmp.mapping.preset.cmdline(), sources = cmp.config.sources({ @@ -134,9 +132,6 @@ lua <<EOF local capabilities = require('cmp_nvim_lsp').default_capabilities() capabilities.offsetEncoding = "utf-16" - require('lspconfig')['clangd'].setup { - capabilities = capabilities - } require('lspconfig')['ts_ls'].setup { capabilities = capabilities, @@ -149,29 +144,13 @@ lua <<EOF } } - require('lspconfig')['zls'].setup { - capabilities = capabilities - } - - require('lspconfig')['intelephense'].setup { - capabilities = capabilities - } - - require('lspconfig')['jdtls'].setup { - capabilities = capabilities - } - - require('lspconfig')['vala_ls'].setup { - capabilities = capabilities - } - - require('lspconfig')['lua_ls'].setup { - capabilities = capabilities - } - - require('lspconfig')['arduino_language_server'].setup { - capabilities = capabilities - } + require('lspconfig')['zls'].setup { capabilities = capabilities } + require('lspconfig')['jdtls'].setup { capabilities = capabilities } + require('lspconfig')['clangd'].setup { capabilities = capabilities } + require('lspconfig')['lua_ls'].setup { capabilities = capabilities } + require('lspconfig')['vala_ls'].setup { capabilities = capabilities } + require('lspconfig')['intelephense'].setup { capabilities = capabilities } + require('lspconfig')['arduino_language_server'].setup { capabilities = capabilities } vim.diagnostic.config({ signs = false, @@ -185,7 +164,19 @@ lua <<EOF ignore_terminal = true, }) - require'nvim-treesitter.configs'.setup { + local parser_config = require("nvim-treesitter.parsers").get_parser_configs() + parser_config.sourcepawn = { + install_info = { + url = "https://github.com/nilshelmig/tree-sitter-sourcepawn", + files = {"src/parser.c", "src/scanner.c"}, + branch = "main", + generate_requires_npm = false, + requires_generate_from_grammar = false, + }, + filetype = "sp", + } + + require('nvim-treesitter.configs').setup { ensure_installed = { "c", "cpp", "javascript", "html", "lua", "vim", "vimdoc", "java", "sql", "query", "markdown", "markdown_inline" }, sync_install = false, textobjects = { enable = true }, @@ -213,7 +204,6 @@ lua <<EOF } require('img-clip').setup( { - -- recommended settings default = { embed_image_as_base64 = false, prompt_for_file_name = false, @@ -227,6 +217,7 @@ lua <<EOF file_types = { "markdown", "Avante" }, enable = true, } + require('avante_lib').load() require('avante').setup({ mappings = { @@ -260,18 +251,7 @@ lua <<EOF ---@type AvanteProvider ollama = { endpoint = "127.0.0.1:11434", - -- model = 'qwen2.5:7b-instruct-q4_K_M', model = 'qwen2.5-coder:7b-instruct-q5_K_M', - -- model = 'yi-coder:9b-chat-q4_0', - -- model = "codestral", - -- model = "codestral:22b-v0.1-q6_K", - -- model = "mistral-nemo:12b-instruct-2407-q8_0", - -- model = "mistral-nemo:12b-instruct-2407-q4_K_S", - -- model = "deepseek-coder-v2:16b-lite-instruct-q5_K_M", - -- model = "llama3.1:8b-instruct-q5_K_M", - -- model = "starcoder2:15b-instruct-v0.1-q3_K_S", - -- model = "gemma2:27b-instruct-q5_K_M", - -- model = "mixtral:8x7b-instruct-v0.1-q3_K_L", }, }, @@ -279,6 +259,7 @@ lua <<EOF EOF set autoindent expandtab tabstop=2 shiftwidth=2 number +set cinoptions+=(1s set mouse=a set mousemodel=popup set noshowmode @@ -367,6 +348,7 @@ function! s:UpdateSignColumn() endif execute 'sign place ' . l:lnum . ' line=' . l:lnum . \' name=RelNum' . l:distance . + \' priority=1' \' group=RelativeLineNumbers buffer=' . bufnr('') endif endif @@ -517,7 +499,7 @@ function! InputTabNumber() endfunction function! TurnOffDiag() - let disallowed_langs = ['c', 'cpp', 'javascript', 'typescript', 'typescriptreact', 'javascriptreact'] + let disallowed_langs = ['c', 'cpp', 'javascript', 'typescript', 'typescriptreact', 'javascriptreact', 'java'] if index(disallowed_langs, &filetype) >= 0 ALEDisable endif @@ -626,11 +608,11 @@ nnoremap <F1> :call InputTabNumber()<CR> inoremap <F1> <ESC>:call InputTabNumber()<CR> vnoremap <F1> <ESC>:call InputTabNumber()<CR> -nnoremap <F2> :Telescope live_grep<CR> -nnoremap <C-f> :Telescope current_buffer_fuzzy_find<CR> -nnoremap <C-x> :Telescope marks<CR> +nnoremap <F2> :Telescope live_grep theme=ivy<CR> +nnoremap <C-f> :Telescope current_buffer_fuzzy_find theme=ivy<CR> +nnoremap <C-x> :Telescope marks theme=ivy<CR> -nnoremap <F4> :lua ToggleDiagnostics()<CR> +nnoremap <leader>td :lua ToggleDiagnostics()<CR> nnoremap <F7> :VimspectorReset<CR> nnoremap <F12> :VimspectorToggle @@ -651,9 +633,9 @@ nnoremap t :call OpenFloat()<CR> nnoremap T :call OpenLsp()<CR> nnoremap gd <C-]> -nnoremap <leader>gd :Telescope diagnostics<CR> +nnoremap <leader>gd :Telescope diagnostics theme=ivy<CR> -nnoremap <leader>gr :Telescope lsp_references<CR> +nnoremap <leader>gr :Telescope lsp_references theme=ivy<CR> nnoremap [[ ?{<CR>:nohl<CR> nnoremap ]] /}<CR>:nohl<CR> @@ -680,18 +662,28 @@ inoremap <S-Up> <Esc><C-u>i inoremap <S-Down> <Esc><C-d>i colorscheme base16-synth-midnight-dark -hi LineNr guibg=#000000 -hi String ctermfg=1 guifg=#ea5971 -hi Character ctermfg=1 guifg=#dddddd -hi CmpItemKindDefault guifg=#7cede9 guibg=#101010 -hi javaScriptIdentifier guifg=#ff40ff ctermfg=Magenta -hi Delimiter ctermfg=14 guifg=#cccccc -hi AvanteConflictCurrent guibg=#101010 +hi LineNr guibg=#000000 +hi String ctermfg=1 guifg=#ea5971 +hi Character ctermfg=1 guifg=#dddddd +hi CmpItemKindDefault guifg=#7cede9 guibg=#101010 +hi javaScriptIdentifier guifg=#ff40ff ctermfg=Magenta +hi Delimiter ctermfg=14 guifg=#cccccc +hi AvanteConflictCurrent guibg=#101010 hi AvanteConflictIncoming guibg=#102010 -hi PmenuSel guibg=#ffffff guifg=#202020 -hi Variable guifg=#40FF40 ctermfg=Green -hi @variable guifg=#40FF40 ctermfg=Green -hi Identifier guifg=#27ea91 +hi PmenuSel guibg=#ffffff guifg=#202020 +hi Variable guifg=#40FF40 ctermfg=Green +hi @variable guifg=#40FF40 ctermfg=Green +hi Identifier guifg=#27ea91 +hi VimspectorBPNum ctermfg=red guifg=#e05252 +hi VimspectorBPCondNum ctermfg=magenta guifg=#c678dd +hi VimspectorBPLogNum ctermfg=blue guifg=#61afef +hi VimspectorBPDisNum ctermfg=grey guifg=#5c6370 +hi VimspectorPCNum ctermfg=yellow guifg=#e5c07b +hi @type.builtin.cpp guifg=#ea5ce2 +hi SpecialChar ctermfg=9 guifg=#e4600e +hi SignColumn guibg=#000000 +hi LightlineRed guifg=#ff0000 guibg=#ffffff + hi def link @lsp.typemod.variable.defaultLibrary.javascriptreact Special hi def link @lsp.typemod.variable.defaultLibrary.typescriptreact Special hi def link @lsp.typemod.variable.defaultLibrary.javascript Special @@ -708,9 +700,13 @@ hi def link markdownRule markdownH1 hi def link markdownIdDeclaration markdownCode hi def link markdownLineStart markdownCode -hi @type.builtin.cpp guifg=#ea5ce2 -hi SpecialChar ctermfg=9 guifg=#e4600e -hi SignColumn guibg=#000000 +sign define vimspectorBP text=● texthl=WarningMsg numhl=VimspectorBPNum +sign define vimspectorBPCond text=◆ texthl=WarningMsg numhl=VimspectorBPCondNum +sign define vimspectorBPLog text=◆ texthl=SpellRare numhl=VimspectorBPLogNum +sign define vimspectorBPDisabled text=● texthl=LineNr numhl=VimspectorBPDisNum +sign define vimspectorPC text=▶ texthl=MatchParen numhl=VimspectorPCNum +sign define vimspectorPCBP text=●▶ texthl=MatchParen numhl=VimspectorPCNum + let g:vim_json_conceal=0 let g:markdown_syntax_conceal=0 |