diff --git a/default.nix b/default.nix index b46718b..f683245 100644 --- a/default.nix +++ b/default.nix @@ -6,8 +6,7 @@ yarn-berry, nodejs, cacert, - quickshell-types ? null, - masterBranch ? false, + versions, }: stdenv.mkDerivation (final: let nodeModules = stdenv.mkDerivation { pname = "${final.pname}-node_modules"; @@ -70,8 +69,7 @@ in { ''; PRODUCTION = true; - MASTER_BRANCH = masterBranch; - SECRET_MODULES_PATH = if quickshell-types == null then "" else quickshell-types; + VERSION_FILE_PATH = versions; buildPhase = '' HOME=$(pwd)/garbage-tooling yarn build diff --git a/flake.nix b/flake.nix index b6e915c..45688b8 100644 --- a/flake.nix +++ b/flake.nix @@ -14,10 +14,7 @@ (system: fn system nixpkgs.legacyPackages.${system}); in { packages = forEachSystem (system: pkgs: rec { - quickshell-web = pkgs.callPackage ./default.nix { - quickshell-types = quickshell-docs.packages.${system}.quickshell-types; - }; - + quickshell-web = pkgs.callPackage ./default.nix {}; default = quickshell-web; }); }; diff --git a/redirects.caddyfile b/redirects.caddyfile index 3c4e286..8184d7a 100644 --- a/redirects.caddyfile +++ b/redirects.caddyfile @@ -3,3 +3,6 @@ redir /docs/configuration/intro* /docs/guide/introduction permanent redir /docs/configuration/positioning* /docs/guide/size-position permanent redir /docs/configuration/qml-overview* /docs/guide/qml-language permanent redir /docs/configuration* /docs/guide permanent + +@unversioned_docs path_regexp ^/docs/((guide|types).*)$ +redir @unversioned_docs /docs/v0.1.0/{re.1} diff --git a/src/components/featurelist/FeatureList.astro b/src/components/featurelist/FeatureList.astro index 8456cf4..f1bda6d 100644 --- a/src/components/featurelist/FeatureList.astro +++ b/src/components/featurelist/FeatureList.astro @@ -1,7 +1,7 @@ --- import { processMarkdown } from "@config/io/markdown"; -const codeDesktop = await processMarkdown(`\`\`\`qml +const codeDesktop = await processMarkdown("N/A", `\`\`\`qml // a standard desktop window FloatingWindow { Timer { @@ -21,7 +21,7 @@ FloatingWindow { } \`\`\``); -const codeMobile = await processMarkdown(`\`\`\`qml +const codeMobile = await processMarkdown("N/A", `\`\`\`qml // a standard desktop window FloatingWindow { Timer { diff --git a/src/components/navigation/Search.astro b/src/components/navigation/Search.astro index c04ee15..bb3453e 100644 --- a/src/components/navigation/Search.astro +++ b/src/components/navigation/Search.astro @@ -2,7 +2,6 @@ import "@pagefind/default-ui/css/ui.css"; import magnifierIcon from "@icons/magnifier.svg?raw" --- -