diff --git a/.bash_profile b/.bash_profile index d8b5cf3..e621580 100644 --- a/.bash_profile +++ b/.bash_profile @@ -1,3 +1,11 @@ if [[ -f "$HOME/.bashrc" ]]; then source "$HOME/.bashrc" fi + +if [[ -f "$HOME/.cargo/env" ]]; then + source "$HOME/.cargo/env" +fi + +if [[ -f "$HOME/.nix-profile/etc/profile.d/nix.sh" ]]; then + source "$HOME/.nix-profile/etc/profile.d/nix.sh" +fi diff --git a/config.ini b/config.ini index d4e5985..b142029 100644 --- a/config.ini +++ b/config.ini @@ -26,6 +26,14 @@ files: nvim/init.vim Vundle.vim > nvim/bundle/Vundle.vim +[link-files neovim:linux] +when: host.is_linux and host.has('nvim') +target_root: ~/.config +files: + nvim/colors + nvim/lua + nvim/init.vim + [git vundle] when: host.has('vim') or host.has('nvim') repo: https://github.com/VundleVim/Vundle.vim.git diff --git a/vim/ftplugin/rust.vim b/vim/ftplugin/rust.vim index bf01b0c..c5a30ba 100644 --- a/vim/ftplugin/rust.vim +++ b/vim/ftplugin/rust.vim @@ -1,3 +1,5 @@ -nmap :Cargo run -q +nmap :Cargo run nmap :Cargo check nmap :Cargo test + +nmap :ALEGoToDefinition diff --git a/vimrc b/vimrc index ef17d6f..a926f22 100644 --- a/vimrc +++ b/vimrc @@ -478,8 +478,7 @@ if !has('nvim') let g:ale_linters = {'rust': ['analyzer']} let g:ale_fixers = {'rust': ['rustfmt', 'trim_whitespace', 'remove_trailing_lines']} let g:rustfmt_autosave = 1 - let g:ale_rust_analyzer_executable = "/home/jorelli/analyzer-spy" - let g:ale_rust_cargo_use_clippy = executable('cargo-clippy') + let g:ale_rust_cargo_use_clippy = 1 let g:ale_completion_enabled = 1 set completeopt=menu,menuone,preview,noselect,noinsert endif