Merge pull request #2 from mrshmllow/tailwind-typography
fix: add `@tailwindcss/typography`
This commit is contained in:
GitHub
commit
2049551387
|
|
@ -12,7 +12,7 @@ in
|
|||
|
||||
src = lib.snowfall.fs.get-file "/";
|
||||
|
||||
npmDepsHash = "sha256-qvpwlPY0dFZX0VAnEdNsJxK5W8MU1twzaShUPyqbpF4=";
|
||||
npmDepsHash = "sha256-ze98HddbmkSAgDxJIw1l2YH3EcJ8NKx6Gz++xbcxBM4=";
|
||||
|
||||
npmFlags = ["--ignore-scripts"];
|
||||
|
||||
|
|
|
|||
50
package-lock.json
generated
50
package-lock.json
generated
|
|
@ -7,6 +7,7 @@
|
|||
"": {
|
||||
"name": "website",
|
||||
"version": "0.0.1",
|
||||
"license": "GPL-3.0-or-later",
|
||||
"dependencies": {
|
||||
"@astrojs/check": "^0.5.10",
|
||||
"@astrojs/react": "^3.3.1",
|
||||
|
|
@ -18,6 +19,9 @@
|
|||
"react-dom": "^18.3.1",
|
||||
"tailwindcss": "^3.4.3",
|
||||
"typescript": "^5.4.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tailwindcss/typography": "^0.5.13"
|
||||
}
|
||||
},
|
||||
"node_modules/@alloc/quick-lru": {
|
||||
|
|
@ -1681,6 +1685,34 @@
|
|||
"resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.3.0.tgz",
|
||||
"integrity": "sha512-7fedsBfuILDTBmrYZNFI8B6ATTxhQAasUHllHmjvSZPnoq4bULWoTpHwmuQvZ8Aq03/tAa2IGo6RXqWtHdWaCA=="
|
||||
},
|
||||
"node_modules/@tailwindcss/typography": {
|
||||
"version": "0.5.13",
|
||||
"resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.13.tgz",
|
||||
"integrity": "sha512-ADGcJ8dX21dVVHIwTRgzrcunY6YY9uSlAHHGVKvkA+vLc5qLwEszvKts40lx7z0qc4clpjclwLeK5rVCV2P/uw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"lodash.castarray": "^4.4.0",
|
||||
"lodash.isplainobject": "^4.0.6",
|
||||
"lodash.merge": "^4.6.2",
|
||||
"postcss-selector-parser": "6.0.10"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"tailwindcss": ">=3.0.0 || insiders"
|
||||
}
|
||||
},
|
||||
"node_modules/@tailwindcss/typography/node_modules/postcss-selector-parser": {
|
||||
"version": "6.0.10",
|
||||
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
|
||||
"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"cssesc": "^3.0.0",
|
||||
"util-deprecate": "^1.0.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/babel__core": {
|
||||
"version": "7.20.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
|
||||
|
|
@ -3731,6 +3763,24 @@
|
|||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/lodash.castarray": {
|
||||
"version": "4.4.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz",
|
||||
"integrity": "sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/lodash.isplainobject": {
|
||||
"version": "4.0.6",
|
||||
"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
|
||||
"integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/lodash.merge": {
|
||||
"version": "4.6.2",
|
||||
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
|
||||
"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/log-symbols": {
|
||||
"version": "6.0.0",
|
||||
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-6.0.0.tgz",
|
||||
|
|
|
|||
|
|
@ -21,5 +21,8 @@
|
|||
"tailwindcss": "^3.4.3",
|
||||
"typescript": "^5.4.5"
|
||||
},
|
||||
"license": "GPL-3.0-or-later"
|
||||
}
|
||||
"license": "GPL-3.0-or-later",
|
||||
"devDependencies": {
|
||||
"@tailwindcss/typography": "^0.5.13"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,18 +4,18 @@
|
|||
|
||||
<section id="goals">
|
||||
<h2 class="title">Goals</h2>
|
||||
<div class="goals">
|
||||
<div>
|
||||
<ol>
|
||||
<li class="goal">
|
||||
<h3 class="name">Independent</h3>
|
||||
<p class="description">
|
||||
<li>
|
||||
<h3>Independent</h3>
|
||||
<p>
|
||||
We will fork and maintain Nix, NixPkgs, and NixOS. Additional support
|
||||
for projects such as Nix Darwin and Home Manager will be considered.
|
||||
</p>
|
||||
</li>
|
||||
<li class="goal">
|
||||
<h3 class="name">Governance</h3>
|
||||
<p class="description">
|
||||
<li>
|
||||
<h3>Governance</h3>
|
||||
<p>
|
||||
A democratic model of governance with elected positions will be used to
|
||||
manage the project. A steering committee will provide direction with
|
||||
additional committees handling specific logistical tasks. Features or
|
||||
|
|
@ -25,26 +25,26 @@
|
|||
clearly defined.
|
||||
</p>
|
||||
</li>
|
||||
<li class="goal">
|
||||
<h3 class="name">Stabilization</h3>
|
||||
<p class="description">
|
||||
<li>
|
||||
<h3>Stabilization</h3>
|
||||
<p>
|
||||
User-friendly features such as the Nix v3 CLI will be enabled by
|
||||
default. Nix Flakes are used too heavily to remove or change and will
|
||||
instead be stabilized as a v0 in its current state with any future work
|
||||
being handled by a Special Interest Group.
|
||||
</p>
|
||||
</li>
|
||||
<li class="goal">
|
||||
<h3 class="name">Infrastructure</h3>
|
||||
<p class="description">
|
||||
<li>
|
||||
<h3>Infrastructure</h3>
|
||||
<p>
|
||||
We will build and maintain the tools and infrastructure necessary to
|
||||
keep the ecosystem healthy, including Continuous Integration and Binary
|
||||
Caching.
|
||||
</p>
|
||||
</li>
|
||||
<li class="goal">
|
||||
<h3 class="name">Education</h3>
|
||||
<p class="description">
|
||||
<li>
|
||||
<h3>Education</h3>
|
||||
<p>
|
||||
Unified documentation, tutorials, guides, and examples will provide a
|
||||
better onboarding experience for newcomers and a faster iteration cycle
|
||||
for experts.
|
||||
|
|
@ -55,36 +55,4 @@
|
|||
</section>
|
||||
|
||||
<style>
|
||||
section {
|
||||
max-width: 800px;
|
||||
margin: 0 auto;
|
||||
padding: 4rem 1rem;
|
||||
}
|
||||
|
||||
.goals {
|
||||
padding-left: 2.5rem;
|
||||
}
|
||||
|
||||
.title {
|
||||
text-align: center;
|
||||
font-size: 2rem;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.section ol {
|
||||
}
|
||||
|
||||
.goal {
|
||||
margin-top: 2rem;
|
||||
font-size: 1.5rem;
|
||||
list-style-type: decimal;
|
||||
}
|
||||
|
||||
.goal .name {
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
|
||||
.goal .description {
|
||||
font-size: 1rem;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -3,137 +3,104 @@
|
|||
---
|
||||
|
||||
<section id="roadmap">
|
||||
<h2 class="title">Roadmap</h2>
|
||||
<div class="phases">
|
||||
<ol>
|
||||
<li class="phase">
|
||||
<h3 class="name">Soft Fork</h3>
|
||||
<p class="description">
|
||||
This initial phase will involve an ad-hoc management structure due to
|
||||
its bootstrapping nature. As such, the project's stated Values, Goals,
|
||||
and Roadmap serve to keep all contributors aligned and safe knowing that
|
||||
the work they have committed to will not change.
|
||||
</p>
|
||||
<p class="description">
|
||||
The initial forking off of Nix and NixPkgs will be performed in this
|
||||
phase and new contributors will be given roles for handling package
|
||||
maintenance and pulling changes from upstream. We intend to move on from
|
||||
this phase once enough contributors have joined for the project to be
|
||||
capable of transitioning into a hard fork.
|
||||
</p>
|
||||
</li>
|
||||
<li class="phase">
|
||||
<h3 class="name">Hard Fork</h3>
|
||||
<p class="description">
|
||||
Like the Soft Fork phase, management structure will still be ad-hoc, but
|
||||
Committees, Special Interest Groups, and Working Groups may start to be
|
||||
formed. Due to there being necessary bootstrapping steps for each,
|
||||
elections will only begin once the Alignment phase has been reached.
|
||||
</p>
|
||||
<p class="description">
|
||||
At this point we will have enough contributors to safely maintain
|
||||
NixPkgs (or a reasonable subset) and Nix ourselves. We will begin
|
||||
allowing divergence from the upstream repository and changes to the
|
||||
repository structure to improve development can be introduced.
|
||||
</p>
|
||||
<p class="description">
|
||||
An initial release of the packages repository will be created and
|
||||
migration from `nix` to `aux` naming will begin to reduce confusion and
|
||||
errors now that the two projects have diverged.
|
||||
</p>
|
||||
</li>
|
||||
<li class="phase">
|
||||
<h3 class="name">Organization</h3>
|
||||
<p class="description">
|
||||
The packages repository will have sets extracted to allow for Special
|
||||
Interest Groups to more easily manage their lifecycles. For example,
|
||||
`pythonPackages` will be moved to a separate repository that will be the
|
||||
reponsibility of a Python SIG if there is interest.
|
||||
</p>
|
||||
<p class="description">
|
||||
Flakes will be standardized with its current implementation as a v0.
|
||||
While not ideal, the feature is used far too widely to be changed or
|
||||
removed without breaking the ecosystem. Instead, this v0 implementation
|
||||
will be enabled and future work for Flakes that addresses its
|
||||
shortcomings may be handled by a Flakes SIG.
|
||||
</p>
|
||||
<p class="description">
|
||||
The `aux` CLI will be modified to provide more ergonomic management of
|
||||
packages and systems. Additional subcommands such as `aux system switch`
|
||||
and `aux system build` will be added to make onboarding and ongoing
|
||||
maintenance easier.
|
||||
</p>
|
||||
</li>
|
||||
<li class="phase">
|
||||
<h3 class="name">Infrastructure</h3>
|
||||
<p class="description">
|
||||
Now that the project has significantly diverged from upstream, we will
|
||||
need to provide our own Continuous Integration and Binary Cache
|
||||
services. Existing governance structures will be used to manage the
|
||||
adoption of these technologies.
|
||||
</p>
|
||||
<p class="description">
|
||||
Documentation will be included as a part of the Continuous Integration
|
||||
process and will have Continuous Deployment configured to keep it up to
|
||||
date, making it easier for contributors to create educational materials.
|
||||
</p>
|
||||
<p class="description">
|
||||
Search infrastructure for packages and options will also be created.
|
||||
</p>
|
||||
</li>
|
||||
<li class="phase">
|
||||
<h3 class="name">Alignment</h3>
|
||||
<p class="description">
|
||||
By this point, we've done it. We have created a sustainable, independent
|
||||
fork of the Nix ecosystem. Now that the initial work has been completed
|
||||
we will begin the governance rotation process with our first elections
|
||||
and education as to how project governance works.
|
||||
</p>
|
||||
<p class="description">
|
||||
Documentation, project branding, and packages will be polished and
|
||||
presented as a fully stable release. From this point forward the
|
||||
Steering Committee will be managing the creation of Special Interest
|
||||
Groups and other necessary Committees. All enhancements will be
|
||||
suggested in Aux Enhancement Proposals which encourage existing SIGs to
|
||||
implement features or encourage the formation of a new SIG to be created
|
||||
for such a purpose.
|
||||
</p>
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
<h2>Roadmap</h2>
|
||||
|
||||
<ol>
|
||||
<li>
|
||||
<h3>Soft Fork</h3>
|
||||
<p>
|
||||
This initial phase will involve an ad-hoc management structure due to
|
||||
its bootstrapping nature. As such, the project's stated Values, Goals,
|
||||
and Roadmap serve to keep all contributors aligned and safe knowing that
|
||||
the work they have committed to will not change.
|
||||
</p>
|
||||
<p>
|
||||
The initial forking off of Nix and NixPkgs will be performed in this
|
||||
phase and new contributors will be given roles for handling package
|
||||
maintenance and pulling changes from upstream. We intend to move on from
|
||||
this phase once enough contributors have joined for the project to be
|
||||
capable of transitioning into a hard fork.
|
||||
</p>
|
||||
</li>
|
||||
<li>
|
||||
<h3>Hard Fork</h3>
|
||||
<p>
|
||||
Like the Soft Fork phase, management structure will still be ad-hoc, but
|
||||
Committees, Special Interest Groups, and Working Groups may start to be
|
||||
formed. Due to there being necessary bootstrapping steps for each,
|
||||
elections will only begin once the Alignment phase has been reached.
|
||||
</p>
|
||||
<p>
|
||||
At this point we will have enough contributors to safely maintain
|
||||
NixPkgs (or a reasonable subset) and Nix ourselves. We will begin
|
||||
allowing divergence from the upstream repository and changes to the
|
||||
repository structure to improve development can be introduced.
|
||||
</p>
|
||||
<p>
|
||||
An initial release of the packages repository will be created and
|
||||
migration from `nix` to `aux` naming will begin to reduce confusion and
|
||||
errors now that the two projects have diverged.
|
||||
</p>
|
||||
</li>
|
||||
<li>
|
||||
<h3>Organization</h3>
|
||||
<p>
|
||||
The packages repository will have sets extracted to allow for Special
|
||||
Interest Groups to more easily manage their lifecycles. For example,
|
||||
`pythonPackages` will be moved to a separate repository that will be the
|
||||
reponsibility of a Python SIG if there is interest.
|
||||
</p>
|
||||
<p>
|
||||
Flakes will be standardized with its current implementation as a v0.
|
||||
While not ideal, the feature is used far too widely to be changed or
|
||||
removed without breaking the ecosystem. Instead, this v0 implementation
|
||||
will be enabled and future work for Flakes that addresses its
|
||||
shortcomings may be handled by a Flakes SIG.
|
||||
</p>
|
||||
<p>
|
||||
The `aux` CLI will be modified to provide more ergonomic management of
|
||||
packages and systems. Additional subcommands such as `aux system switch`
|
||||
and `aux system build` will be added to make onboarding and ongoing
|
||||
maintenance easier.
|
||||
</p>
|
||||
</li>
|
||||
<li>
|
||||
<h3>Infrastructure</h3>
|
||||
<p>
|
||||
Now that the project has significantly diverged from upstream, we will
|
||||
need to provide our own Continuous Integration and Binary Cache
|
||||
services. Existing governance structures will be used to manage the
|
||||
adoption of these technologies.
|
||||
</p>
|
||||
<p>
|
||||
Documentation will be included as a part of the Continuous Integration
|
||||
process and will have Continuous Deployment configured to keep it up to
|
||||
date, making it easier for contributors to create educational materials.
|
||||
</p>
|
||||
<p>
|
||||
Search infrastructure for packages and options will also be created.
|
||||
</p>
|
||||
</li>
|
||||
<li>
|
||||
<h3>Alignment</h3>
|
||||
<p>
|
||||
By this point, we've done it. We have created a sustainable, independent
|
||||
fork of the Nix ecosystem. Now that the initial work has been completed
|
||||
we will begin the governance rotation process with our first elections
|
||||
and education as to how project governance works.
|
||||
</p>
|
||||
<p>
|
||||
Documentation, project branding, and packages will be polished and
|
||||
presented as a fully stable release. From this point forward the
|
||||
Steering Committee will be managing the creation of Special Interest
|
||||
Groups and other necessary Committees. All enhancements will be
|
||||
suggested in Aux Enhancement Proposals which encourage existing SIGs to
|
||||
implement features or encourage the formation of a new SIG to be created
|
||||
for such a purpose.
|
||||
</p>
|
||||
</li>
|
||||
</ol>
|
||||
</section>
|
||||
|
||||
<style>
|
||||
section {
|
||||
max-width: 800px;
|
||||
margin: 0 auto;
|
||||
padding: 4rem 1rem;
|
||||
}
|
||||
|
||||
.phases {
|
||||
padding-left: 2.5rem;
|
||||
}
|
||||
|
||||
.title {
|
||||
text-align: center;
|
||||
font-size: 2rem;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.section ol {
|
||||
}
|
||||
|
||||
.phase {
|
||||
margin-top: 2rem;
|
||||
font-size: 1.5rem;
|
||||
list-style-type: decimal;
|
||||
}
|
||||
|
||||
.phase .name {
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
|
||||
.phase .description {
|
||||
font-size: 1rem;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -4,60 +4,31 @@
|
|||
|
||||
<section id="values">
|
||||
<h2 class="title">Values</h2>
|
||||
<div class="value">
|
||||
<h3 class="name">Representation</h3>
|
||||
<p class="description">
|
||||
Contributors should have their views represented and organizational
|
||||
structure should be established democratically.
|
||||
</p>
|
||||
</div>
|
||||
<div class="value">
|
||||
<h3 class="name">Kindness</h3>
|
||||
<p class="description">
|
||||
The project should be welcoming and a safe place for people to
|
||||
participate.
|
||||
</p>
|
||||
</div>
|
||||
<div class="value">
|
||||
<h3 class="name">Collaboration</h3>
|
||||
<p class="description">
|
||||
Communication and cooperation should be encouraged.
|
||||
</p>
|
||||
</div>
|
||||
<div class="value">
|
||||
<h3 class="name">Sustainability</h3>
|
||||
<p class="description">
|
||||
Workload, finance, scope, and burnout should all be considered carefully
|
||||
to ensure that the project is stable.
|
||||
</p>
|
||||
</div>
|
||||
<div class="value">
|
||||
<h3 class="name">Accessibility</h3>
|
||||
<p class="description">
|
||||
Elitism is unwelcome, our knowledge is here to be shared and we should
|
||||
provide the tools to help everyone succeed and learn.
|
||||
</p>
|
||||
</div>
|
||||
<h3 class="name">Representation</h3>
|
||||
<p class="description">
|
||||
Contributors should have their views represented and organizational
|
||||
structure should be established democratically.
|
||||
</p>
|
||||
<h3 class="name">Kindness</h3>
|
||||
<p class="description">
|
||||
The project should be welcoming and a safe place for people to
|
||||
participate.
|
||||
</p>
|
||||
<h3 class="name">Collaboration</h3>
|
||||
<p class="description">
|
||||
Communication and cooperation should be encouraged.
|
||||
</p>
|
||||
<h3 class="name">Sustainability</h3>
|
||||
<p class="description">
|
||||
Workload, finance, scope, and burnout should all be considered carefully
|
||||
to ensure that the project is stable.
|
||||
</p>
|
||||
<h3 class="name">Accessibility</h3>
|
||||
<p class="description">
|
||||
Elitism is unwelcome, our knowledge is here to be shared and we should
|
||||
provide the tools to help everyone succeed and learn.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<style>
|
||||
section {
|
||||
max-width: 800px;
|
||||
margin: 0 auto;
|
||||
padding: 4rem 1rem;
|
||||
}
|
||||
|
||||
.title {
|
||||
text-align: center;
|
||||
font-size: 2rem;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.value {
|
||||
margin-top: 2rem;
|
||||
}
|
||||
|
||||
.value .name {
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -10,10 +10,15 @@ import Roadmap from "../components/Roadmap.astro";
|
|||
<Layout title="aux.computer">
|
||||
<main>
|
||||
<Header />
|
||||
<Hero />
|
||||
<Values />
|
||||
<Goals />
|
||||
<Roadmap />
|
||||
|
||||
<div class="grid place-items-center">
|
||||
<Hero />
|
||||
<div class="prose prose-invert py-16 px-4 max-w-3xl">
|
||||
<Values />
|
||||
<Goals />
|
||||
<Roadmap />
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
</Layout>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/** @type {import('tailwindcss').Config} */
|
||||
export default {
|
||||
content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'],
|
||||
theme: {
|
||||
extend: {},
|
||||
},
|
||||
plugins: [],
|
||||
}
|
||||
content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"],
|
||||
theme: {
|
||||
extend: {},
|
||||
},
|
||||
plugins: [require("@tailwindcss/typography")],
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue