fix(home): Rustup and rust-analyzer conflict
Make rust-analyzer available to neovim only instead.
This commit is contained in:
parent
5f1ffe3d35
commit
40ab720cb1
2 changed files with 22 additions and 4 deletions
|
@ -156,7 +156,6 @@ in
|
|||
type = types.submodule {
|
||||
options.enable = lib.mkEnableOption "rust development settings";
|
||||
options.extraPackages = mkExtraPackagesOption "Rust" [
|
||||
[ "rust-analyzer" ]
|
||||
[ "cargo-nextest" ]
|
||||
[ "cargo-sort" ]
|
||||
[ "cargo-msrv" ]
|
||||
|
|
|
@ -41,10 +41,29 @@ in
|
|||
mappings = import ./mappings.nix;
|
||||
augroups = import ./augroups.nix;
|
||||
extraPlugins =
|
||||
(with pkgs.vimExtraPlugins; [ dressing-nvim rustaceanvim idris2-nvim nui-nvim nvim-lint ])
|
||||
++ (with pkgs.vimPlugins; [ lualine-lsp-progress nvim-web-devicons FTerm-nvim cmp-cmdline formatter-nvim ]);
|
||||
(with pkgs.vimExtraPlugins; [
|
||||
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
|
||||
extraPackages = with pkgs; [ stylua shfmt taplo yamlfmt nixpkgs-fmt ];
|
||||
extraPackages = with pkgs; [
|
||||
stylua
|
||||
shfmt
|
||||
taplo
|
||||
yamlfmt
|
||||
nixpkgs-fmt
|
||||
rust-analyzer
|
||||
];
|
||||
extraLuaPreConfig = ''
|
||||
-- Lua Pre Config
|
||||
if vim.fn.has 'termguicolors' then
|
||||
|
|
Loading…
Reference in a new issue