diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs index 05c961c4cf..edd3da101c 100644 --- a/crates/fs/src/fs.rs +++ b/crates/fs/src/fs.rs @@ -301,8 +301,6 @@ impl Fs for RealFs { .configure(Config::default().with_poll_interval(latency)) .unwrap(); - //TODO: unblock this - #[cfg(not(target_os = "linux"))] watcher .watch(path, notify::RecursiveMode::Recursive) .unwrap(); diff --git a/script/linux b/script/linux index 7a3865bce1..209c254f1b 100755 --- a/script/linux +++ b/script/linux @@ -1,8 +1,15 @@ -#!/usr/bin/env bash +#!/usr/bin/bash -e # if not on Linux, do nothing [[ $(uname) == "Linux" ]] || exit 0 +# Copy settings and keymap to the user's home directory if they don't exist +mkdir -p "$HOME/.config/zed" +test -f "$HOME/.config/zed/settings.json" || + cp -uL ./assets/settings/initial_user_settings.json "$HOME/.config/zed/settings.json" +test -f "$HOME/.config/zed/keymap.json" || + cp -uL ./assets/keymaps/default.json "$HOME/.config/zed/keymap.json" + # if sudo is not installed, define an empty alias maysudo=$(command -v sudo || true) export maysudo