Skip to content

Commit 65aefc0

Browse files
author
Francis
committed
local mbpro nvim..
1 parent a16beb6 commit 65aefc0

File tree

4 files changed

+33
-20
lines changed

4 files changed

+33
-20
lines changed

.DS_Store

0 Bytes
Binary file not shown.

init.lua

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -763,9 +763,13 @@ require('lazy').setup({
763763
},
764764
},
765765
sourcekit = {
766-
cmd = { 'sourcekit-lsp' },
767-
filetypes = { 'swift' },
768-
settings = {},
766+
capabilities = {
767+
workspace = {
768+
didChangeWatchedFiles = {
769+
dynamicRegistration = true,
770+
},
771+
},
772+
},
769773
},
770774
-- rust_analyzer = {},
771775
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
@@ -806,9 +810,12 @@ require('lazy').setup({
806810
--
807811
-- You can add other tools here that you want Mason to install
808812
-- for you, so that they are available from within Neovim.
809-
local ensure_installed = vim.tbl_keys(servers or {})
810-
-- Remove sourcekit from ensure_installed since it's locally available
811-
ensure_installed = vim.tbl_filter(function(name) return name ~= 'sourcekit' end, ensure_installed)
813+
-- Filter out servers that aren't available through Mason
814+
local mason_servers = vim.tbl_filter(function(server_name)
815+
return server_name ~= 'sourcekit' -- sourcekit-lsp comes with Xcode, not Mason
816+
end, vim.tbl_keys(servers or {}))
817+
818+
local ensure_installed = mason_servers
812819
vim.list_extend(ensure_installed, {
813820
'stylua', -- Used to format Lua code
814821
'pyright', -- Python LSP server
@@ -830,10 +837,13 @@ require('lazy').setup({
830837
},
831838
}
832839

833-
-- Setup SourceKit-LSP separately since it's not managed by Mason
834-
local sourcekit_config = servers.sourcekit or {}
835-
sourcekit_config.capabilities = vim.tbl_deep_extend('force', {}, capabilities, sourcekit_config.capabilities or {})
836-
require('lspconfig').sourcekit.setup(sourcekit_config)
840+
-- Setup LSP servers that aren't managed by Mason
841+
local non_mason_servers = { 'sourcekit' }
842+
for _, server_name in ipairs(non_mason_servers) do
843+
local server = servers[server_name] or {}
844+
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
845+
require('lspconfig')[server_name].setup(server)
846+
end
837847
end,
838848
},
839849

lazy-lock.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
3-
"blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" },
4-
"claude-code.nvim": { "branch": "main", "commit": "275c47615f4424a0329290ce1d0c18a8320fd8b0" },
5-
"conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" },
6-
"dropbar.nvim": { "branch": "master", "commit": "b695c346fd180d504c1d135435cbcfba08ad3946" },
3+
"blink.cmp": { "branch": "main", "commit": "586ee87534f5bf65f1c8dea2d1da2a57e8cddd36" },
4+
"claude-code.nvim": { "branch": "main", "commit": "c9a31e51069977edaad9560473b5d031fcc5d38b" },
5+
"conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
6+
"dropbar.nvim": { "branch": "master", "commit": "5c3b0afdae4eeebb17497062ffad58d98b1c1c79" },
77
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
88
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
9-
"gitsigns.nvim": { "branch": "main", "commit": "88205953bd748322b49b26e1dfb0389932520dc9" },
9+
"gitsigns.nvim": { "branch": "main", "commit": "1fcaddcc427ff5802b6602f46de37a5352d0f9e0" },
1010
"kanso.nvim": { "branch": "main", "commit": "62e9c5d669567d086474b2b6863e0724c71c6c99" },
1111
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
1212
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
13-
"mason-lspconfig.nvim": { "branch": "main", "commit": "be159e939543777bbfe9e1fe5389984c4570afce" },
14-
"mason-tool-installer.nvim": { "branch": "main", "commit": "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903" },
13+
"mason-lspconfig.nvim": { "branch": "main", "commit": "bb3a17efc797c34c054463174e5522442576ebd8" },
14+
"mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
1515
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
16-
"mini.nvim": { "branch": "main", "commit": "3f5d06a6f710966cb93baaadc4897eeb6d6210e5" },
17-
"nvim-lspconfig": { "branch": "master", "commit": "9276b82935bf6b951d08c864eb5ac3f85d6b743b" },
16+
"mini.nvim": { "branch": "main", "commit": "432a0614f8dc38715892b0eec537716457ea4c2f" },
17+
"nvim-lspconfig": { "branch": "master", "commit": "f47cd681d7cb6048876a2e908b6d8ba1e530d152" },
1818
"nvim-tree.lua": { "branch": "master", "commit": "6b5b36659688767fb9f133bb83024ab1466fe5cd" },
1919
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
20-
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
20+
"nvim-web-devicons": { "branch": "master", "commit": "0422a19d9aa3aad2c7e5cca167e5407b13407a9d" },
2121
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
2222
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
2323
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },

test.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import Foundation
2+
3+
print("Hello, Swift\!")

0 commit comments

Comments
 (0)