diff --git a/default.nix b/default.nix index b46718b..c3df033 100644 --- a/default.nix +++ b/default.nix @@ -6,8 +6,7 @@ yarn-berry, nodejs, cacert, - quickshell-types ? null, - masterBranch ? false, + versions ? null, }: 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.lock b/flake.lock index 379392d..be0ea5b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -15,52 +15,9 @@ "type": "indirect" } }, - "quickshell": { - "inputs": { - "nixpkgs": [ - "quickshell-docs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747564942, - "narHash": "sha256-XBs7dhqsY3vdrtukt9Qwcqz8CSixMnm/XvpqD+kn+TA=", - "ref": "refs/heads/master", - "rev": "823456b58e83880e8f6bfaa785ac949975817d2a", - "revCount": 529, - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" - }, - "original": { - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" - } - }, - "quickshell-docs": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "quickshell": "quickshell" - }, - "locked": { - "lastModified": 1747388043, - "narHash": "sha256-/iJ+Q2Z4rvwWCMHhUXeuGD86NqYLwEVrA+WRlIPTJnA=", - "ref": "refs/heads/master", - "rev": "82a47eae2403c54909cf0249deaddbbba29ba661", - "revCount": 100, - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell-docs" - }, - "original": { - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell-docs" - } - }, "root": { "inputs": { - "nixpkgs": "nixpkgs", - "quickshell-docs": "quickshell-docs" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index b6e915c..2bb8982 100644 --- a/flake.nix +++ b/flake.nix @@ -1,23 +1,15 @@ { inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - - quickshell-docs = { - url = "git+https://git.outfoxxed.me/quickshell/quickshell-docs"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; - outputs = { self, nixpkgs, quickshell-docs }: let + outputs = { self, nixpkgs }: 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-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" --- -