diff --git a/flake.lock b/flake.lock index 962c339..9e1867a 100644 --- a/flake.lock +++ b/flake.lock @@ -374,11 +374,11 @@ }, "nixos": { "locked": { - "lastModified": 1655096306, - "narHash": "sha256-3B3zBaQVLL956deZgmucouvkZroObQ4JKHzbIfFS9/c=", + "lastModified": 1655200170, + "narHash": "sha256-/yzkX+10sJhYNIcTtZ5ObS+nh/HrJp01XLaubzbRDcU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a119e218ad27bea32057a3463e3694a61c9e3802", + "rev": "9ff91ce2e4c5d70551d4c8fd8830931c6c6b26b8", "type": "github" }, "original": { diff --git a/overlays/overrides.nix b/overlays/overrides.nix index e71e59d..d65eedb 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -26,6 +26,7 @@ in polymc lutris sumneko-lua-language-server + rust-analyzer cargo-crev cargo-fuzz tdesktop diff --git a/profiles/rust/default.nix b/profiles/rust/default.nix index 0ad85ba..a661ac4 100644 --- a/profiles/rust/default.nix +++ b/profiles/rust/default.nix @@ -2,7 +2,6 @@ { environment.systemPackages = with pkgs; [ fenix.latest.toolchain - rust-analyzer cargo-edit cargo-crev cargo-watch diff --git a/users/profiles/neovim/default.nix b/users/profiles/neovim/default.nix index 8c245b0..95cdf93 100644 --- a/users/profiles/neovim/default.nix +++ b/users/profiles/neovim/default.nix @@ -159,7 +159,7 @@ "typescript" ]; "prettier.useTabs" = true; - "rust-analyzer.server.path" = "${pkgs.fenix.rust-analyzer}/bin/rust-analyzer"; + "rust-analyzer.server.path" = "${pkgs.rust-analyzer-nightly}/bin/rust-analyzer"; "rust-analyzer.updates.prompt" = false; "rust-analyzer.updates.checkOnStartup" = false; "rust-analyzer.cargo.loadOutDirsFromCheck" = true;