diff --git a/home/editors/helix/default.nix b/home/editors/helix/default.nix index df97a7f..3e1cee4 100644 --- a/home/editors/helix/default.nix +++ b/home/editors/helix/default.nix @@ -12,6 +12,11 @@ cargo.buildScripts.enable = true; checkOnSave.command = "clippy"; procMacro.enable = true; + procMacro.ignored = { + # cfg_eval can cause types to be unavailable + core = [ "cfg_eval" ]; + cfg_eval = [ "cfg_eval" ]; + }; }; } { diff --git a/home/editors/neovim/lsp/lsp.lua b/home/editors/neovim/lsp/lsp.lua index b2ed61a..2baf1b0 100644 --- a/home/editors/neovim/lsp/lsp.lua +++ b/home/editors/neovim/lsp/lsp.lua @@ -119,7 +119,14 @@ config.rust_analyzer.setup { ["rust-analyzer"] = { cargo = { buildScripts = { enable = true } }, checkOnSave = { command = "clippy" }, - procMacro = { enable = true }, + procMacro = { + enable = true, + ignored = { + -- cfg_eval can cause types to be unavailable + core = { "cfg_eval" }, + cfg_eval = { "cfg_eval" }, + }, + }, }, }, } diff --git a/home/shell/nushell.nix b/home/shell/nushell.nix index 44700bc..5988934 100644 --- a/home/shell/nushell.nix +++ b/home/shell/nushell.nix @@ -9,7 +9,7 @@ in { enable = true; package = pkgs.unstable.nushell; configFile.text = '' - let-env config = { + $env.config = { edit_mode: "vi" show_banner: false } diff --git a/home/shell/starship.nix b/home/shell/starship.nix index b564693..b8c9cdc 100644 --- a/home/shell/starship.nix +++ b/home/shell/starship.nix @@ -14,6 +14,6 @@ # kitty/neovim don't play well with multi-width emojis nix_shell.symbol = " "; }; - enableNushellIntegration = true; + # enableNushellIntegration = true; }; }