diff --git a/srcpkgs/zed/patches/0001-tweak-default-conf-for-privacy.patch b/srcpkgs/zed/patches/0001-tweak-default-conf-for-privacy.patch index 29daea6..9b577c1 100644 --- a/srcpkgs/zed/patches/0001-tweak-default-conf-for-privacy.patch +++ b/srcpkgs/zed/patches/0001-tweak-default-conf-for-privacy.patch @@ -1,85 +1,85 @@ -diff --git a/assets/settings/default.json b/assets/settings/default.json -index e7005177..c864db10 100644 ---- a/assets/settings/default.json +diff --git a/assets/settings/default.json.old b/assets/settings/default.json +index 0ab3b1d9..d7b88b41 100644 +--- a/assets/settings/default.json.old +++ b/assets/settings/default.json @@ -25,8 +25,10 @@ - "base_keymap": "VSCode", - // Features that can be globally enabled or disabled - "features": { -+ // Disables copilot by default -+ "copilot": false, - // Which inline completion provider to use. -- "inline_completion_provider": "copilot" -+ "inline_completion_provider": "none" - }, - // The name of a font to use for rendering text in the editor - "buffer_font_family": "Zed Mono", + "base_keymap": "VSCode", + // Features that can be globally enabled or disabled + "features": { ++ // Disables copilot by default ++ "copilot": false, + // Which inline completion provider to use. +- "inline_completion_provider": "copilot" ++ "inline_completion_provider": "none" + }, + // The name of a font to use for rendering text in the editor + "buffer_font_family": "Zed Mono", @@ -335,7 +337,7 @@ - // Version of this setting. - "version": "1", - // Whether the assistant is enabled. -- "enabled": true, -+ "enabled": false, - // Whether to show the assistant panel button in the status bar. - "button": true, - // Where to dock the assistant panel. Can be 'left', 'right' or 'bottom'. + // Version of this setting. + "version": "1", + // Whether the assistant is enabled. +- "enabled": true, ++ "enabled": false, + // Whether to show the assistant panel button in the status bar. + "button": true, + // Where to dock the assistant panel. Can be 'left', 'right' or 'bottom'. @@ -458,13 +460,13 @@ - // Control what info is collected by Zed. - "telemetry": { - // Send debug info like crash reports. -- "diagnostics": true, -+ "diagnostics": false, - // Send anonymized usage data like what languages you're using Zed with. -- "metrics": true -+ "metrics": false - }, - // Automatically update Zed. This setting may be ignored on Linux if - // installed through a package manager. -- "auto_update": true, -+ "auto_update": false, - // Diagnostics configuration. - "diagnostics": { - // Whether to show warnings or not by default. + // Control what info is collected by Zed. + "telemetry": { + // Send debug info like crash reports. +- "diagnostics": true, ++ "diagnostics": false, + // Send anonymized usage data like what languages you're using Zed with. +- "metrics": true ++ "metrics": false + }, + // Automatically update Zed. This setting may be ignored on Linux if + // installed through a package manager. +- "auto_update": true, ++ "auto_update": false, + // Diagnostics configuration. + "diagnostics": { + // Whether to show warnings or not by default. @@ -513,7 +515,7 @@ - // May take 2 values: - // 1. hour12 - // 2. hour24 -- "hour_format": "hour12" -+ "hour_format": "hour24" - }, - // Settings specific to the terminal - "terminal": { -diff --git a/assets/settings/initial_user_settings.json b/assets/settings/initial_user_settings.json -index f42e7778..3cc3c23d 100644 ---- a/assets/settings/initial_user_settings.json + // May take 2 values: + // 1. hour12 + // 2. hour24 +- "hour_format": "hour12" ++ "hour_format": "hour24" + }, + // Settings specific to the terminal + "terminal": { +diff --git a/assets/settings/initial_user_settings.json.old b/assets/settings/initial_user_settings.json +index 75d4a026..53b0a30d 100644 +--- a/assets/settings/initial_user_settings.json.old +++ b/assets/settings/initial_user_settings.json @@ -9,4 +9,29 @@ { - "ui_font_size": 16, - "buffer_font_size": 16 + "ui_font_size": 16, + "buffer_font_size": 16 + -+ // The following settings have been changed from the upstream defaults to -+ // improve security and privacy. Here are the upstream defaults, you can -+ // uncomment them if you like. -+ // -+ // "features": { -+ // // Enable copilot (provided by an online service). -+ // "copilot": true, -+ // "inline_completion_provider": "copilot" -+ // }, -+ // "assistant": { -+ // "version": "1", -+ // // Enable the assistant (provided by an online service). -+ // "enabled": true -+ // }, -+ // "telemetry": { -+ // // Send debug info like crash reports to Zed Industries. -+ // "diagnostics": true, -+ // // Send anonymized usage data like what languages you're using Zed with -+ // // to Zed Industries. -+ // "metrics": true -+ // }, -+ // "journal": { -+ // "hour_format": "hour12" -+ // } ++ // The following settings have been changed from the upstream defaults to ++ // improve security and privacy. Here are the upstream defaults, you can ++ // uncomment them if you like. ++ // ++ // "features": { ++ // // Enable copilot (provided by an online service). ++ // "copilot": true, ++ // "inline_completion_provider": "copilot" ++ // }, ++ // "assistant": { ++ // "version": "1", ++ // // Enable the assistant (provided by an online service). ++ // "enabled": true ++ // }, ++ // "telemetry": { ++ // // Send debug info like crash reports to Zed Industries. ++ // "diagnostics": true, ++ // // Send anonymized usage data like what languages you're using Zed with ++ // // to Zed Industries. ++ // "metrics": true ++ // }, ++ // "journal": { ++ // "hour_format": "hour12" ++ // } } diff --git a/srcpkgs/zed/template b/srcpkgs/zed/template index b970eda..daf043c 100644 --- a/srcpkgs/zed/template +++ b/srcpkgs/zed/template @@ -24,4 +24,4 @@ post_install() { APP_NAME="Zed" DO_STARTUP_NOTIFY="true" APP_ICON="zed" envsubst < ${wrksrc}/crates/zed/resources/zed.desktop.in > ${wrksrc}/crates/zed/resources/zed.desktop vinstall ${wrksrc}/crates/zed/resources/zed.desktop 644 usr/share/applications/ vinstall ${wrksrc}/crates/zed/resources/app-icon.png 644 usr/share/icons/hicolor/512x512/apps/ zed.png -} \ No newline at end of file +}