Skip to content

Commit 92a8ecf

Browse files
justinmkjustinmk
authored
sponsor rework #395 
1 parent 11003a7 commit 92a8ecf

File tree

6 files changed

+85
-76
lines changed

6 files changed

+85
-76
lines changed

‎content/about.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@ active: About
44
type: page
55
---
66

7-
# About
8-
97
- [Charter](/charter/)
108
- [Roadmap](/roadmap/)

‎content/sponsors.html‎

Lines changed: 51 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,53 +5,62 @@
55

66
<div class="container golden-grid">
77
<div>
8-
<h2>Sponsoring Neovim development</h2>
9-
<dl class="faqs">
10-
<dt>How can I sponsor Neovim?</dt>
11-
<dd>
12-
<p>
13-
You can sponsor Neovim via <a href="https://github.com/sponsors/neovim">GitHub Sponsors</a>
14-
or <a href="https://opencollective.com/neovim">Open Collective</a>.
15-
This makes it possible for core developers to work full-time for
16-
a month or longer, accelerating projects like Lua stdlib, treesitter
17-
parser engine, LSP framework, extended marks, embedded terminal, job
18-
control, RPC API, and remote UIs.
8+
<h1>Sponsor Neovim</h1>
199

20-
Sponsorship is very rarely used to maintain (very minimal) infrastructure
21-
costs for the Neovim project, such as hosting fees. 99.999% of the funding goes directly to funding
22-
development work.
23-
</p>
24-
</dd>
25-
<dt>How are funds dispersed?</dt>
26-
<dd>
27-
<p>
28-
Donations are managed via <a href="https://opencollective.com/neovim">Open Collective</a>, which
29-
provides public tracking for all
30-
<a href="https://opencollective.com/neovim/expenses">expenses</a>. Bitcoin transactions are visible
31-
on the <a href="https://www.blockchain.com/btc/address/1Evu6wPrzjsjrNPdCYbHy3HT6ry2EzXFyQ">blockchain
32-
explorer</a>. The only donation options for neovim are via GitHub sponsors, Open Collective, and
33-
Bitcoin. All prior funding sources have been transferred into Open Collective.
34-
</p>
35-
</dd>
36-
<dt>What is expected of a contributor doing funded work?</dt>
37-
<dd>
38-
<p>
39-
Funded work is a way to support active contributors who have weeks of time to focus on the
40-
project. This opportunity is available to contributors who have a developed a reputation for
41-
reliable, high-quality contributions (code/documentation, GitHub review comments, and GitHub
42-
technical discussions; <i>not</i> IRC or other "ephemeral" places).
10+
<p style="text-align: center; margin: 2em 0;">
11+
<a href="https://opencollective.com/neovim/donate" class="btn">Donate to Neovim</a>
12+
</p>
4313

44-
It works like this: funded contributors are expected to focus <i>full-time</i> for weeks or
45-
even months, yielding tangible, high-quality contributions, with conspicuous, reliable,
46-
regular activity on GitHub.
47-
</p>
48-
</dd>
14+
<h2>100% of funds go to development</h2>
15+
<p>We don't have an "administrative" staff. Funding goes directly to software development.</p>
16+
17+
<h2>Funds are managed by OpenCollective</h2>
18+
<p>
19+
Email: <a href="mailto:[email protected]">[email protected]</a><br>
20+
<code>Open Source Collective 501(c)(6)</code><br>
21+
<code>EIN: 82-2037583</code><br>
22+
<code>440 N Barranca Ave #3939 Covina, CA 91723 United States</code><br>
23+
<code>[email protected]</code><br>
24+
<a href="https://opencollective.com/opensource#category-ABOUT">Details</a> <br>
25+
</p>
26+
27+
<p>
28+
You can also donate via <a href="https://github.com/sponsors/neovim">GitHub Sponsors</a>,
29+
which will be routed to OpenCollective.
30+
</p>
31+
32+
<h2>How are funds used?</h2>
33+
<p>
34+
Funding makes it possible for core developers to work full-time for
35+
a month or longer, accelerating projects like Lua stdlib, treesitter
36+
parser engine, LSP framework, extended marks, embedded terminal, job
37+
control, RPC API, and remote UIs.
38+
</p>
39+
40+
<p>
41+
We have <em>minimal</em> infrastructure costs, which are funded from
42+
non-sponsor sources such as the <a href="https://store.neovim.io">Store</a>.
43+
Those sources are routed to OpenCollective, so expenses will show up in OpenCollective.
44+
</p>
45+
46+
<h2>What is expected of a funded contributor?</h2>
47+
<p>
48+
Funded work is a way to support active contributors who have weeks of time to focus on the
49+
project. This opportunity is available to contributors who have a developed a reputation for
50+
reliable, high-quality contributions (code/documentation, GitHub review comments, and GitHub
51+
technical discussions; <i>not</i> IRC or other "ephemeral" places).
52+
</p>
53+
54+
<p>
55+
It works like this: funded contributors are expected to focus full-time for weeks or
56+
even months, yielding tangible, high-quality contributions, with conspicuous, reliable,
57+
regular activity on GitHub.
58+
</p>
4959

