diff --git a/default.nix b/default.nix index 2d6ae88..4772e1c 100644 --- a/default.nix +++ b/default.nix @@ -4,7 +4,7 @@ nix-gitignore, yarn-berry, - nodejs, + nodejs_22, cacert, quickshell-types ? null, }: stdenv.mkDerivation (final: let @@ -14,7 +14,7 @@ src = final.src; - nativeBuildInputs = [ nodejs yarn-berry cacert ]; + nativeBuildInputs = [ nodejs_22 yarn-berry cacert ]; configurePhase = '' mkdir garbage-tooling @@ -29,6 +29,13 @@ ''; buildPhase = '' + # build will fail once due to missing nodejs executable + # linking before running this won't work, it will just delete it + HOME=$(pwd)/garbage-tooling yarn install || true + + mkdir -p node_modules/node/bin + ln -s ${nodejs_22}/bin/node node_modules/node/bin/node + HOME=$(pwd)/garbage-tooling yarn install ''; @@ -36,6 +43,7 @@ # none of the cache path configs in yarnrc actually do anything # so we just copy node_modules manually + rm node_modules/node/bin/node # remove dep on nix package for output hash mv node_modules $out ''; @@ -43,7 +51,7 @@ outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "V1sjOLi6UOb3HQLiGTcGJInDU7H28fjzdmrxYXXI0ug="; + outputHash = "tZ4xuA7uNnMIEpSUmQ5TAWPdvRGFJWIgWyBa1QFFWWU="; }; in { pname = "quickshell-web"; diff --git a/package.json b/package.json index ec2ab0e..a9fcd68 100644 --- a/package.json +++ b/package.json @@ -12,20 +12,21 @@ "dependencies": { "@ark-ui/solid": "^3.5.0", "@astrojs/check": "^0.9.4", - "@astrojs/markdown-remark": "^6.3.1", - "@astrojs/mdx": "^4.2.6", - "@astrojs/sitemap": "^3.4.0", - "@astrojs/solid-js": "^5.0.10", + "@astrojs/markdown-remark": "^5.3.0", + "@astrojs/mdx": "^3.1.8", + "@astrojs/sitemap": "^3.2.1", + "@astrojs/solid-js": "^4.4.2", "@fontsource-variable/rubik": "^5.1.0", "@hbsnow/rehype-sectionize": "^1.0.7", "@pagefind/default-ui": "^1.1.1", - "@shikijs/rehype": "^3.4.2", + "@shikijs/rehype": "^1.22.0", "@types/node": "^20.14.11", - "astro": "^5.7.13", - "astro-breadcrumbs": "^3.3.1", - "astro-icon": "^1.1.5", + "astro": "^4.16.6", + "astro-breadcrumbs": "^2.3.1", + "astro-icon": "^1.1.1", "hast": "^1.0.0", "hast-util-from-html": "^2.0.3", + "node": "npm:22.7.0", "remark-github-blockquote-alert": "^1.2.1", "solid-devtools": "^0.30.1", "solid-js": "^1.8.18", diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 6c8bc3e..1341caa 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -12,7 +12,7 @@ const props = Astro.props;

Brought to you by:

outfoxxed - Lead Developer - xanazf - Website Developer / Designer + Xanazf - Website Developer / Designer and our contributors diff --git a/src/components/navigation/sidebars/nav/NavCollapsible.astro b/src/components/navigation/sidebars/nav/NavCollapsible.astro index ef3352b..aa45d63 100644 --- a/src/components/navigation/sidebars/nav/NavCollapsible.astro +++ b/src/components/navigation/sidebars/nav/NavCollapsible.astro @@ -9,7 +9,7 @@ interface Props { } const { title, link, current } = Astro.props; --- - +
{title}
diff --git a/src/components/navigation/sidebars/nav/RootNav.astro b/src/components/navigation/sidebars/nav/RootNav.astro index 95330d8..f0d03a4 100644 --- a/src/components/navigation/sidebars/nav/RootNav.astro +++ b/src/components/navigation/sidebars/nav/RootNav.astro @@ -9,36 +9,24 @@ const { currentRoute, currentModule, currentClass } = Astro.props; import { getTypeData } from "@config/io/generateTypeData"; import { groupRoutes } from "@config/io/helpers"; -import type { TreeEntry } from "./Tree.astro"; import Tree from "./Tree.astro"; import Link from "./Link.astro"; const routes = await getTypeData(); const groupedRoutes = groupRoutes(routes); -import { getCollection } from "astro:content"; -const guidePages = await getCollection("guide"); - -function genGuideNav(base: string): TreeEntry[] | undefined { - const pages = guidePages - .filter(page => page.id.match(`^${base}[^/]*$`) !== null && page.id != "index") - .sort((a, b) => a.data.index - b.data.index) - .map(page => ({ - title: page.data.title, - link: `/docs/guide/${page.id}`, - current: currentModule === page.id, - entries: genGuideNav(page.id + "/"), - })); - - return pages.length == 0 ? undefined : pages; -} - -const guide = { - title: "Usage Guide", - link: "/docs/guide", - current: currentRoute.startsWith("guide"), - entries: genGuideNav(""), -} +const configuration = { + title: "Configuration", + link: "/docs/configuration", + current: currentRoute.startsWith("configuration"), + entries: groupedRoutes.tutorials.configuration.map( + ({ name, type }) => ({ + title: name, + link: `/docs/configuration/${type}`, + current: currentModule === type, + }) + ), +}; const types = { title: "Quickshell Types", @@ -59,7 +47,7 @@ const types = { }; ---