From 519be0280502aa332964243e9105c9f2bbaa7c05 Mon Sep 17 00:00:00 2001 From: Micah Halter Date: Tue, 28 May 2024 08:06:43 -0400 Subject: [PATCH] fix(cpp): only check for Linux ARM for disabling/enabling clangd installation --- lua/astrocommunity/pack/cpp/init.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/astrocommunity/pack/cpp/init.lua b/lua/astrocommunity/pack/cpp/init.lua index c8ee6a09d..b256c31ef 100644 --- a/lua/astrocommunity/pack/cpp/init.lua +++ b/lua/astrocommunity/pack/cpp/init.lua @@ -1,5 +1,5 @@ -local machine = vim.loop.os_uname().machine -local is_arm = machine == "aarch64" or vim.startswith(machine, "arm") +local uname = (vim.uv or vim.loop).os_uname() +local is_linux_arm = uname.sysname == "Linux" and (uname.machine == "aarch64" or vim.startswith(uname.machine, "arm")) return { { @@ -13,7 +13,7 @@ return { }, }, }) - if is_arm then opts.servers = require("astrocore").list_insert_unique(opts.servers, { "clangd" }) end + if is_linux_arm then opts.servers = require("astrocore").list_insert_unique(opts.servers, { "clangd" }) end end, }, { @@ -30,7 +30,7 @@ return { "williamboman/mason-lspconfig.nvim", optional = true, opts = function(_, opts) - if not is_arm then + if not is_linux_arm then opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, { "clangd" }) end end, @@ -91,7 +91,7 @@ return { optional = true, opts = function(_, opts) local tools = { "codelldb" } - if not is_arm then table.insert(tools, "clangd") end + if not is_linux_arm then table.insert(tools, "clangd") end opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, tools) end, },