50-
</dl>
5160
</div>
5261

5362
<div style="padding-left: 2em;">
54-
<h2>Sponsors</h2>
63+
<h1>Sponsors</h1>
5564
<div id="sponsors2" class="first-level-sponsor">
5665
<a href="https://www.meta.com/" style="display: block;">
5766
<picture title="Meta" alt="Meta logo">
@@ -78,7 +87,7 @@ <h2>Sponsors</h2>
7887
</div>
7988

8089
<dl>
81-
<h3 style="margin-top: 2em;">Original fundraiser sponsors</h3>
90+
<h2 style="margin-top: 2em;">Original fundraiser sponsors</h2>
8291
<dd>
8392
<p>
8493
<div class="first-level-sponsor">

‎layouts/index.html‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ <h3>Usable</h3>
5050
semantic code inspection and refactoring (go-to definition, "find references", format, …).
5151
</li>
5252
<li>
53-
Client-server architecture allows you to <b>detach the UI</b> and keep the editor session running
54-
(like tmux). Attach multiple UIs to any Nvim session.
53+
Client-server architecture allows you to <a href="/doc/user/gui.html#%3Adetach">:detach</a>
54+
the UI and keep the editor session running (like tmux). Attach multiple UIs to any Nvim session.
5555
</li>
56-
<li>No "Press ENTER" messages.</li>
56+
<li>No "Press ENTER" messages (Nvim 0.12 feature).</li>
5757
<li>Works the same everywhere: one build-type, one command.</li>
5858
<li>Modern terminal features such as cursor styling, focus events, bracketed paste.</li>
5959
<li>Builtin <a href="https://www.youtube.com/watch?v=xZbMVj9XSUo">:terminal</a> set the standard for
@@ -117,7 +117,7 @@ <h2>Impressions</h2>
117117
</p>
118118
<p>
119119
"Full-screen Neovim looks cool as hell!"
120-
<a href="https://twitter.com/dhh/status/1764465909316583659">—DHH</a>
120+
<a href="https://x.com/dhh/status/1764465909316583659">—DHH</a>
121121
</p>
122122
<p>
123123
"A nice looking website, that’s one thing Neovim did right."
@@ -143,18 +143,20 @@ <h2>Intro</h2>
143143
<div>
144144
<h2 id="chat">Chat</h2>
145145
<ul>
146-
<li><a href="https://twitter.com/Neovim" class="twitter-follow-button">Follow &#64;Neovim</a></li>
147-
<li>Discuss the project in <a href="https://github.com/neovim/neovim/discussions">GitHub
148-
Discussions</a>, or
149-
chat in <a href="https://matrix.to/#/#neovim:matrix.org">#neovim:matrix.org</a>
150-
or #neovim on <code>irc.libera.chat</code>.
151-
</li>
152-
<li>Contribute code, report bugs and request features at <a
153-
href="https://github.com/neovim/neovim">GitHub</a>.</li>
154-
<li>Ask usage and configuration questions at <a
155-
href="https://github.com/neovim/neovim/discussions">GitHub Discussions</a>
156-
or <a href="https://vi.stackexchange.com">vi.stackexchange.com</a>.
157-
</li>
146+
<li><a href="https://x.com/Neovim" class="twitter-follow-button">Follow &#64;Neovim on X</a>,
147+
<a rel="me" href="https://hachyderm.io/@neovim">Mastodon</a>,
148+
<a href="https://bsky.app/profile/neovim.io">Bluesky</a>
149+
</li>
150+
<li>Discuss the project in <a href="https://github.com/neovim/neovim/discussions">GitHub Discussions</a>, or
151+
chat in <a href="https://matrix.to/#/#neovim:matrix.org">#neovim:matrix.org</a>
152+
or #neovim on <code>irc.libera.chat</code>.
153+
</li>
154+
<li>Contribute code, report bugs and request features at <a
155+
href="https://github.com/neovim/neovim">GitHub</a>.</li>
156+
<li>Ask usage and configuration questions at <a
157+
href="https://github.com/neovim/neovim/discussions">GitHub Discussions</a>
158+
or <a href="https://vi.stackexchange.com">vi.stackexchange.com</a>.
159+
</li>
158160
</ul>
159161
</div>
160162

