From 017a82dc61c24ba2319ed072df99c055a7572764 Mon Sep 17 00:00:00 2001 From: Carlos Gutierrez Date: Thu, 5 Mar 2026 17:01:47 -0500 Subject: [PATCH] fix: guard macOS-only configs behind has('mac') check --- ftplugin/java.lua | 6 ++++++ lua/cargdev/core/options.lua | 26 ++++++++++++++------------ lua/cargdev/plugins/vimtex.lua | 12 ++++++------ 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/ftplugin/java.lua b/ftplugin/java.lua index 8fb195e..7bb0833 100644 --- a/ftplugin/java.lua +++ b/ftplugin/java.lua @@ -1,3 +1,9 @@ +-- This ftplugin is currently configured for macOS (Homebrew + Apple Silicon). +-- Skip on Linux until Linux paths are configured. +if vim.fn.has("mac") ~= 1 then + return +end + local home = os.getenv("HOME") local workspace_path = home .. "/.local/share/nvim/jdtls-workspace/" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") diff --git a/lua/cargdev/core/options.lua b/lua/cargdev/core/options.lua index b8eb629..0d5de72 100644 --- a/lua/cargdev/core/options.lua +++ b/lua/cargdev/core/options.lua @@ -136,18 +136,20 @@ g.loaded_ruby_provider = 0 -- Disable Ruby provider (optional) g.python3_host_prog = fn.expand("~/.local/pipx/venvs/pynvim/bin/python") --- Clipboard provider optimization (macOS) -g.clipboard = { - name = "macOS-clipboard", - copy = { - ["+"] = "pbcopy", - ["*"] = "pbcopy", - }, - paste = { - ["+"] = "pbpaste", - ["*"] = "pbpaste", - }, -} +-- Clipboard provider optimization (macOS only) +if vim.fn.has("mac") == 1 then + g.clipboard = { + name = "macOS-clipboard", + copy = { + ["+"] = "pbcopy", + ["*"] = "pbcopy", + }, + paste = { + ["+"] = "pbpaste", + ["*"] = "pbpaste", + }, + } +end -- Lua specific settings opt.runtimepath:append(vim.fn.stdpath("config") .. "/lua") diff --git a/lua/cargdev/plugins/vimtex.lua b/lua/cargdev/plugins/vimtex.lua index caaca21..e001b54 100644 --- a/lua/cargdev/plugins/vimtex.lua +++ b/lua/cargdev/plugins/vimtex.lua @@ -10,12 +10,12 @@ return { "lervag/vimtex", ft = { "tex", "latex", "bib" }, config = function() - -- Use Skim on macOS (or change to your preferred PDF viewer) - vim.g.vimtex_view_method = "skim" - - -- Alternatively, use the general viewer (Preview.app) - -- vim.g.vimtex_view_method = "general" - -- vim.g.vimtex_view_general_viewer = "open" + -- PDF viewer: Skim on macOS, zathura elsewhere + if vim.fn.has("mac") == 1 then + vim.g.vimtex_view_method = "skim" + else + vim.g.vimtex_view_method = "zathura" + end -- Compiler settings vim.g.vimtex_compiler_method = "latexmk"