diff --git a/coc-settings.json b/coc-settings.json index 11c027f..d63eaa0 100644 --- a/coc-settings.json +++ b/coc-settings.json @@ -1,11 +1,55 @@ { - "languageserver": { + "suggest.noselect": true, + "suggest.enablePreselect": false, + "suggest.triggerAfterInsertEnter": true, + "inlineSuggest.autoTrigger": false, + "suggest.completionItemKindLabels": { + "text": "", + "method": "", + "function": "", + "constructor": "", + "field": "", + "variable": "", + "class": "", + "interface": "", + "module": "", + "property": "", + "unit": "", + "value": "", + "enum": "", + "keyword": "", + "snippet": "", + "color": "", + "file": "", + "reference": "", + "folder": "", + "enumMember": "", + "constant": "", + "struct": "", + "event": "", + "operator": "", + "typeParameter": "", + "default": "" + }, + "suggest.floatConfig": { + "maxWidth": 80, + "winblend": 1, + }, + "suggest.virtualText": false, + + "languageserver": { "hyprlang": { "command": "hyprls", "filetypes": ["hyprlang"] }, + "qml": { + "command": "qmlls6", + "filetypes": ["qml"] + } }, "git.addedSign.hlGroup": "GitGutterAdd", "git.changedSign.hlGroup": "GitGutterChange", "git.removedSign.hlGroup": "GitGutterDelete", + "coc.source.file.enable": true, + "coc.source.file.ignoreHidden": false, } diff --git a/init.lua b/init.lua index 09a6260..c36b5b6 100644 --- a/init.lua +++ b/init.lua @@ -3,7 +3,7 @@ require("options") require("globals") require("mappings") require("autocmd") -require("coc-settings") +-- require("coc-settings") if vim.g.neovide then require("config.neovide") diff --git a/lua/coc-settings.lua b/lua/coc-settings.lua index ea1cc47..e9937d5 100644 --- a/lua/coc-settings.lua +++ b/lua/coc-settings.lua @@ -1,5 +1,7 @@ vim.opt.backup = false vim.opt.writebackup = false +vim.opt.completeopt = "menuone,menu,noinsert,noselect,popup" +vim.opt.pumheight = 10 vim.opt.updatetime = 300 @@ -17,11 +19,12 @@ end -- NOTE: Use command ':verbose imap ' to make sure Tab is not mapped by -- other plugins before putting this into your config local opts = {silent = true, noremap = true, expr = true, replace_keycodes = false} -keyset("i", "", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "" : coc#refresh()', opts) -keyset("i", "", [[coc#pum#visible() ? coc#pum#prev(1) : "\"]], opts) +keyset("i", "", 'coc#pum#visible() ? coc#pum#next(0) : v:lua.check_back_space() ? "" : coc#refresh()', opts) +keyset("i", "", [[coc#pum#visible() ? coc#pum#prev(0) : "\"]], opts) -- Make to accept selected completion item or notify coc.nvim to format -- u breaks current undo, please make your own choice + keyset("i", "", [[coc#pum#visible() ? coc#pum#confirm() : "\u\\=coc#on_enter()\"]], opts) -- Use to trigger snippets diff --git a/lua/options.lua b/lua/options.lua index 8652642..6a325fd 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -52,3 +52,6 @@ local is_windows = vim.fn.has "win32" ~= 0 local sep = is_windows and "\\" or "/" local delim = is_windows and ";" or ":" vim.env.PATH = table.concat({ vim.fn.stdpath "data", "mason", "bin" }, sep) .. delim .. vim.env.PATH + +-- vim-tpipeline +vim.g.tpipeline_restore = 1 diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 0cee5da..91746c2 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -182,7 +182,7 @@ return { }, { "neovim/nvim-lspconfig", - enabled = false, + enabled = true, dependencies = { "williamboman/mason.nvim", "williamboman/mason-lspconfig.nvim", @@ -237,18 +237,6 @@ return { "mg979/vim-visual-multi", branch = "master", }, - { - "jackMort/ChatGPT.nvim", - dependencies = { - "MunifTanjim/nui.nvim", - "nvim-lua/plenary.nvim", - "folke/trouble.nvim", - "nvim-telescope/telescope.nvim" - }, - config = function() - require("config.chatgpt") - end, - }, { "elkowar/yuck.vim", }, @@ -263,7 +251,6 @@ return { "lancewilhelm/horizon-extended.nvim", }, { - "neoclide/coc.nvim", - branch = "release", + "vimpostor/vim-tpipeline", } }