diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..b06a1e60
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+tab_width = 8
+end_of_line = lf
+insert_final_newline = true
+
+[*.{css,html}]
+indent_size = 2
+
+[*.{c,h,in,lua}]
+max_line_length = 100
+
+[*.py]
+indent_size = 4
+
+[{Makefile,**/Makefile,runtime/doc/*.txt}]
+indent_style = tab
+indent_size = 8
diff --git a/.well-known/atproto-did b/.well-known/atproto-did
new file mode 100644
index 00000000..6372304a
--- /dev/null
+++ b/.well-known/atproto-did
@@ -0,0 +1 @@
+did:plc:635xovhsdw27inbgxukm3qtp
diff --git a/Gemfile.lock b/Gemfile.lock
index c424cbee..05a46417 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,43 +1,42 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (6.0.6)
+ activesupport (7.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (>= 0.7, < 2)
- minitest (~> 5.1)
- tzinfo (~> 1.1)
- zeitwerk (~> 2.2, >= 2.2.2)
- addressable (2.8.1)
+ i18n (>= 1.6, < 2)
+ minitest (>= 5.1)
+ tzinfo (~> 2.0)
+ addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.11.1)
colorator (1.1.0)
- commonmarker (0.23.6)
- concurrent-ruby (1.1.10)
- dnsruby (1.61.9)
- simpleidn (~> 0.1)
+ commonmarker (0.23.10)
+ concurrent-ruby (1.2.2)
+ dnsruby (1.70.0)
+ simpleidn (~> 0.2.1)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
- ethon (0.15.0)
+ ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
execjs (2.8.1)
- faraday (2.6.0)
+ faraday (2.7.5)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
- faraday-net_http (3.0.1)
+ faraday-net_http (3.0.2)
ffi (1.15.5)
forwardable-extended (2.6.0)
gemoji (3.0.1)
- github-pages (227)
+ github-pages (228)
github-pages-health-check (= 1.17.9)
- jekyll (= 3.9.2)
+ jekyll (= 3.9.3)
jekyll-avatar (= 0.7.0)
jekyll-coffeescript (= 1.1.1)
- jekyll-commonmark-ghpages (= 0.2.0)
+ jekyll-commonmark-ghpages (= 0.4.0)
jekyll-default-layout (= 0.1.4)
jekyll-feed (= 0.15.1)
jekyll-gist (= 1.5.0)
@@ -71,7 +70,7 @@ GEM
jemoji (= 0.12.0)
kramdown (= 2.3.2)
kramdown-parser-gfm (= 1.1.0)
- liquid (= 4.0.3)
+ liquid (= 4.0.4)
mercenary (~> 0.3)
minima (= 2.5.1)
nokogiri (>= 1.13.6, < 2.0)
@@ -87,13 +86,13 @@ GEM
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.8.0)
- i18n (0.9.5)
+ i18n (1.14.1)
concurrent-ruby (~> 1.0)
- jekyll (3.9.2)
+ jekyll (3.9.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
- i18n (~> 0.7)
+ i18n (>= 0.7, < 2)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 2.0)
kramdown (>= 1.17, < 3)
@@ -109,11 +108,11 @@ GEM
coffee-script-source (~> 1.11.1)
jekyll-commonmark (1.4.0)
commonmarker (~> 0.22)
- jekyll-commonmark-ghpages (0.2.0)
- commonmarker (~> 0.23.4)
+ jekyll-commonmark-ghpages (0.4.0)
+ commonmarker (~> 0.23.7)
jekyll (~> 3.9.0)
jekyll-commonmark (~> 1.4.0)
- rouge (>= 2.0, < 4.0)
+ rouge (>= 2.0, < 5.0)
jekyll-default-layout (0.1.4)
jekyll (~> 3.0)
jekyll-feed (0.15.1)
@@ -201,19 +200,21 @@ GEM
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
- liquid (4.0.3)
- listen (3.7.1)
+ liquid (4.0.4)
+ listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
- mini_portile2 (2.8.0)
+ mini_portile2 (2.8.9)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
- minitest (5.16.3)
- nokogiri (1.13.10)
- mini_portile2 (~> 2.8.0)
+ minitest (5.19.0)
+ nokogiri (1.18.9)
+ mini_portile2 (~> 2.8.2)
+ racc (~> 1.4)
+ nokogiri (1.18.9-x86_64-darwin)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
@@ -221,11 +222,11 @@ GEM
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.7)
- racc (1.6.1)
+ racc (1.8.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
- rexml (3.2.5)
+ rexml (3.3.9)
rouge (3.26.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
@@ -242,24 +243,23 @@ GEM
unf (~> 0.1.4)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
- thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
- tzinfo (1.2.10)
- thread_safe (~> 0.1)
+ tzinfo (2.0.6)
+ concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (1.8.0)
- webrick (1.7.0)
- zeitwerk (2.6.1)
+ webrick (1.8.2)
PLATFORMS
ruby
+ x86_64-darwin-21
DEPENDENCIES
github-pages
webrick
BUNDLED WITH
- 2.2.16
+ 2.4.13
diff --git a/README.md b/README.md
index a17a3e2b..5a9f8b25 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
This repository contains the source for the neovim.io website. The Neovim core
project is: https://github.com/neovim/neovim
Note that www.neovim.io/doc is served by https://github.com/neovim/doc (which
-previoulsy crawled neovim.io/doc2 generated from this repository).
+previously crawled neovim.io/doc2 generated from this repository).
## Contributing
@@ -17,27 +17,36 @@ This assumes that you already have a recent Ruby with RubyGems.
Install Bundler, either systemwide:
- $ sudo gem install bundler
+ sudo gem install bundler
or for the current user:
- $ export PATH="$(ruby -e 'print Gem.user_dir')/bin:$PATH"
- $ gem install --user-install bundler
+ export PATH="$(ruby -e 'print Gem.user_dir')/bin:$PATH"
+ gem install --user-install bundler
In the latter case, you might want to add the `PATH` update to `.bashrc` or your shell's equivalent.
To install the dependencies for this project only:
- $ bundle config set --local path .bundle
- $ bundle install
+ bundle config set --local path .bundle
+ # To _update_ deps, remove the lockfile.
+ # rm Gemfile.lock
+ bundle install
### Serving locally
Execute the following command:
- $ bundle exec jekyll serve --watch --livereload
+ bundle exec jekyll serve --watch --livereload
-Open `http://localhost:4000` to view the website.
+Open http://localhost:4000 to view the website.
+
+## Maintenance
+
+* Site search (for `:help` docs) is served by [Algolia Docsearch](https://docsearch.algolia.com/).
+ * The javascript and UI container were setup in [this commit](https://github.com/neovim/neovim.github.io/commit/ce9aef12eb1c98135965e3a9c5c792bf9e506a76).
+ * The docs pages don't use the jekyll layout so they also need to [manually include](https://github.com/neovim/neovim/pull/23839) the javascript and define a UI container.
+ * Admin: https://www.algolia.com/apps/X185E15FPG/dashboard
## License
diff --git a/_config.yml b/_config.yml
index 20174aaa..35c56c4f 100644
--- a/_config.yml
+++ b/_config.yml
@@ -29,3 +29,5 @@ exclude:
- README.md
- vendor/
- sponsor-generator/
+
+include: ['.well-known']
diff --git a/_data/nav.yml b/_data/nav.yml
index 85c68866..06c107e1 100644
--- a/_data/nav.yml
+++ b/_data/nav.yml
@@ -15,3 +15,5 @@
url: /doc/
- title: Sponsors
url: /sponsors/
+- title: Store
+ url: https://store.neovim.io/
diff --git a/_includes/nav.html b/_includes/nav.html
index a3d059d5..1647bf7d 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -6,50 +6,51 @@
+
- {% for nav in site.data.nav %} {% assign active = include.active %} {%
- assign has_sections = nav.sections != null %} {% if has_sections %}
+ {% for nav in site.data.nav %}
+ {% assign active = include.active %}
+ {% assign has_sections = nav.sections != null %}
+ {% if has_sections %}
+
-
{{ nav.title }}
-
+
+
+
+
diff --git a/_includes/news_sidebar.html b/_includes/news_sidebar.html
index d53bd0b6..477d0cdf 100644
--- a/_includes/news_sidebar.html
+++ b/_includes/news_sidebar.html
@@ -2,17 +2,8 @@
News
Find more updates in the news archive.
+ There's also an RSS feed.
{% include whatisnvim.html %}
-
- Twitter
-
-
-
- RSS
-
- RSS clients can follow the
- RSS feed.
-
diff --git a/_includes/post_sidebar.html b/_includes/post_sidebar.html
index 8dc2bf19..fdcab2d5 100644
--- a/_includes/post_sidebar.html
+++ b/_includes/post_sidebar.html
@@ -1,7 +1,3 @@
{% include whatisnvim.html %}
-
-
Twitter
-
-
diff --git a/_includes/whatisnvim.html b/_includes/whatisnvim.html
index f88e5fcc..14924267 100644
--- a/_includes/whatisnvim.html
+++ b/_includes/whatisnvim.html
@@ -6,9 +6,19 @@ What is Neovim?
usability,
to encourage new applications and
contributions.
+
+
+Discuss
Visit #neovim:matrix.org
or #neovim on irc.libera.chat to chat with the team.
+
+
+
+
diff --git a/_layouts/default.html b/_layouts/default.html
index 71b24fb1..799374d4 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -5,10 +5,22 @@
+
+
+
+
+
+
+
{% feed_meta %}
{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}
-
-
+
+
+
+
+
+
+
@@ -19,10 +31,18 @@
{% include footer.html %}
- {%- comment -%}Only used in bountysource{%- endcomment -%}
-
-
-
-
+
+
+
+
+
+