Merge branch 'master' into fix--adds-factorio-blueprint-file

lra · Nov 4, 2023 · 0c22915 · 0c22915
2 parents 98d2375 + f018c54
commit 0c22915
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## WIP
 
 - Updated support for Factorio (via @jpuris)
+- Added support for Zed (via @sethherr)
 - Updated support for IntelliJIdea version 2023.1 and 2023.2
 - Updated support for CLion version 2023.1 and 2023.2
 - Updated support for DataGrip version 2023.1 and 2023.2

diff --git a/README.md b/README.md
@@ -719,6 +719,7 @@ See the [README](doc/README.md) file in the doc directory for more info.
 - [Yummy FTP](http://www.yummysoftware.com/)
 - [zabbix-cli](https://github.com/usit-gd/zabbix-cli)
 - [zathura](https://pwmt.org/projects/zathura/)
+- [zed](https://zed.dev/)
 - [Zoom](http://zoom.com/)
 - [zoxide](https://github.com/ajeetdsouza/zoxide)
 - [Zsh](http://zsh.sourceforge.net/)

diff --git a/mackup/applications/zed.cfg b/mackup/applications/zed.cfg
@@ -0,0 +1,6 @@
+[application]
+name = Zed
+
+[xdg_configuration_files]
+zed/keymap.json
+zed/settings.json