@@ -195,13 +197,11 @@ <h2>GUIs</h2>
195197
<ul>
196198
<li><a href="https://github.com/glacambre/firenvim">Firenvim</a> (Nvim in your web browser!)</li>
197199
<li><a href="https://github.com/vscode-neovim/vscode-neovim">vscode-neovim</a> (Nvim in VSCode!)</li>
198-
<li><a href="https://github.com/sassanh/qnvim">qnvim</a> (Nvim in Qt Creator!)</li>
199200
<li><a href="https://neovide.dev/">Neovide</a></li>
200201
<li><a href="https://github.com/akiyosi/goneovim">Goneovim</a></li>
201202
<li><a href="https://github.com/vhakulinen/gnvim">GNvim (GTK4)</a></li>
202203
<li><a href="https://github.com/yatli/fvim">FVim</a></li>
203204
<li><a href="https://github.com/RMichelsen/Nvy">Nvy</a></li>
204-
<li><a href="https://github.com/sakhnik/nvim-ui">nvim-ui (GTK4)</a></li>
205205
<li><a href="https://github.com/equalsraf/neovim-qt">Neovim Qt (Qt5)</a></li>
206206
<li><a href="https://github.com/qvacua/vimr">VimR (macOS)</a></li>
207207
<li><a href="https://github.com/neovim/neovim/wiki/Related-projects#gui">More...</a></li>
@@ -216,11 +216,9 @@ <h2 id="sponsor">The work continues...</h2>
216216
<div class="container col3">
217217
<div>
218218
<div>Sponsor (100% to developers)</div>
219-
<ul>
220-
<li><a href="https://github.com/sponsors/neovim">GitHub Sponsors</a></li>
221-
<li><a href="https://opencollective.com/neovim">Open Collective</a> (<a
222-
href="https://opencollective.com/opensource#category-ABOUT">EIN</a>)</li>
223-
</ul>
219+
<p>
220+
<a href="/sponsors" class="btn">Become a Sponsor</a>
221+
</p>
224222
</div>
225223

226224
<div>
@@ -244,7 +242,7 @@ <h2 id="sponsor">The work continues...</h2>
244242
<div>Marketing</div>
245243
<ul>
246244
<li><a href="/logos/neovim-logos.zip">Neovim-logos.zip</a> <span class="light">(1.1 MB)</span></li>
247-
<li>Neovim logo by <a href="http://twitter.com/jasonlong">Jason Long</a>, <a
245+
<li>Neovim logo by <a href="http://x.com/jasonlong">Jason Long</a>, <a
248246
href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</li>
249247
</ul>
250248
</div>

‎layouts/partials/footer.html‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
&middot;
88
{{ end }}
99
{{ end }}
10-
&middot;
11-
<a rel="me" href="https://hachyderm.io/@neovim">Mastodon</a>
1210
</div>
1311

1412
<div>
1513
This site's source is <a href="https://github.com/neovim/neovim.github.io/">hosted on GitHub</a>.
1614
</div>
1715
</div>
18-
</footer>
16+
</footer>

‎layouts/partials/whatisnvim.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ <h3>Discuss</h3>
1818
Visit <a href="https://app.element.io/#/room/#neovim:matrix.org">#neovim:matrix.org</a>
1919
or #neovim on irc.libera.chat to chat with the team.
2020
</p>
21-
<p>
22-
<a href="https://twitter.com/Neovim" class="twitter-follow-button" data-show-count="false" data-size="large">Follow @Neovim</a>
21+
<p style="vertical-align: middle;">
22+
<a href="https://twitter.com/Neovim" class="twitter-follow-button" data-show-count="false" data-size="large">Follow @Neovim on X</a>
2323
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
24+
<br>
25+
<a rel="me" href="https://hachyderm.io/@neovim">Mastodon</a>
26+
<br>
27+
<a href="https://bsky.app/profile/neovim.io">Bluesky</a>
2428
</p>

‎static/doc2/README.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
This folder is destined to be crawled by https://github.com/neovim/doc/ and not
2-
served directly.
3-
You must set the `canonical_url: doc/XXXX` to the front matter.
1+
Files in `doc2/` are pulled into https://github.com/neovim/doc/ by
2+
[this script](https://github.com/neovim/doc/blob/4ab2e06af98dadbd35c4282c1b18304d87f8eb59/ci/doc-index.sh#L10-L13).
3+
4+
This is because `neovim.io/doc/` is served by https://github.com/neovim/doc/
5+
which is where the user documentation HTML is generated to.

0 commit comments

Comments
 (0)