diff --git a/.config/Code/User/settings.json b/.config/Code/User/settings.json index 46d1d575..bae25c3b 100644 --- a/.config/Code/User/settings.json +++ b/.config/Code/User/settings.json @@ -9,5 +9,13 @@ "rust.cargoPath": "/home/cyryl/.cargo/bin/cargo", "rust.cargoHome": "/home/cyryl/.cargo/", "editor.wordWrap": true, - "vim.disableAnnoyingNeovimMessage": true + "vim.disableAnnoyingNeovimMessage": true, + "rust.rustup": { + "toolchain": "nightly-x86_64-unknown-linux-gnu", + "nightlyToolchain": "nightly-x86_64-unknown-linux-gnu" + }, + "rust.mode": "rls", + "rust.rls": { + "useRustfmt": true + } } \ No newline at end of file diff --git a/common/configure_fresh_system.sh b/common/configure_fresh_system.sh index 14a8549a..0f10f38f 100755 --- a/common/configure_fresh_system.sh +++ b/common/configure_fresh_system.sh @@ -57,6 +57,7 @@ mkdir -p ~/.config/vdirsyncer/ ln -vfs "$DIR/.config/vdirsyncer/config" ~/.config/vdirsyncer/ mkdir -p ~/.config/Code/User ln -vfs "$DIR/.config/Code/User/settings.json" ~/.config/Code/User/settings.json +ln -vfs "$DIR/.config/Code/User/keybindings.json" ~/.config/Code/User/keybindings.json source ~/.setenv @@ -109,19 +110,8 @@ if [[ -z $NORUST ]]; then set +e cargo install cargo-update rustfmt racer rustsym ripgrep - - cd "$DIR/../" - if [[ ! -d alacritty ]]; then - git clone https://github.com/jwilm/alacritty.git --recursive - cd alacritty - else - cd alacritty - git pull - git submodule update --init --recursive - fi - rustup override set stable - cargo install -set -e + rustup run nightly cargo install clippy + set -e fi set +e