ci: use hosted branding npm-package

Author: thilobillerbeck

.gitignore

@@ -8,5 +8,3 @@ npm-debug.log*
 .pre-commit-config.yaml
 # Local Netlify folder
 .netlify
-
-@NixOS/branding

core/astro.config.mjs

@@ -16,13 +16,9 @@ const require = createRequire(import.meta.url);
 function selectFavicon(theme = 'default') {
   switch (theme) {
     case 'pride':
-      return require.resolve(
-        `${process.env.npm_config_local_prefix}/@NixOS/branding/artifacts/internal/nixos-logomark-rainbow-gradient-none.svg`,
-      );
+      return require.resolve("@nixos/branding/artifacts/internal/nixos-logomark-rainbow-gradient-none.svg");
     default:
-      return require.resolve(
-        `${process.env.npm_config_local_prefix}/@NixOS/branding/artifacts/internal/nixos-logomark-default-gradient-none.svg`,
-      );
+      return require.resolve("@nixos/branding/artifacts/internal/nixos-logomark-default-gradient-none.svg");
   }
 }
 // https://astro.build/config

core/package.json

@@ -35,6 +35,7 @@
     "turndown": "^7.2.2"
   },
   "devDependencies": {
+    "@nixos/branding": "^0.1.0",
     "@iconify-json/mdi": "^1.2.3",
     "@iconify-json/simple-icons": "^1.2.59",
     "@iconify/tailwind": "^1.2.0"

core/src/components/Footer.astro

@@ -8,7 +8,7 @@ import { Image } from 'astro:assets';
 
 const footerMenu = await getEntry('menus', 'footer');
 
-import logoWHite from '@NixOS/branding/artifacts/internal/nixos-logomark-white-flat-none.svg';
+import logoWHite from '@nixos/branding/artifacts/internal/nixos-logomark-white-flat-none.svg';
 ---
 
 <footer>

core/src/lib/themes.ts

@@ -1,5 +1,5 @@
-import logoDefault from '@NixOS/branding/artifacts/internal/nixos-logo-default-gradient-black-regular-horizontal-none.svg';
-import logoRainbow from '@NixOS/branding/artifacts/internal/nixos-logo-rainbow-gradient-black-regular-horizontal-none.svg';
+import logoDefault from '@nixos/branding/artifacts/internal/nixos-logo-default-gradient-black-regular-horizontal-none.svg';
+import logoRainbow from '@nixos/branding/artifacts/internal/nixos-logo-rainbow-gradient-black-regular-horizontal-none.svg';
 import { THEME } from 'astro:env/client';
 
 export function getNixosLogoUrl() {

core/tailwind.config.cjs

@@ -5,7 +5,7 @@ import path from 'node:path';
 import parser from 'node-html-parser';
 import svgo from 'svgo';
 import defaultTheme from 'tailwindcss/defaultTheme';
-import colors from '@NixOS/branding/colors/tailwind.js';
+import colors from '@nixos/branding/colors/tailwind.js';
 
 const inlineSvgs = {
   hero: './src/assets/image/hero-bg.svg',

flake.lock

@@ -14,9 +14,6 @@ rec {
     released-nix-stable.url = "github:nixos/nix/latest-release";
     nix-pills.url = "github:NixOS/nix-pills";
     nix-pills.flake = false;
-
-    # NixOS branding
-    branding.url = "github:NixOS/branding";
   };
 
   nixConfig = {
@@ -35,7 +32,6 @@ rec {
       self,
       flake-parts,
       git-hooks-nix,
-      branding,
       nixpkgs,
       released-nixpkgs-unstable,
       released-nixpkgs-stable,
@@ -215,13 +211,6 @@ rec {
 
             makeCacheWritable = true;
 
-            preConfigure = ''
-              mkdir -p @NixOS/branding
-              cp -R --no-preserve=mode,ownership ${
-                branding.hydraJobs.nixos-branding.${system}.npm-package
-              }/* ./@NixOS/branding
-            '';
-
             buildPhase = ''
               export NIX_STABLE_VERSION="${NIX_STABLE_VERSION}"
               export NIX_UNSTABLE_VERSION="${NIX_UNSTABLE_VERSION}"
@@ -317,14 +306,6 @@ rec {
               export PATH_PILLS="${pills}"
               export PATH_DEMOS="${demos}"
 
-              if [ -d @NixOS/branding ]; then
-                rm -rf @NixOS/branding
-              fi
-              mkdir -p @NixOS/branding
-              cp -R --no-preserve=mode,ownership ${
-                branding.hydraJobs.nixos-branding.${system}.npm-package
-              }/* ./@NixOS/branding
-
               if [ ! -d node_modules ]; then
                 ${nodejs_current}/bin/npm install --workspaces --include-workspace-root
               fi