first pass of merging in warp (doesn't build)

crates/watcher/src/home_watcher.rs

@@ -1,8 +1,9 @@
-use galaxyui::{Entity, ModelContext, ModelHandle, SingletonEntity};
-use notify_debouncer_full::notify::{RecursiveMode, WatchFilter};
 use std::path::PathBuf;
 use std::time::Duration;
 
+use notify_debouncer_full::notify::{RecursiveMode, WatchFilter};
+use galaxyui_core::{Entity, ModelContext, ModelHandle, SingletonEntity};
+
 use crate::{BulkFilesystemWatcher, BulkFilesystemWatcherEvent};
 
 /// Duration between filesystem watch events for the home directory watcher, in milliseconds.
@@ -46,6 +47,7 @@ impl HomeDirectoryWatcher {
     /// Forwards filesystem events to home directory watcher subscribers.
     fn handle_fs_event(
         &mut self,
+        _: ModelHandle<BulkFilesystemWatcher>,
         event: &BulkFilesystemWatcherEvent,
         ctx: &mut ModelContext<Self>,
     ) {