diff --git a/flake.lock b/flake.lock index 31eb36767f..6b4e7cc8c7 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751786137, - "narHash": "sha256-lIlUKVGCGsh0Q2EA7/6xRtKUZjaQ/ur8uUyY+MynHXQ=", + "lastModified": 1752077645, + "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ceb24d94c6feaa4e8737a8e2bd3cf71c3a7eaaa0", + "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", "type": "github" }, "original": { diff --git a/flake/dev/flake.lock b/flake/dev/flake.lock index b199d9e4ea..938694faa5 100644 --- a/flake/dev/flake.lock +++ b/flake/dev/flake.lock @@ -2,11 +2,11 @@ "nodes": { "dev-nixpkgs": { "locked": { - "lastModified": 1751786137, - "narHash": "sha256-lIlUKVGCGsh0Q2EA7/6xRtKUZjaQ/ur8uUyY+MynHXQ=", + "lastModified": 1752077645, + "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ceb24d94c6feaa4e8737a8e2bd3cf71c3a7eaaa0", + "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", "type": "github" }, "original": { @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1751824240, - "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", + "lastModified": 1752402455, + "narHash": "sha256-mCHfZhQKdTj2JhCFcqfOfa3uKZbwUkPQbd0/zPnhOE8=", "owner": "nix-community", "repo": "home-manager", - "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", + "rev": "bf893ad4cbf46610dd1b620c974f824e266cd1df", "type": "github" }, "original": { @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1750931469, - "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", + "lastModified": 1752055615, + "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", + "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", "type": "github" }, "original": { diff --git a/generated/rust-analyzer.nix b/generated/rust-analyzer.nix index 0117f07735..9a2a704f18 100644 --- a/generated/rust-analyzer.nix +++ b/generated/rust-analyzer.nix @@ -28,6 +28,15 @@ ]; }; }; + "rust-analyzer.assist.preferSelf" = { + description = '' + When inserting a type (e.g. in "fill match arms" assist), prefer to use `Self` over the type name where possible. + ''; + pluginDefault = false; + type = { + kind = "boolean"; + }; + }; "rust-analyzer.assist.termSearch.borrowcheck" = { description = '' Enable borrow checking for term search code assists. If set to false, also there will be more suggestions, but some of them may not borrow-check. @@ -896,6 +905,15 @@ ]; }; }; + "rust-analyzer.highlightRelated.branchExitPoints.enable" = { + description = '' + Enables highlighting of related return values while the cursor is on any `match`, `if`, or match arm arrow (`=>`). + ''; + pluginDefault = true; + type = { + kind = "boolean"; + }; + }; "rust-analyzer.highlightRelated.breakPoints.enable" = { description = '' Enables highlighting of related references while the cursor is on `break`, `loop`, `while`, or `for` keywords. @@ -2305,7 +2323,11 @@ }; "rust-analyzer.workspace.symbol.search.excludeImports" = { description = '' - Exclude imports from symbol search. + Exclude all imports from workspace symbol search. + + In addition to regular imports (which are always excluded), + this option removes public imports (better known as re-exports) + and removes imports that rename the imported symbol. ''; pluginDefault = false; type = { diff --git a/tests/test-sources/modules/clipboard.nix b/tests/test-sources/modules/clipboard.nix index 83c253a51e..fe2bbfa885 100644 --- a/tests/test-sources/modules/clipboard.nix +++ b/tests/test-sources/modules/clipboard.nix @@ -1,3 +1,4 @@ +{ pkgs, ... }: { example-with-str = { clipboard = { @@ -21,7 +22,9 @@ example-with-raw-lua = { clipboard = { register.__raw = ''vim.env.SSH_TTY and "" or "unnamedplus"''; - providers.wl-copy.enable = true; + + # wl-copy is only available on linux + providers.wl-copy.enable = pkgs.stdenv.hostPlatform.isLinux; }; }; } diff --git a/tests/test-sources/plugins/by-name/clipboard-image/default.nix b/tests/test-sources/plugins/by-name/clipboard-image/default.nix index 159a19b1ef..af4e048b40 100644 --- a/tests/test-sources/plugins/by-name/clipboard-image/default.nix +++ b/tests/test-sources/plugins/by-name/clipboard-image/default.nix @@ -1,4 +1,7 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: +let + inherit (pkgs.stdenv) hostPlatform; +in { empty = { plugins.clipboard-image = { @@ -11,7 +14,10 @@ plugins.clipboard-image = { enable = true; - clipboardPackage = pkgs.wl-clipboard; + clipboardPackage = lib.mkMerge [ + (lib.mkIf hostPlatform.isLinux pkgs.wl-clipboard) + (lib.mkIf hostPlatform.isDarwin pkgs.pngpaste) + ]; settings = { default = { img_dir = "img"; diff --git a/version-info.toml b/version-info.toml index c20271ada0..f64761686d 100644 --- a/version-info.toml +++ b/version-info.toml @@ -1,6 +1,6 @@ # DO NOT MODIFY! # This file was generated by ci/version-info/default.nix -nixpkgs_rev = "ceb24d94c6feaa4e8737a8e2bd3cf71c3a7eaaa0" +nixpkgs_rev = "be9e214982e20b8310878ac2baa063a961c1bdf6" release = "25.11" unstable = true