From 80093ebbce70cef0cec4f7da4293712ae77281fb Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 11 Jul 2024 19:14:33 -0500 Subject: [PATCH] flake.lock: update --- flake.lock | 42 +++++----- .../editors/neovim/plugins/rustaceanvim.nix | 76 ++++++++++--------- 2 files changed, 60 insertions(+), 58 deletions(-) diff --git a/flake.lock b/flake.lock index 348717dc0..3d575a3f8 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1720391255, - "narHash": "sha256-XRP6eTFF5SqzBErR0T1iD/WFjb+VoFY4MXKm7UUfuTM=", + "lastModified": 1720472194, + "narHash": "sha256-CYscFEts6tyvosc1T29nxhzIYJAj/1CCEkV3ZMzSN/c=", "owner": "catppuccin", "repo": "nix", - "rev": "59d0579264239b3b6a15decf6ec762d92dfd0323", + "rev": "d75d5803852fb0833767dc969a4581ac13204e22", "type": "github" }, "original": { @@ -112,11 +112,11 @@ ] }, "locked": { - "lastModified": 1720337362, - "narHash": "sha256-9TNQtlwu97NPaJYsKkdObOsy0MLN4NAOBz0pqwH3KnA=", + "lastModified": 1720599442, + "narHash": "sha256-jdm+sKVbBXoyrxcHbVaV0htlpq2iFR+eJw3Xe/DPcDo=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0f89b73f41eaa1dde67b291452c181d9a75f10dd", + "rev": "cf297a8d248db6a455b60133f6c0029c04ebe50e", "type": "github" }, "original": { @@ -756,11 +756,11 @@ ] }, "locked": { - "lastModified": 1720327769, - "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=", + "lastModified": 1720734513, + "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71", + "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "type": "github" }, "original": { @@ -1590,11 +1590,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1720447788, - "narHash": "sha256-RXITat3fOV3+9mn5z1YwhinQrj+qhumK5kGA+pYS4+4=", + "lastModified": 1720735595, + "narHash": "sha256-TX7PZY80h22+i01d2M1/50gfdzbvqYpmE7+s13FJnJ4=", "owner": "nix-community", "repo": "nixvim", - "rev": "97fa47376b73d774b081c8e5dd54fcfd0ad278cb", + "rev": "53e85da2409ddfeef27e8cdc9c020433614329f9", "type": "github" }, "original": { @@ -1657,11 +1657,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", + "lastModified": 1720524665, + "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", "type": "github" }, "original": { @@ -1845,11 +1845,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1720321395, - "narHash": "sha256-kcI8q9Nh8/CSj0ygfWq1DLckHl8IHhFarL8ie6g7OEk=", + "lastModified": 1720479166, + "narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c184aca4db5d71c3db0c8cbfcaaec337a5d065ea", + "rev": "67035a355b1d52d2d238501f8cc1a18706979760", "type": "github" }, "original": { @@ -1866,11 +1866,11 @@ ] }, "locked": { - "lastModified": 1720440314, - "narHash": "sha256-SddhDFFoU8gHCdI9IJ2rmf6FOUleDTwN4qtOXm2QaW8=", + "lastModified": 1720671189, + "narHash": "sha256-mV9V19JmBqMYT3JYatskF7jCP0DsZRwpPvWdOiK8gNQ=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "3823c630dd5b3c145541669d7334f999cab12736", + "rev": "4debee7f160b746f6262285130ca533ef22ee024", "type": "github" }, "original": { diff --git a/modules/home/programs/terminal/editors/neovim/plugins/rustaceanvim.nix b/modules/home/programs/terminal/editors/neovim/plugins/rustaceanvim.nix index 2fb4fabb3..e101c9c8c 100644 --- a/modules/home/programs/terminal/editors/neovim/plugins/rustaceanvim.nix +++ b/modules/home/programs/terminal/editors/neovim/plugins/rustaceanvim.nix @@ -14,49 +14,51 @@ }; server = { - settings = { - cargo = { - buildScripts.enable = true; - features = "all"; - }; + default_settings = { + rust-analyzer = { + cargo = { + buildScripts.enable = true; + features = "all"; + }; - diagnostics = { - enable = true; - styleLints.enable = true; - }; + diagnostics = { + enable = true; + styleLints.enable = true; + }; - checkOnSave = true; - check = { - command = "clippy"; - features = "all"; - }; + checkOnSave = true; + check = { + command = "clippy"; + features = "all"; + }; - files = { - excludeDirs = [ - ".cargo" - ".direnv" - ".git" - "node_modules" - "target" - ]; - }; + files = { + excludeDirs = [ + ".cargo" + ".direnv" + ".git" + "node_modules" + "target" + ]; + }; - inlayHints = { - bindingModeHints.enable = true; - closureStyle = "rust_analyzer"; - closureReturnTypeHints.enable = "always"; - discriminantHints.enable = "always"; - expressionAdjustmentHints.enable = "always"; - implicitDrops.enable = true; - lifetimeElisionHints.enable = "always"; - rangeExclusiveHints.enable = true; - }; + inlayHints = { + bindingModeHints.enable = true; + closureStyle = "rust_analyzer"; + closureReturnTypeHints.enable = "always"; + discriminantHints.enable = "always"; + expressionAdjustmentHints.enable = "always"; + implicitDrops.enable = true; + lifetimeElisionHints.enable = "always"; + rangeExclusiveHints.enable = true; + }; - procMacro = { - enable = true; - }; + procMacro = { + enable = true; + }; - rustc.source = "discover"; + rustc.source = "discover"; + }; }; }; };