fix(home): Rustup and rust-analyzer conflict

Make rust-analyzer available to neovim only instead.
This commit is contained in:
Jalil David Salamé Messina 2024-02-24 16:30:15 +01:00
parent 5f1ffe3d35
commit 40ab720cb1
2 changed files with 22 additions and 4 deletions

View file

@ -156,7 +156,6 @@ in
type = types.submodule { type = types.submodule {
options.enable = lib.mkEnableOption "rust development settings"; options.enable = lib.mkEnableOption "rust development settings";
options.extraPackages = mkExtraPackagesOption "Rust" [ options.extraPackages = mkExtraPackagesOption "Rust" [
[ "rust-analyzer" ]
[ "cargo-nextest" ] [ "cargo-nextest" ]
[ "cargo-sort" ] [ "cargo-sort" ]
[ "cargo-msrv" ] [ "cargo-msrv" ]

View file

@ -41,10 +41,29 @@ in
mappings = import ./mappings.nix; mappings = import ./mappings.nix;
augroups = import ./augroups.nix; augroups = import ./augroups.nix;
extraPlugins = extraPlugins =
(with pkgs.vimExtraPlugins; [ dressing-nvim rustaceanvim idris2-nvim nui-nvim nvim-lint ]) (with pkgs.vimExtraPlugins; [
++ (with pkgs.vimPlugins; [ lualine-lsp-progress nvim-web-devicons FTerm-nvim cmp-cmdline formatter-nvim ]); dressing-nvim
rustaceanvim
idris2-nvim
nui-nvim
nvim-lint
])
++ (with pkgs.vimPlugins; [
lualine-lsp-progress
nvim-web-devicons
FTerm-nvim
cmp-cmdline
formatter-nvim
]);
# Formatting # Formatting
extraPackages = with pkgs; [ stylua shfmt taplo yamlfmt nixpkgs-fmt ]; extraPackages = with pkgs; [
stylua
shfmt
taplo
yamlfmt
nixpkgs-fmt
rust-analyzer
];
extraLuaPreConfig = '' extraLuaPreConfig = ''
-- Lua Pre Config -- Lua Pre Config
if vim.fn.has 'termguicolors' then if vim.fn.has 'termguicolors' then