From 329d73385db2bdf091cb2f6a85e59b4608a0d503 Mon Sep 17 00:00:00 2001 From: "Gustavo \"Guz\" L de Mello" Date: Sun, 9 Nov 2025 12:39:16 -0300 Subject: [PATCH] chore(deps): update dependencies --- flake.lock | 44 +++++++++++++++++++++++++++----------- flake.nix | 11 +++++----- lua/dot013/plugins/lsp.lua | 4 ++-- 3 files changed, 39 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 482be1e..6ea829e 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1756548623, - "narHash": "sha256-p52cyY7LYaroc3P0ag4JOtfEVHrChRuKwOdiSEL0TN0=", + "lastModified": 1762359884, + "narHash": "sha256-0+KyxOh7WUm6rRLfb936X48qBhYL5aRYn2OBEj4G1/s=", "owner": "Saghen", "repo": "blink.cmp", - "rev": "7b0548e5103e295f465be00b1bb7770c548776c1", + "rev": "40380e711b616a28affb0f4086a2f7de2f2a556b", "type": "github" }, "original": { @@ -31,11 +31,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1747032090, - "narHash": "sha256-htgrHIR/P7V8WeRW/XDWJHXBzbTSWCDYZHsxPAzDuUY=", + "lastModified": 1761028747, + "narHash": "sha256-UqCbRuqnsVURCB0hLZL9SwFNDNftIE1Zxj7Ykf1aRj4=", "owner": "nix-community", "repo": "fenix", - "rev": "1436bb8b85b35ca3ba64ad97df31a3b23c7610a3", + "rev": "1dd37dd710195936f675eb0d36cf284806f99a94", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756386758, - "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", + "lastModified": 1762596750, + "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", + "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "type": "github" }, "original": { @@ -126,22 +126,40 @@ "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" + "nixpkgs": "nixpkgs", + "nordic-nvim-src": "nordic-nvim-src" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1746889290, - "narHash": "sha256-h3LQYZgyv2l3U7r+mcsrEOGRldaK0zJFwAAva4hV/6g=", + "lastModified": 1760976639, + "narHash": "sha256-v+teOfOLbR9UFLuaMfbsd/L5ckJBcQJyeFj23V3lz8g=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "2bafe9d96c6734aacfd49e115f6cf61e7adc68bc", + "rev": "4a305f565ab964caf22dc72980a44b2970a9c2f1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a89ebc1..04294f3 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ in f { inherit pkgs; - inherit (pkgs) lib; + inherit (pkgs) lib stdenv; } ); in { @@ -44,20 +44,21 @@ { pkgs, lib, + stdenv, ... }: { neovim = import ./package.nix { inherit pkgs lib; - blink-cmp = inputs.blink-cmp.packages.${pkgs.system}.default; - go-grip = inputs.go-grip.packages.${pkgs.system}.default; - mdfmt = self.packages.${pkgs.system}.mdfmt; + blink-cmp = inputs.blink-cmp.packages.${stdenv.hostPlatform.system}.default; + go-grip = inputs.go-grip.packages.${stdenv.hostPlatform.system}.default; + mdfmt = self.packages.${stdenv.hostPlatform.system}.mdfmt; }; mdfmt = pkgs.buildGoModule { name = "mdfmt"; src = inputs.mdfmt; vendorHash = "sha256-JtYvDgjUoEc1Mp7Eq8lbu9jWI+RR9yBo4ujGY+J70J4="; }; - default = self.packages."${pkgs.system}".neovim; + default = self.packages."${stdenv.hostPlatform.system}".neovim; } ); devShells = forAllSystems ( diff --git a/lua/dot013/plugins/lsp.lua b/lua/dot013/plugins/lsp.lua index ca30b21..ccd707e 100644 --- a/lua/dot013/plugins/lsp.lua +++ b/lua/dot013/plugins/lsp.lua @@ -63,7 +63,6 @@ return { { "nvim-lspconfig", after = function() - local lsp = require("lspconfig") for k, v in pairs(lsps) do if type(v) == "function" then v = v() @@ -75,7 +74,8 @@ return { v.capabilities = require("blink.cmp").get_lsp_capabilities(v.capabilities) - lsp[k].setup(v) + vim.lsp.enable(k) + vim.lsp.config(k, v) end vim.diagnostic.config({