nix package + small tweaks for release

Author: outfoxxed

default.nix

@@ -6,6 +6,7 @@
   yarn-berry,
   nodejs_22,
   cacert,
+  quickshell-types ? null,
 }: stdenv.mkDerivation (final: let
   nodeModules = stdenv.mkDerivation {
     pname = "${final.pname}-node_modules";
@@ -50,7 +51,7 @@
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "rKoDjvG5t+aQRrzAz0eTifPtL3zmWAu/emxXWd1ocxM=";
+    outputHash = "tZ4xuA7uNnMIEpSUmQ5TAWPdvRGFJWIgWyBa1QFFWWU=";
   };
 in {
   pname = "quickshell-web";
@@ -72,9 +73,12 @@ in {
     EOF
 
     cp -r ${nodeModules} node_modules
+    chmod +rw -R node_modules
   '';
 
   buildPhase = ''
+    ${if quickshell-types != null then "export SECRET_MODULES_PATH=${quickshell-types}" else ""}
+    echo SECRET_MODULES_PATH: $SECRET_MODULES_PATH
     HOME=$(pwd)/garbage-tooling yarn build
   '';
 

flake.lock

@@ -1,15 +1,23 @@
 {
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
+
+    quickshell-docs = {
+      url = "git+https://git.outfoxxed.me/quickshell/quickshell-docs";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs }: let
+  outputs = { self, nixpkgs, quickshell-docs }: let
     forEachSystem = fn: nixpkgs.lib.genAttrs
       [ "x86_64-linux" "aarch64-linux" ]
       (system: fn system nixpkgs.legacyPackages.${system});
   in {
     packages = forEachSystem (system: pkgs: rec {
-      quickshell-web = pkgs.callPackage ./default.nix {};
+      quickshell-web = pkgs.callPackage ./default.nix {
+        quickshell-types = quickshell-docs.packages.${system}.quickshell-types;
+      };
+
       default = quickshell-web;
     });
   };

flake.nix

@@ -13,8 +13,8 @@ export default function pagefind(): AstroIntegration {
         const relativeDir = relative(cwd, targetDir);
         return new Promise<void>(resolve => {
           spawn(
-            "yarn dlx",
-            ["-q", "pagefind", "--site", relativeDir],
+            "yarn",
+            ["pagefind", "--site", relativeDir],
             {
               stdio: "inherit",
               shell: true,

pagefind.ts

@@ -3,8 +3,20 @@ import path from "node:path";
 
 import type { RouteData, dirData } from "./types";
 
+function modulesPath() {
+  const modulesPath = import.meta.env.SECRET_MODULES_PATH;
+
+  if (!modulesPath || modulesPath === "") {
+    throw new Error(
+      "Cannot generate types, missing SECRET_MODULES_PATH"
+    );
+  }
+
+  return modulesPath;
+}
+
 async function readSubdir(subdir: string): Promise<dirData[]> {
-  const fullpath = path.join(process.cwd(), "modules", subdir);
+  const fullpath = path.join(modulesPath(), subdir);
   const filenames = await fs.readdir(fullpath);
 
   const data = await Promise.all(
@@ -31,13 +43,7 @@ async function readSubdir(subdir: string): Promise<dirData[]> {
 }
 
 async function generateTypeData(): Promise<RouteData[]> {
-  const mainDir = import.meta.env.SECRET_MODULES_PATH;
-
-  if (!mainDir || mainDir === "") {
-    throw new Error(
-      "Cannot generate types, missing SECRET_MODULES_PATH"
-    );
-  }
+  const mainDir = modulesPath();
 
   const subdirs = await fs.readdir(mainDir, {
     withFileTypes: true,

public/favicon.svg

@@ -121,7 +121,7 @@ html.dark .main-page_hero-text {
   }
 }
 
-html.dark .main-page_link-card {
+/*html.dark .main-page_link-card {
   background-color: transparent;
   border-color: transparent;
 
@@ -168,6 +168,23 @@ html.dark .main-page_link-card {
       }
     }
   }
+}*/
+
+html.dark .main-page_link-card {
+  background-color: hsl(var(--green) 38 25);
+  color: hsl(194 0 100);
+
+  &:hover {
+    background-color: hsl(var(--green) 48 35);
+  }
+
+  &.main-page_bluecard {
+    background-color: hsl(var(--blue) 38 25);
+
+    &:hover {
+      background-color: hsl(var(--blue) 48 35);
+    }
+  }
 }
 
 .baselayout footer {