From fa03280606edbd8bf734b77f8e38eb6762a96d97 Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Tue, 6 Dec 2022 15:52:28 +0000 Subject: [PATCH] changed to cmp, cause better --- .config/nvim/lua/.luarc.json | 35 +++++ .config/nvim/lua/plugins/cmp.lua | 135 +++++++++++++++++++ .config/nvim/lua/plugins/lspconfig.lua | 71 ++++++---- .config/nvim/lua/plugins/mason-lspconfig.lua | 4 + .config/nvim/lua/plugins/packer.lua | 102 ++++++++------ .config/nvim/lua/plugins/rust-tools.lua | 12 -- 6 files changed, 284 insertions(+), 75 deletions(-) create mode 100644 .config/nvim/lua/.luarc.json create mode 100644 .config/nvim/lua/plugins/cmp.lua create mode 100644 .config/nvim/lua/plugins/mason-lspconfig.lua delete mode 100644 .config/nvim/lua/plugins/rust-tools.lua diff --git a/.config/nvim/lua/.luarc.json b/.config/nvim/lua/.luarc.json new file mode 100644 index 0000000..1be9582 --- /dev/null +++ b/.config/nvim/lua/.luarc.json @@ -0,0 +1,35 @@ +{ + "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json", + "Lua.workspace.library": [ + "/home/afonso/.config/nvim", + "/etc/xdg/nvim", + "/home/afonso/.local/share/nvim/site", + "/home/afonso/.local/share/nvim/site/pack/packer/start/barbar.nvim", + "/home/afonso/.local/share/nvim/site/pack/packer/start/coc.nvim", + "/home/afonso/.local/share/nvim/site/pack/packer/start/dressing.nvim", + "/home/afonso/.local/share/nvim/site/pack/packer/start/feline.nvim", + "/home/afonso/.local/share/nvim/site/pack/packer/start/impatient.nvim", + "/home/afonso/.local/share/nvim/site/pack/packer/start/instant.nvim", + "/home/afonso/.local/share/nvim/site/pack/packer/start/leap.nvim", + "/home/afonso/.local/share/nvim/site/pack/packer/start/mason.nvim", + "/home/afonso/.local/share/nvim/site/pack/packer/start/nvim-autopairs", + "/home/afonso/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + "/home/afonso/.local/share/nvim/site/pack/packer/start/nvim-tree.lua", + "/home/afonso/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + "/home/afonso/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", + "/home/afonso/.local/share/nvim/site/pack/packer/start/onedark.vim", + "/home/afonso/.local/share/nvim/site/pack/packer/start/packer.nvim", + "/home/afonso/.local/share/nvim/site/pack/packer/start/plenary.nvim", + "/home/afonso/.local/share/nvim/site/pack/packer/start/silicon.lua", + "/home/afonso/.local/share/nvim/site/pack/packer/start/startup.nvim", + "/home/afonso/.local/share/nvim/site/pack/packer/start/telescope.nvim", + "/home/afonso/.local/share/nvim/site/pack/packer/start/vim-surround", + "/home/afonso/.local/share/nvim/site/pack/packer/start/vimtex", + "/usr/share/nvim/runtime", + "/usr/share/nvim/runtime/pack/dist/opt/matchit", + "/usr/lib/nvim", + "/home/afonso/.local/share/nvim/site/pack/packer/start/vimtex/after", + "/usr/share/vim/vimfiles", + "${3rd}/luassert/library" + ] +} \ No newline at end of file diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua new file mode 100644 index 0000000..e3f0968 --- /dev/null +++ b/.config/nvim/lua/plugins/cmp.lua @@ -0,0 +1,135 @@ +local cmp_status_ok, cmp = pcall(require, "cmp") +if not cmp_status_ok then + return +end + +local snip_status_ok, luasnip = pcall(require, "luasnip") +if not snip_status_ok then + return +end + +require("luasnip/loaders/from_vscode").lazy_load() + +local check_backspace = function() + local col = vim.fn.col "." - 1 + return col == 0 or vim.fn.getline("."):sub(col, col):match "%s" +end + +--   פּ ﯟ   some other good icons +local kind_icons = { + Text = "", + Method = "m", + Function = "", + Constructor = "", + Field = "", + Variable = "", + Class = "", + Interface = "", + Module = "", + Property = "", + Unit = "", + Value = "", + Enum = "", + Keyword = "", + Snippet = "", + Color = "", + File = "", + Reference = "", + Folder = "", + EnumMember = "", + Constant = "", + Struct = "", + Event = "", + Operator = "", + TypeParameter = "", +} +-- find more here: https://www.nerdfonts.com/cheat-sheet + +cmp.setup { + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) -- For `luasnip` users. + end, + }, + mapping = { + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping(cmp.mapping.scroll_docs(-1), { "i", "c" }), + [""] = cmp.mapping(cmp.mapping.scroll_docs(1), { "i", "c" }), + [""] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }), + [""] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `` mapping. + [""] = cmp.mapping { + i = cmp.mapping.abort(), + c = cmp.mapping.close(), + }, + -- Accept currently selected item. If none selected, `select` first item. + -- Set `select` to `false` to only confirm explicitly selected items. + [""] = cmp.mapping.confirm { select = true }, + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expandable() then + luasnip.expand() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif check_backspace() then + fallback() + else + fallback() + end + end, { + "i", + "s", + }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { + "i", + "s", + }), + }, + formatting = { + fields = { "kind", "abbr", "menu" }, + format = function(entry, vim_item) + -- Kind icons + vim_item.kind = string.format("%s", kind_icons[vim_item.kind]) + -- vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind], vim_item.kind) -- This concatonates the icons with the name of the item kind + vim_item.menu = ({ + nvim_lsp = "(LSP)", + luasnip = "(Snippet)", + buffer = "(Text)", + path = "(Path)", + })[entry.source.name] + return vim_item + end, + }, + sources = { + { name = "nvim_lsp" }, + { name = "luasnip" }, + { name = "buffer" }, + { name = "path" }, + }, + confirm_opts = { + behavior = cmp.ConfirmBehavior.Replace, + select = false, + }, + window = { + documentation = cmp.config.window.bordered(), + completion = cmp.config.window.bordered({ + winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,CursorLine:PmenuSel,Search:None" + }) + + }, + experimental = { + ghost_text = false, + native_menu = false, + }, +} + + diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua index 8f56c2c..3e067dd 100644 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -37,26 +37,51 @@ local on_attach = function(client, bufnr) }) end -local lsp = require "lspconfig" -local coq = require "coq" - -lsp['hls'].setup{ - on_attach = on_attach, - flags = lsp_flags, -} -lsp['rust_analyzer'].setup{} - -lsp.rust_analyzer.setup( - coq.lsp_ensure_capabilities{ - on_attach = on_attach, - flags = lsp_flags, - -- Server-specific settings... - settings = { - ["rust-analyzer"] = {} - } - } -) -require('lspconfig')['texlab'].setup{ - on_attach = on_attach, - flags = lsp_flags, -} +--local lsp = require "lspconfig" +--local coq = require "coq" +-- +--lsp['hls'].setup{ +-- on_attach = on_attach, +-- flags = lsp_flags, +--} +-- +--lsp['rust_analyzer'].setup{} +-- +--lsp.rust_analyzer.setup( +-- coq.lsp_ensure_capabilities{ +-- on_attach = on_attach, +-- flags = lsp_flags, +-- -- Server-specific settings... +-- settings = { +-- ["rust-analyzer"] = {} +-- } +-- } +--) +-- +--lsp['texlab'].setup{ +-- on_attach = on_attach, +-- flags = lsp_flags, +--} +--lsp['sumneko_lua'].setup{ +-- +-- settings = { +-- Lua = { +-- runtime = { +-- -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) +-- version = 'LuaJIT', +-- }, +-- diagnostics = { +-- -- Get the language server to recognize the `vim` global +-- globals = {'vim'}, +-- }, +-- workspace = { +-- -- Make the server aware of Neovim runtime files +-- library = vim.api.nvim_get_runtime_file("", true), +-- }, +-- -- Do not send telemetry data containing a randomized but unique identifier +-- telemetry = { +-- enable = false, +-- }, +-- }, +-- }, +--} diff --git a/.config/nvim/lua/plugins/mason-lspconfig.lua b/.config/nvim/lua/plugins/mason-lspconfig.lua new file mode 100644 index 0000000..2234257 --- /dev/null +++ b/.config/nvim/lua/plugins/mason-lspconfig.lua @@ -0,0 +1,4 @@ +require("mason-lspconfig").setup({ + ensure_installed = { "sumneko_lua", "rust_analyzer" , "texlab"}, + automatic_installation = true +}) diff --git a/.config/nvim/lua/plugins/packer.lua b/.config/nvim/lua/plugins/packer.lua index 637cb04..b110f33 100644 --- a/.config/nvim/lua/plugins/packer.lua +++ b/.config/nvim/lua/plugins/packer.lua @@ -17,54 +17,76 @@ local plugins = packer.startup({function(use) end } + -------------------------------------------------------QOL---------------------------------------------- + use { "ggandor/leap.nvim", config = function () require('leap').add_default_mappings() end } + use {'stevearc/dressing.nvim'} -- Rename variable pop up + + use {"windwp/nvim-autopairs", + config = function() require("nvim-autopairs").setup {} + end + } + -------------------------------------------------------LSP---------------------------------------------- + + use { "williamboman/mason.nvim", + config = function () + require "plugins.mason" + end + } + + use { "williamboman/mason-lspconfig.nvim", + config = function () + require "plugins.mason-lspconfig" + end + } + use { "neovim/nvim-lspconfig", config = function () require "plugins.lspconfig" end } - use {"ms-jpq/coq_nvim", - branch = 'coq', - config = function () - vim.g.coq_settings = { auto_start = 'shut-up'} - end - + use { "L3MON4D3/LuaSnip", + requires = { + "rafamadriz/friendly-snippets", + "saadparwaiz1/cmp_luasnip" + }, } - - use {"ms-jpq/coq_nvim", - branch = 'artifacts', - } - - use {'stevearc/dressing.nvim'} -- Rename variable pop up - - use {"windwp/nvim-autopairs", - config = function() require("nvim-autopairs").setup {} end - } - - ----- use { "L3MON4D3/LuaSnip", --- requires = { --- "rafamadriz/friendly-snippets", ----- "saadparwaiz1/cmp_luasnip" --- }, --- } - use { "williamboman/mason.nvim", - config = function () - require "plugins.mason" + --------------------------------------------------SUGGESTION BOX----------------------------------------- + use { "hrsh7th/nvim-cmp", + config = function() + require "plugins.cmp" end } + --- use {"ms-jpq/coq_nvim", + --- branch = 'coq', + --- config = function () + --- vim.g.coq_settings = { auto_start = 'shut-up'} + --- end + --- + --- } + --- + -- use {"ms-jpq/coq_nvim", + -- branch = 'artifacts', + -- } + ------------------------------------------------------------------------------------------- + + + + use {'nvim-tree/nvim-tree.lua', - requires = { - 'nvim-tree/nvim-web-devicons', -- optional, for file icons - }, - require("nvim-tree").setup() + requires = { + 'nvim-tree/nvim-web-devicons', -- optional, for file icons + }, + config = function() + require("nvim-tree").setup() + end } use { "feline-nvim/feline.nvim" } @@ -95,28 +117,28 @@ local plugins = packer.startup({function(use) use {"jbyuki/instant.nvim"} use {"narutoxy/silicon.lua", - requires = { "nvim-lua/plenary.nvim" }, - config = function() - require('silicon').setup({ + requires = { "nvim-lua/plenary.nvim" }, + config = function() + require('silicon').setup({ font = "FiraCode Nerd Font Mono", output = "~/Pictures/SILICON_${year}-${month}-${date}.png", debug = true }) require "plugins.silicon" - end + end } use {"tpope/vim-surround"} use {"startup-nvim/startup.nvim", requires = {"nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim"}, - config = function() - require("startup").setup { theme = "dashboard" } - end, + config = function() + require("startup").setup { theme = "dashboard" } + end, } - + end, - + config = { auto_clean = true, compile_on_sync = true, diff --git a/.config/nvim/lua/plugins/rust-tools.lua b/.config/nvim/lua/plugins/rust-tools.lua deleted file mode 100644 index bcda183..0000000 --- a/.config/nvim/lua/plugins/rust-tools.lua +++ /dev/null @@ -1,12 +0,0 @@ -local rt = require("rust-tools") - -rt.setup({ - server = { - on_attach = function(_, bufnr) - -- Hover actions - vim.keymap.set("n", "", rt.hover_actions.hover_actions, { buffer = bufnr }) - -- Code action groups - vim.keymap.set("n", "a", rt.code_action_group.code_action_group, { buffer = bufnr }) - end, - }, -})