diff --git a/flake.lock b/flake.lock index 6ea829e..7f7ec85 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1762359884, - "narHash": "sha256-0+KyxOh7WUm6rRLfb936X48qBhYL5aRYn2OBEj4G1/s=", + "lastModified": 1762968852, + "narHash": "sha256-62HfxIbUe2b4yGgC/sHFRbFo2pzNs0KFS6Pn6S1xbkA=", "owner": "Saghen", "repo": "blink.cmp", - "rev": "40380e711b616a28affb0f4086a2f7de2f2a556b", + "rev": "de573225b473eb053c356b2c2f5d65aead24b66d", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762596750, - "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { @@ -126,30 +126,12 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, - "nordic-nvim-src": { - "flake": false, - "locked": { - "lastModified": 1676228565, - "narHash": "sha256-u/QNfWt45XXaDeiycT0VfLLrVS360u76up4axcX/ZOU=", - "owner": "andersevenrud", - "repo": "nordic.nvim", - "rev": "3338c514e5b5feade29a9c2ed295c9f034f7f05b", - "type": "github" - }, - "original": { - "owner": "andersevenrud", - "ref": "pull/93/head", - "repo": "nordic.nvim", - "type": "github" - } - }, "root": { "inputs": { "blink-cmp": "blink-cmp", "go-grip": "go-grip", "mdfmt": "mdfmt", - "nixpkgs": "nixpkgs", - "nordic-nvim-src": "nordic-nvim-src" + "nixpkgs": "nixpkgs" } }, "rust-analyzer-src": { diff --git a/lua/dot013/plugins/lsp.lua b/lua/dot013/plugins/lsp.lua index 222c57f..f4c8333 100644 --- a/lua/dot013/plugins/lsp.lua +++ b/lua/dot013/plugins/lsp.lua @@ -63,19 +63,22 @@ return { { "nvim-lspconfig", after = function() - for k, v in pairs(lsps) do - if type(v) == "function" then - v = v() + local blink = require("blink.cmp") + for server, config in pairs(lsps) do + if type(config) == "function" then + config = config() end - if v == nil then + if config == nil then return end - v.capabilities = require("blink.cmp").get_lsp_capabilities(v.capabilities) + -- config.capabilities = blink.get_lsp_capabilities(config.capabilities) - vim.lsp.enable(k) - vim.lsp.config(k, v) + vim.lsp.enable(server) + if next(config) ~= nil then + vim.lsp.config(server, config) + end end vim.diagnostic.config({