From 48b954c4109e3650936ab7cb371203348338a13c Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Sat, 9 Nov 2024 01:09:07 -0800 Subject: [PATCH] nix package + small tweaks for release --- default.nix | 6 +++- flake.lock | 51 +++++++++++++++++++++++++++--- flake.nix | 12 +++++-- pagefind.ts | 4 +-- public/favicon.svg | 26 ++++++++++++++- public/quickshell.png | Bin 12985 -> 0 bytes src/config/io/generateTypeData.ts | 22 ++++++++----- src/styles/main-page.css | 19 ++++++++++- 8 files changed, 121 insertions(+), 19 deletions(-) delete mode 100644 public/quickshell.png diff --git a/default.nix b/default.nix index ceaf318..c0868e1 100644 --- a/default.nix +++ b/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 ''; diff --git a/flake.lock b/flake.lock index 9a1efd0..055073c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -15,9 +15,52 @@ "type": "indirect" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "quickshell-docs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730842284, + "narHash": "sha256-s0doicDkqzCqHvplBnjWPJtGJwajjDdfVkmmPu32l6Q=", + "ref": "refs/heads/master", + "rev": "b528be94260b572919ff47d2f5e3150ebc1ee3e9", + "revCount": 368, + "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": 1731140797, + "narHash": "sha256-ovpoYKNzGViJbl8Pqi+gtmKIOKQXS0dCK65pShyS64s=", + "ref": "refs/heads/master", + "rev": "bc2c0d5d2c3941fb4c7ba7fafc91a41a65af6728", + "revCount": 89, + "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" + "nixpkgs": "nixpkgs", + "quickshell-docs": "quickshell-docs" } } }, diff --git a/flake.nix b/flake.nix index 2bb8982..b6e915c 100644 --- a/flake.nix +++ b/flake.nix @@ -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; }); }; diff --git a/pagefind.ts b/pagefind.ts index c097d92..0f074da 100644 --- a/pagefind.ts +++ b/pagefind.ts @@ -13,8 +13,8 @@ export default function pagefind(): AstroIntegration { const relativeDir = relative(cwd, targetDir); return new Promise(resolve => { spawn( - "yarn dlx", - ["-q", "pagefind", "--site", relativeDir], + "yarn", + ["pagefind", "--site", relativeDir], { stdio: "inherit", shell: true, diff --git a/public/favicon.svg b/public/favicon.svg index ee539d4..bf2a3d6 100644 --- a/public/favicon.svg +++ b/public/favicon.svg @@ -1 +1,25 @@ - \ No newline at end of file + + + + + + diff --git a/public/quickshell.png b/public/quickshell.png deleted file mode 100644 index 98aceb722f7761a7c78a734b3fe0f45742c6b11f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12985 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 aU-G~2!%k=d#Wzp$PydQfN8= diff --git a/src/config/io/generateTypeData.ts b/src/config/io/generateTypeData.ts index 8d2cf0f..91986c5 100644 --- a/src/config/io/generateTypeData.ts +++ b/src/config/io/generateTypeData.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 { - 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 { } async function generateTypeData(): Promise { - 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, diff --git a/src/styles/main-page.css b/src/styles/main-page.css index 132a27b..bafb19b 100644 --- a/src/styles/main-page.css +++ b/src/styles/main-page.css @@ -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 {