Merge branch 'master' of github.com:helix-editor/helix into line_ending_detection

Rebasing was making me manually fix conflicts on every commit, so
merging instead.

5 files changed, 1 insertions, 150 deletions

diff --git a/contrib/themes b/contrib/themes
new file mode 120000
index 00000000..d09bf827
--- /dev/null
+++ b/contrib/themes
@@ -0,0 +1 @@
+../runtime/themes
\ No newline at end of file
diff --git a/contrib/themes/README.md b/contrib/themes/README.md
deleted file mode 100644
index 1c9c5ae9..00000000
--- a/contrib/themes/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# User submitted themes
-
-If you submit a theme, please include a comment at the top with your name and email address:
-
-```toml
-# Author : Name <email@my.domain>
-```
-
-We have a preview page for themes on our [wiki](https://github.com/helix-editor/helix/wiki/Themes)!
diff --git a/contrib/themes/bogster.toml b/contrib/themes/bogster.toml
deleted file mode 100644
index 43b422f3..00000000
--- a/contrib/themes/bogster.toml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Author : Wojciech Kępka <wojciech@wkepka.dev>
-
-"attribute" = "#dc7759"
-"keyword" = { fg = "#dcb659", modifiers = ["bold"] }
-"keyword.directive" = "#dcb659"
-"namespace" = "#d32c5d"
-"punctuation" = "#dc7759"
-"punctuation.delimiter" = "#dc7759"
-"operator" = { fg = "#dc7759", modifiers = ["bold"] }
-"special" = "#7fdc59"
-"property" = "#c6b8ad"
-"variable" = "#c6b8ad"
-"variable.parameter" = "#c6b8ad"
-"type" = "#dc597f"
-"type.builtin" = { fg = "#d32c5d", modifiers = ["bold"] }
-"constructor" = "#dc597f"
-"function" = "#59dcd8"
-"function.macro" = { fg = "#dc7759", modifiers = ["bold"] }
-"function.builtin" = { fg = "#59dcd8", modifiers = ["bold"] }
-"comment" = "#627d9d"
-"variable.builtin" = "#c6b8ad"
-"constant" = "#59dcb7"
-"constant.builtin" = "#59dcb7"
-"string" = "#59dcb7"
-"number" = "#59c0dc"
-"escape" = { fg = "#7fdc59", modifiers = ["bold"] }
-"label" = "#59c0dc"
-
-"module" = "#d32c5d"
-
-"ui.background" = { bg = "#161c23" }
-"ui.linenr" = { fg = "#415367" }
-"ui.linenr.selected" = { fg = "#e5ded6" }  # TODO
-"ui.statusline" = { fg = "#e5ded6", bg = "#232d38" }
-"ui.statusline.inactive" = { fg = "#c6b8ad", bg = "#232d38" }
-"ui.popup" = { bg = "#232d38" }
-"ui.window" = { bg = "#232d38" }
-"ui.help" = { bg = "#232d38", fg = "#e5ded6" }
-
-"ui.text" = { fg = "#e5ded6" }
-"ui.text.focus" = { fg = "#e5ded6", modifiers= ["bold"] }
-
-"ui.selection" = { bg = "#313f4e" }
-"ui.menu.selected" = { fg = "#e5ded6", bg = "#313f4e" }
-
-"warning" = "#dc7759"
-"error" = "#dc597f"
-"info" = "#59dcb7"
-"hint" = "#59c0dc"
diff --git a/contrib/themes/ingrid.toml b/contrib/themes/ingrid.toml
deleted file mode 100644
index d32a89d1..00000000
--- a/contrib/themes/ingrid.toml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Author : Ingrid Rebecca Abraham <git@ingrids.email>
-
-"attribute" = "#839A53"
-"keyword" = { fg = "#D74E50", modifiers = ["bold"] }
-"keyword.directive" = "#6F873E"
-"namespace" = "#839A53"
-"punctuation" = "#C97270"
-"punctuation.delimiter" = "#C97270"
-"operator" = { fg = "#D74E50", modifiers = ["bold"] }
-"special" = "#D68482"
-"property" = "#89BEB7"
-"variable" = "#A6B6CE"
-"variable.parameter" = "#89BEB7"
-"type" = { fg = "#A6B6CE", modifiers = ["bold"] }
-"type.builtin" = "#839A53"
-"constructor" = { fg = "#839A53", modifiers = ["bold"] }
-"function" = { fg = "#89BEB7", modifiers = ["bold"] }
-"function.macro" = { fg = "#D4A520", modifiers = ["bold"] }
-"function.builtin" = "#89BEB7"
-"comment" = "#A6B6CE"
-"variable.builtin" = "#D4A520"
-"constant" = "#D4A520"
-"constant.builtin" = "#D4A520"
-"string" = "#D74E50"
-"number" = "#D74E50"
-"escape" = { fg = "#D74E50", modifiers = ["bold"] }
-"label" = "#D68482"
-
-"module" = "#839A53"
-
-"ui.background" = { bg = "#FFFCFD" }
-"ui.linenr" = { fg = "#bbbbbb" }
-"ui.linenr.selected" = { fg = "#F3EAE9" }  # TODO
-"ui.statusline" = { fg = "#250E07", bg = "#F3EAE9" }
-"ui.statusline.inactive" = { fg = "#7b91b3", bg = "#F3EAE9" }
-"ui.popup" = { bg = "#F3EAE9" }
-"ui.window" = { bg = "#D8B8B3" }
-"ui.help" = { bg = "#D8B8B3", fg = "#250E07" }
-
-"ui.text" = { fg = "#7B91B3" }
-"ui.text.focus" = { fg = "#250E07", modifiers= ["bold"] }
-
-"ui.selection" = { bg = "#540099" }
-"ui.menu.selected" = { fg = "#D74E50", bg = "#F3EAE9" }
-
-"warning" = "#D4A520"
-"error" = "#D74E50"
-"info" = "#839A53"
-"hint" = "#A6B6CE"
diff --git a/contrib/themes/onedark.toml b/contrib/themes/onedark.toml
deleted file mode 100644
index 65f26725..00000000
--- a/contrib/themes/onedark.toml
+++ /dev/null
@@ -1,43 +0,0 @@
-# Author : Gokul Soumya <gokulps15@gmail.com>
-
-"attribute" = { fg = "#E5C07B" }
-"comment" = { fg = "#5C6370", modifiers = ['italic'] }
-"constant" = { fg = "#56B6C2" }
-"constant.builtin" = { fg = "#61AFEF" }
-"constructor" = { fg = "#61AFEF" }
-"escape" = { fg = "#D19A66" }
-"function" = { fg = "#61AFEF" }
-"function.builtin" = { fg = "#61AFEF" }
-"function.macro" = { fg = "#C678DD" }
-"keyword" = { fg = "#E06C75" }
-"keyword.directive" = { fg = "#C678DD" }
-"label" = { fg = "#C678DD" }
-"namespace" = { fg = "#61AFEF" }
-"number" = { fg = "#D19A66" }
-"operator" = { fg = "#C678DD" }
-"property" = { fg = "#E06C75" }
-"special" = { fg = "#61AFEF" }
-"string" = { fg = "#98C379" }
-"type" = { fg = "#E5C07B" }
-"type.builtin" = { fg = "#E5C07B" }
-"variable" = { fg = "#61AFEF" }
-"variable.builtin" = { fg = "#61AFEF" }
-"variable.parameter" = { fg = "#E06C75" }
-
-"info" = { fg = "#61afef", modifiers = ['bold'] }
-"hint" = { fg = "#98c379", modifiers = ['bold'] }
-"warning" = { fg = "#e5c07b", modifiers = ['bold'] }
-"error" = { fg = "#e06c75", modifiers = ['bold'] }
-
-"ui.menu.selected" = { fg = "#282C34", bg = "#61AFEF" }
-"ui.background" = { fg = "#ABB2BF", bg = "#282C34" }
-"ui.help" = { bg = "#3E4452" }
-"ui.linenr" = { fg = "#4B5263", modifiers = ['dim'] }
-"ui.linenr.selected" = { fg = "#ABB2BF" }
-"ui.popup" = { bg = "#3E4452" }
-"ui.statusline" = { fg = "#ABB2BF", bg = "#2C323C" }
-"ui.statusline.inactive" = { fg = "#ABB2Bf", bg = "#2C323C" }
-"ui.selection" = { bg = "#3E4452" }
-"ui.text" = { fg = "#ABB2BF", bg = "#282C34" }
-"ui.text.focus" = { fg = "#ABB2BF", bg = "#2C323C", modifiers = ['bold'] }
-"ui.window" = { bg = "#3E4452" }