docs: resolve merge conflict, bring in latest changes

1 files changed, 20 insertions, 2 deletions

diff --git a/README.md b/README.md
index b2a36ea..c3867ef 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,19 @@
+# Lite XL plugins
 Plugins for the [Lite XL text editor](https://github.com/lite-xl/lite-xl), originally forked from the [lite plugins repository](https://github.com/rxi/lite-plugins).
 
+If you can't find a plugin that suits your needs,
+check if someone has already created an issue about it,
+otherwise feel free to create one yourself.
+
+## How to install
+To install a plugin:
+
+*   If the plugin links to a repository, follow its `README`.
+*   If the plugin is a single file, drop it directly in:
+    *   Linux `~/.config/lite-xl/plugins/`
+    *   MacOS `~/.config/lite-xl/plugins/`
+    *   Windows `C:\Users\(username)\.config\lite-xl\plugins\`
+
 *Note: if you make a pull request, the table should be updated and kept in
 alphabetical order. If your plugin is large (or you'd otherwise prefer it to
 have its own repo), the table can simply be updated to add a link to the repo;
@@ -46,6 +60,7 @@ to something other than a raw file it should be marked with an asterisk.*
 | [`indentguide`](plugins/indentguide.lua?raw=1)                                                                 | Adds indent guides *([screenshot](https://user-images.githubusercontent.com/3920290/79640716-f9860000-818a-11ea-9c3b-26d10dd0e0c0.png))*                                                                                                                                                        |
 | [`Kinc Projects`](https://github.com/Kode-Community/kinc_plugin)\*                                             | Adds [Kinc](https://github.com/Kode/Kinc) Project generation with basic build commands(depends on [`console`](https://github.com/franko/console))                                                                                                                                               |
 | [`language_angelscript`](plugins/language_angelscript.lua?raw=1)                                               | Syntax for the [Angelscript](https://www.angelcode.com/angelscript/) programming language                                                                                                                                                                                                       |
+| [`language_autohotkey`](https://github.com/devPnal/lite-plugin-autohotkey)\*                                   | Syntax for the [AutoHotkey](https://www.autohotkey.com) programming language                                                                                                                                                                                                                    |
 | [`language_batch`](plugins/language_batch.lua?raw=1)                                                           | Syntax for Windows [Batch Files](https://en.wikipedia.org/wiki/Batch_file)                                                                                                                                                                                                                      |
 | [`language_bib`](plugins/language_bib.lua?raw=1)                                                               | Syntax for [BibTex](https://en.wikipedia.org/wiki/BibTeX) files                                                                                                                                                                                                                                 |
 | [`language_cmake`](plugins/language_cmake.lua?raw=1)                                                           | Syntax for the CMake build system language                                                                                                                                                                                                                                                      |
@@ -61,7 +76,6 @@ to something other than a raw file it should be marked with an asterisk.*
 | [`language_fennel`](plugins/language_fennel.lua?raw=1)                                                         | Syntax for the [fennel](https://fennel-lang.org) programming language                                                                                                                                                                                                                           |
 | [`language_fstab`](plugins/language_fstab.lua?raw=1)                                                           | Syntax for the [fstab](https://en.wikipedia.org/wiki/Fstab) config files                                                                                                                                                                                                                        |
 | [`language_gdscript`](plugins/language_gdscript.lua?raw=1)                                                     | Syntax for the [Godot Engine](https://godotengine.org/)'s GDScript scripting language                                                                                                                                                                                                           |
-| [`language_glaz`](plugins/language_glaz.lua?raw=1)                                                             | Syntax for the [Glaz](https://github.com/glaz-lang/glaz) programming language                                                                                                                                                                                                                   |
 | [`language_glsl`](plugins/language_glsl.lua?raw=1)                                                             | Syntax for the [GLSL](https://www.khronos.org/registry/OpenGL/specs/gl/) programming language                                                                                                                                                                                                   |
 | [`language_gmi`](plugins/language_gmi.lua?raw=1)                                                               | Syntax for the [Gemtext](https://gemini.circumlunar.space/docs/gemtext.gmi) markup language                                                                                                                                                                                                     |
 | [`language_go`](plugins/language_go.lua?raw=1)                                                                 | Syntax for the [Go](https://golang.org/) programming language                                                                                                                                                                                                                                   |
@@ -93,6 +107,7 @@ to something other than a raw file it should be marked with an asterisk.*
 | [`language_psql`](plugins/language_psql.lua?raw=1)                                                             | Syntax for the postgresql database access language                                                                                                                                                                                                                                              |
 | [`language_r`](plugins/language_R.lua?raw=1)                                                                   | Syntax for [R](https://www.r-project.org/) scripting language                                                                                                                                                                                                                                   |
 | [`language_rescript`](plugins/language_rescript.lua?raw=1)                                                     | Syntax for the [ReScript](https://rescript-lang.org/) programming language                                                                                                                                                                                                                      |
+| [`language_rivet`](plugins/language_rivet.lua?raw=1)                                                           | Syntax for the [Rivet](https://github.com/rivet-lang/rivet) programming language                                                                                                                                                                                                                |
 | [`language_ruby`](plugins/language_ruby.lua?raw=1)                                                             | Syntax for the [Ruby](https://www.ruby-lang.org/) programming language                                                                                                                                                                                                                          |
 | [`language_rust`](plugins/language_rust.lua?raw=1)                                                             | Syntax for the [Rust](https://rust-lang.org/) programming language                                                                                                                                                                                                                              |
 | [`language_sass`](plugins/language_sass.lua?raw=1)                                                             | Syntax for the [Sass](https://sass-lang.com/) CSS preprocessor                                                                                                                                                                                                                                  |
@@ -115,6 +130,7 @@ to something other than a raw file it should be marked with an asterisk.*
 | [`lint+`](https://github.com/liquid600pgm/lintplus)\*                                                          | Advanced linter with ErrorLens-like error reporting. Compatible with linters made for `linter` *([screenshot](https://raw.githubusercontent.com/liquid600pgm/lintplus/master/screenshots/1.png))*                                                                                               |
 | [`linter`](https://github.com/drmargarido/linters)\*                                                           | Linters for multiple languages                                                                                                                                                                                                                                                                  |
 | [`litepresence`](https://github.com/TorchedSammy/Litepresence)\*                                               | Discord rich presence for Lite XL (display file editing in Discord)                                                                                                                                                                                                                             |
+| [`lsp`](https://github.com/lite-xl/lite-xl-lsp)\*                                                              | Provides code completion (also known as IntelliSense) using the Language Server Protocol                                                                                                                                                                                                        |
 | [`lspkind`](https://github.com/TorchedSammy/lite-xl-lspkind)\*                                                 | Completion menu kind/type icons for Lite XL LSP                                                                                                                                                                                                                                                 |
 | [`macmodkeys`](plugins/macmodkeys.lua?raw=1)                                                                   | Remaps mac modkeys `command/option` to `ctrl/alt`                                                                                                                                                                                                                                               |
 | [`markers`](plugins/markers.lua?raw=1)                                                                         | Add markers to docs and jump between them quickly *([screenshot](https://user-images.githubusercontent.com/3920290/82252149-5faaa200-9946-11ea-9199-bea2efb7ee23.png))*                                                                                                                         |
@@ -142,12 +158,14 @@ to something other than a raw file it should be marked with an asterisk.*
 | [`tabnumbers`](plugins/tabnumbers.lua?raw=1)                                                                   | Displays tab numbers from 1–9 next to their names \*([screenshot](https://user-images.githubusercontent.com/16415678/101285362-007a8500-37e5-11eb-869b-c10eb9d9d902.png))                                                                                                                       |
 | [`texcompile`](plugins/texcompile.lua?raw=1)                                                                   | Compile Tex files into PDF                                                                                                                                                                                                                                                                      |
 | [`theme16`](https://github.com/monolifed/theme16)\*                                                            | Theme manager with base16 themes                                                                                                                                                                                                                                                                |
-| [`themescheduler`](https://github.com/BenStigsen/lite-config/blob/main/plugins/themescheduler.lua?raw=1)       | Schedule themes to be used at certain times                                                                                                                                                                                                                                                     |
 | [`themeselect`](plugins/themeselect.lua?raw=1)                                                                 | Select a theme based on filename of active document                                                                                                                                                                                                                                             |
 | [`titleize`](plugins/titleize.lua?raw=1)                                                                       | Titleizes selected string (`hello world` => `Hello World`)                                                                                                                                                                                                                                      |
 | [`todotreeview`](https://github.com/drmargarido/TodoTreeView)\*                                                | Todo tree viewer for annotations in code like `TODO`, `BUG`, `FIX`, `IMPROVEMENT`                                                                                                                                                                                                               |
 | [`togglesnakecamel`](plugins/togglesnakecamel.lua?raw=1)                                                       | Toggles symbols between `snake_case` and `camelCase`                                                                                                                                                                                                                                            |
+| [`treeview-menu-extender`](https://github.com/juliardi/lite-xl-treeview-menu-extender)\*                       | Extend Lite XL's treeview menu *([screenshot](https://raw.githubusercontent.com/juliardi/lite-xl-treeview-menu-extender/main/screenshot.png))*                                                                                                                                                  |
+| [`typingspeed`](plugins/typingspeed.lua?raw=1)                                                                 | Displays your current typing speed in characters and words per minute in the status bar                                                                                                                                                                                                         |
 | [`unboundedscroll`](plugins/unboundedscroll.lua?raw=1)                                                         | Allows scrolling outside the bounds of a document                                                                                                                                                                                                                                               |
 | [`updatechecker`](https://github.com/vincens2005/lite-xl-updatechecker)\*                                      | Automatically checks for updates and notifies you                                                                                                                                                                                                                                               |
 | [`vibe`](https://github.com/eugenpt/lite-xl-vibe)\*                                                            | VI(vim?) bindings with a hint of DOOM Emacs, for lite-xl                                                                                                                                                                                                                                        |
 | [`visu`](https://github.com/TorchedSammy/Visu)\*                                                               | Audio visualizer for Lite XL                                                                                                                                                                                                                                                                    |
+| [`widget`](https://github.com/lite-xl/lite-xl-widgets)\*                                                       | Plugin library that provides a set of re-usable components to more easily write UI elements for your plugins                                                                                                                                                                                    |