From 2f1b13efc2519d9405851ff2e195cc261b0b1f54 Mon Sep 17 00:00:00 2001 From: Gabe Farrell Date: Mon, 15 Apr 2024 17:00:27 -0400 Subject: [PATCH] fix lsp --- init.lua | 7 ++++--- lazy-lock.json | 9 +++++---- lua/plugins/vim-sleuth.lua | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index 5c95abd..c636b75 100644 --- a/init.lua +++ b/init.lua @@ -24,7 +24,8 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) local lazy_config = require "configs.lazy" -require("lazy").setup({ import = "plugins" }, lazy_config) +-- TODO: investigate why using lazy_config here causes lsp to break +require("lazy").setup { import = "plugins" } -- more nvchad ui stuff -- dofile(vim.g.base46_cache .. "defaults") @@ -44,6 +45,6 @@ end vim.o.number = true -- require("nvim-tree.api").tree.open() -- open tree on start -- vim.schedule(function() - require "options" - require "remaps" +require "options" +require "remaps" -- end) diff --git a/lazy-lock.json b/lazy-lock.json index 00e8af4..4ee38b0 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -12,11 +12,12 @@ "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-lspconfig": { "branch": "master", "commit": "b3014f2209503944f2714cf27c95591433a0c7d8" }, + "nvim-lspconfig": { "branch": "master", "commit": "9266dc26862d8f3556c2ca77602e811472b4c5b8" }, "nvim-tree.lua": { "branch": "master", "commit": "ddd1d6eb21c45433bdc65cc8015f2457998f2bf2" }, - "nvim-treesitter": { "branch": "master", "commit": "f08a9d97f7a2ac02115a5c1c8e3973b2634d996b" }, - "nvim-web-devicons": { "branch": "master", "commit": "6e355632387a085f15a66ad68cf681c1d7374a04" }, + "nvim-treesitter": { "branch": "master", "commit": "2a95ff14764af20d32ec1edb27e11c38a84b9478" }, + "nvim-web-devicons": { "branch": "master", "commit": "b3468391470034353f0e5110c70babb5c62967d3" }, "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "telescope.nvim": { "branch": "master", "commit": "4d4ade7f2b8f403e8816ca50c05ed16e259b21fb" }, - "ui": { "branch": "v2.5", "commit": "e1af69426b3c4b55c88bd1c81790c1c73b30bfa8" } + "ui": { "branch": "v2.5", "commit": "e1af69426b3c4b55c88bd1c81790c1c73b30bfa8" }, + "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" } } \ No newline at end of file diff --git a/lua/plugins/vim-sleuth.lua b/lua/plugins/vim-sleuth.lua index dc6771a..e386ac4 100644 --- a/lua/plugins/vim-sleuth.lua +++ b/lua/plugins/vim-sleuth.lua @@ -1,3 +1,3 @@ return { - "timpope/vim-sleuth", + "tpope/vim-sleuth", }