From 3d22f2b4aa223cb36c1e41ae22e8e188450753ae 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 | 116 +++++++++--------- .../editors/neovim/plugins/rustaceanvim.nix | 76 ++++++------ 2 files changed, 97 insertions(+), 95 deletions(-) diff --git a/flake.lock b/flake.lock index 348717dc0..0d595a3f8 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": { @@ -827,11 +827,11 @@ ] }, "locked": { - "lastModified": 1718450675, - "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", + "lastModified": 1720108799, + "narHash": "sha256-AxRkTJlbB8r7aG6gvc7IaLhc2T9TO4/8uqanKRxukBQ=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", + "rev": "a5c0d57325c5f0814c39110a70ca19c070ae9486", "type": "github" }, "original": { @@ -871,11 +871,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1720380438, - "narHash": "sha256-PYS26pnocPkh0fIPzGEjKXhI7fJ5Y57D6q6NyLfxUiQ=", + "lastModified": 1720731503, + "narHash": "sha256-Qlm0IRnOrI64RW/SEvW9rA1ytVvPS1CsVvRataNvStI=", "ref": "refs/heads/main", - "rev": "22138ac259b2f4253be29311f6b60fbd675074b4", - "revCount": 4911, + "rev": "e728e56cbc6af0a9be1276b2cf8e019a894016e7", + "revCount": 4917, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -891,11 +891,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1718476555, - "narHash": "sha256-fuWpgh8KasByIJWE+xVd37Al0LV5YAn6s871T50qVY0=", + "lastModified": 1720709712, + "narHash": "sha256-78j/cY+AXoMIqqiNc1vWx237EPfpERAcYsb57ABUbwQ=", "owner": "hyprwm", "repo": "contrib", - "rev": "29a8374f4b9206d5c4af84aceb7fb5dff441ea60", + "rev": "65d42dcbfde2229a75ccdb195c318dfe241f9ade", "type": "github" }, "original": { @@ -948,11 +948,11 @@ ] }, "locked": { - "lastModified": 1714869498, - "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", + "lastModified": 1718746314, + "narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", + "rev": "1b61f0093afff20ab44d88ad707aed8bf2215290", "type": "github" }, "original": { @@ -999,11 +999,11 @@ ] }, "locked": { - "lastModified": 1717881852, - "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", + "lastModified": 1720381373, + "narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "ec6938c66253429192274d612912649a0cfe4d28", + "rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb", "type": "github" }, "original": { @@ -1070,11 +1070,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1720441506, - "narHash": "sha256-VdNE1gLPgI10lWB4DZNYY8M8QwXpZCwK6SYM6sBX+bw=", + "lastModified": 1720707332, + "narHash": "sha256-OpUjVqJIxuouqUMmOAQI63XEOVk5EYyHwFVWdyrUdC8=", "owner": "hyprwm", "repo": "Hyprlock", - "rev": "3bedae44368b1e490ff0d5a9f3fd508a4041d3a5", + "rev": "b407128caeb551ae808cf8d0fb653a252a271709", "type": "github" }, "original": { @@ -1115,11 +1115,11 @@ ] }, "locked": { - "lastModified": 1719316102, - "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", + "lastModified": 1720545076, + "narHash": "sha256-Pxacc2uoxI00koXp5+CyNqHOTQlqNlK0rlRHDBHX4+g=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", + "rev": "6174a2a25f4e216c0f1d0c4278adc23c476b1d09", "type": "github" }, "original": { @@ -1165,11 +1165,11 @@ ] }, "locked": { - "lastModified": 1719067853, - "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", + "lastModified": 1720215857, + "narHash": "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "914f083741e694092ee60a39d31f693d0a6dc734", + "rev": "d5fa094ca27e0039be5e94c0a80ae433145af8bb", "type": "github" }, "original": { @@ -1272,11 +1272,11 @@ ] }, "locked": { - "lastModified": 1720354748, - "narHash": "sha256-QyuNREH5M0FZG0iVeOB3pUABIz9kqN+a1MYLzl3978Q=", + "lastModified": 1720518322, + "narHash": "sha256-isTUoKDWTeDBN1fPuMTyPdYcTn1823LMr+Uy1wODe/0=", "owner": "nix-community", "repo": "nix-ld-rs", - "rev": "45eec25fe63b5c421c9439a743a2416a6cdea00b", + "rev": "ce02bc08397af64ba2487e229f3b67498581a884", "type": "github" }, "original": { @@ -1516,11 +1516,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "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": { @@ -2151,11 +2151,11 @@ ] }, "locked": { - "lastModified": 1720251602, - "narHash": "sha256-isr9Ht+QRuj89/0frJBEGVvm7A3yy0ml3jj57wGmiXM=", + "lastModified": 1720724512, + "narHash": "sha256-zyRSXNCXEKxlSMGanrPHh+XCk38ZYez6LUg7Vi3xN80=", "owner": "Alexays", "repo": "Waybar", - "rev": "b26ab1f982c06ce48e96f3e4da8cde034296eb1d", + "rev": "265566050984bb2364ecb72b0abd18e8868205b7", "type": "github" }, "original": { @@ -2207,11 +2207,11 @@ ] }, "locked": { - "lastModified": 1718619174, - "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", + "lastModified": 1720194466, + "narHash": "sha256-Rizg9efi6ue95zOp0MeIV2ZedNo+5U9G2l6yirgBUnA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", + "rev": "b9b97e5ba23fe7bd5fa4df54696102e8aa863cf6", "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"; + }; }; }; };