From 0d927e25aef490e814a187ed5f45fc2f8c41cc0e Mon Sep 17 00:00:00 2001 From: Baipyrus Date: Wed, 6 Mar 2024 07:54:21 +0100 Subject: [PATCH] use choco installation, native make, mingw and unzip configuration --- lua/kickstart/health.lua | 2 +- lua/kickstart/plugins/cmp.lua | 4 ++-- lua/kickstart/plugins/telescope.lua | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/kickstart/health.lua b/lua/kickstart/health.lua index a230c89..04df77b 100644 --- a/lua/kickstart/health.lua +++ b/lua/kickstart/health.lua @@ -21,7 +21,7 @@ end local check_external_reqs = function() -- Basic utils: `git`, `make`, `unzip` - for _, exe in ipairs { 'git', 'cmake', 'rg' } do + for _, exe in ipairs { 'git', 'make', 'unzip', 'rg' } do local is_executable = vim.fn.executable(exe) == 1 if is_executable then vim.health.ok(string.format("Found executable: '%s'", exe)) diff --git a/lua/kickstart/plugins/cmp.lua b/lua/kickstart/plugins/cmp.lua index 10433a8..e3c26f1 100644 --- a/lua/kickstart/plugins/cmp.lua +++ b/lua/kickstart/plugins/cmp.lua @@ -10,10 +10,10 @@ return { -- Build Step is needed for regex support in snippets -- This step is not supported in many windows environments -- Remove the below condition to re-enable on windows - if vim.fn.has 'win32' == 1 or vim.fn.executable 'cmake' == 0 then + if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then return end - return 'cmake install_jsregexp' + return 'make install_jsregexp' end)(), }, 'saadparwaiz1/cmp_luasnip', diff --git a/lua/kickstart/plugins/telescope.lua b/lua/kickstart/plugins/telescope.lua index c8d2ff8..139baec 100644 --- a/lua/kickstart/plugins/telescope.lua +++ b/lua/kickstart/plugins/telescope.lua @@ -17,12 +17,12 @@ return { -- `build` is used to run some command when the plugin is installed/updated. -- This is only run then, not every time Neovim starts up. - build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release; cmake --build build --config Release; cmake --install build --prefix build', + build = 'make', -- `cond` is a condition used to determine whether this plugin should be -- installed and loaded. cond = function() - return vim.fn.executable 'cmake' == 1 + return vim.fn.executable 'make' == 1 end, }, { 'nvim-telescope/telescope-ui-select.nvim' },