From 1f33a8d61a4b618490bb7e7e79cf725b732d1edd Mon Sep 17 00:00:00 2001 From: C4 Patino Date: Tue, 30 Jul 2024 11:45:32 -0500 Subject: [PATCH] Fixed neovim completion --- lua/configs/lsp.lua | 12 ------------ lua/configs/lspconfig.lua | 2 +- lua/configs/nvimtree.lua | 4 ++-- lua/configs/zenmode.lua | 12 ++++++------ lua/mappings.lua | 3 --- lua/options.lua | 2 +- lua/plugins/init.lua | 32 ++++++++++++++++++++++++++------ 7 files changed, 36 insertions(+), 31 deletions(-) delete mode 100644 lua/configs/lsp.lua diff --git a/lua/configs/lsp.lua b/lua/configs/lsp.lua deleted file mode 100644 index 0eb085c..0000000 --- a/lua/configs/lsp.lua +++ /dev/null @@ -1,12 +0,0 @@ -local options = { - sources = { - { name = "nvim_lsp", group_index = 2 }, - { name = "copilot", group_index = 2 }, - { name = "luasnip", group_index = 2 }, - { name = "buffer", group_index = 2 }, - { name = "nvim_lua", group_index = 2 }, - { name = "path", group_index = 2 }, - }, -} - -require("cmp").setup(options) diff --git a/lua/configs/lspconfig.lua b/lua/configs/lspconfig.lua index 10d2857..55b292e 100644 --- a/lua/configs/lspconfig.lua +++ b/lua/configs/lspconfig.lua @@ -3,7 +3,7 @@ local on_init = require("nvchad.configs.lspconfig").on_init local capabilities = require("nvchad.configs.lspconfig").capabilities require("mason-lspconfig").setup({ - ensure_installed = { "lua_ls", "html", "cssls", "pylsp", "java_language_server", "sqlls", "gopls" }, + ensure_installed = { "lua_ls", "html", "cssls", "pylsp", "sqlls", "gopls" }, handlers = { function(server_name) -- default handler (optional) require("lspconfig")[server_name].setup { diff --git a/lua/configs/nvimtree.lua b/lua/configs/nvimtree.lua index 7af3cf0..fc8cffc 100644 --- a/lua/configs/nvimtree.lua +++ b/lua/configs/nvimtree.lua @@ -2,8 +2,8 @@ local options = { filters = { dotfiles = false, git_ignored = true, - custom = { "node_modules", "venv", "__pycache__" }, - exclude = {}, + custom = { "git/", "node_modules/", "venv/", "__pycache__" }, + exclude = { }, }, disable_netrw = true, hijack_netrw = true, diff --git a/lua/configs/zenmode.lua b/lua/configs/zenmode.lua index a0005e0..9578996 100644 --- a/lua/configs/zenmode.lua +++ b/lua/configs/zenmode.lua @@ -1,12 +1,12 @@ local set = vim.keymap.set -require("zen-mode").setup({ - window = { - width = 150, - options = {} - }, -}) set("n", "zz", function() + require("zen-mode").setup({ + window = { + width = 150, + options = {} + }, + }) require("zen-mode").toggle() vim.wo.wrap = false diff --git a/lua/mappings.lua b/lua/mappings.lua index d0c2b30..f5f9048 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -76,6 +76,3 @@ map("n", "tt", "Trouble diagnostics toggle", { desc = "Errors O map("n", "tf", "Trouble diagnostics toggle filter.buf=0", { desc = "Errors Open buffer diagnostics" }) map("n", "tl", "Trouble loclist toggle", { desc = "Errors Open location list" }) map("n", "tq", "Trouble qflist toggle", { desc = "Errors Open quickfix fist" }) - --- ZenMode -map("n", "zz", "ZenMode", { desc = "ZenMode Toggle window" }) diff --git a/lua/options.lua b/lua/options.lua index fba29af..f8f2162 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -36,4 +36,4 @@ o.foldenable = true g.undotree_WindowLayout = 4 g.undotree_DiffpanelHeight = 15 -g.undotree_SplitWidth = 60 +g.undotree_SplitWidth = 40 diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index bbef338..40a21b2 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -2,14 +2,33 @@ return { { "sitiom/nvim-numbertoggle", lazy = false, }, { "junegunn/gv.vim", cmd = { "GV" } }, { "mbbill/undotree", cmd = { "UndotreeToggle" } }, - { "folke/trouble.nvim", cmd = { "Trouble" }}, + { "folke/trouble.nvim", cmd = { "Trouble" }, opts = {}}, { "zbirenbaum/copilot.lua", event = "InsertEnter", config = function() require("configs.copilot") end }, { "nvim-tree/nvim-tree.lua", cmd = { "NvimTreeToggle", "NvimTreeFocus" }, config = function() require("configs.nvimtree") end }, { "folke/zen-mode.nvim", keys = { "zz" }, config = function() require("configs.zenmode") end }, { "stevearc/conform.nvim", config = function() require("configs.conform") end }, - { "zbirenbaum/copilot-cmp", config = function() require("copilot_cmp").setup() end }, - { "hrsh7th/nvim-cmp", dependencies = { "zbirenbaum/copilot-cmp" }, config = function() require("configs.lsp") end }, - { "kylechui/nvim-surround", event = "VeryLazy", config = function() require("configs.nvim-surround") end }, + { + "hrsh7th/nvim-cmp", + dependencies = { + { + "zbirenbaum/copilot-cmp", + config = function() + require("copilot_cmp").setup() + end, + }, + }, + opts = { + sources = { + { name = "nvim_lsp", group_index = 2 }, + { name = "copilot", group_index = 2 }, + { name = "luasnip", group_index = 2 }, + { name = "buffer", group_index = 2 }, + { name = "nvim_lua", group_index = 2 }, + { name = "path", group_index = 2 }, + }, + }, + }, + { "kylechui/nvim-surround", event = "VeryLazy", opts = {} }, { "tpope/vim-fugitive", keys = { @@ -20,9 +39,10 @@ return { }, { "iamcco/markdown-preview.nvim", - cmd = { "MarkdownPreview", "MarkdownPreviewToggle", "MarkdownPreviewStop" }, + cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, + build = "cd app && yarn install", + init = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, - build = function() vim.fn["mkdp#util#install"]() end, }, { "neovim/nvim-lspconfig",