Merge branch 'main' into thilobillerbeck/fonts

Author: thilobillerbeck

.github/workflows/deploy-pr.yml

@@ -59,7 +59,7 @@ jobs:
           persist-credentials: false
           clean: true
       - name: "Installing Nix"
-        uses: "cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7" # v31.8.2
+        uses: "cachix/install-nix-action@7ec16f2c061ab07b235a7245e06ed46fe9a1cab6" # v31.8.3
       - name: "Build"
         run: nix build
       - name: "Upload build artifact"

.github/workflows/deploy-prod.yml

@@ -29,7 +29,7 @@ jobs:
           persist-credentials: false
 
       - name: 'Installing Nix'
-        uses: 'cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801' # v31.8.0
+        uses: 'cachix/install-nix-action@7ec16f2c061ab07b235a7245e06ed46fe9a1cab6' # v31.8.3
 
       - name: 'Setup Cachix'
         uses: 'cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad' # v16

.github/workflows/update-flake-lock.yml

@@ -22,7 +22,7 @@ jobs:
           persist-credentials: false
 
       - name: 'Install Nix'
-        uses: 'cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801' # v31.8.0
+        uses: 'cachix/install-nix-action@7ec16f2c061ab07b235a7245e06ed46fe9a1cab6' # v31.8.3
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}

core/astro.config.mjs

@@ -10,6 +10,7 @@ import syntaxTheme from './src/lib/shiki/theme.json';
 import favicons from 'astro-favicons';
 
 import { createRequire } from 'module';
+import shellPromptTransformer from './src/lib/shiki/shellPromptTransformer';
 const require = createRequire(import.meta.url);
 
 function selectFavicon(theme = 'default') {
@@ -51,6 +52,7 @@ export default defineConfig({
   markdown: {
     shikiConfig: {
       theme: syntaxTheme,
+      transformers: [shellPromptTransformer],
     },
   },
   compressHTML: true,

core/package.json

@@ -13,30 +13,30 @@
     "linkcheck:full": "linkchecker http://localhost:4321"
   },
   "dependencies": {
-    "@astrojs/mdx": "^4.3.7",
-    "@astrojs/rss": "^4.0.12",
+    "@astrojs/mdx": "^4.3.10",
+    "@astrojs/rss": "^4.0.13",
     "@astrojs/sitemap": "^3.6.0",
     "@fontsource-variable/fira-code": "^5.2.7",
     "@fontsource-variable/overpass": "^5.2.8",
     "@fontsource-variable/roboto-flex": "^5.2.8",
-    "@tailwindcss/vite": "^4.1.14",
+    "@tailwindcss/vite": "^4.1.17",
     "@xmldom/xmldom": "^0.9.8",
     "asciinema-player": "^3.12.1",
-    "astro": "^5.14.4",
+    "astro": "^5.15.4",
     "astro-favicons": "^3.1.5",
     "astro-icon": "^1.1.5",
     "astro-seo": "^0.8.4",
     "class-variance-authority": "^0.7.1",
-    "htmx.org": "^2.0.7",
+    "htmx.org": "^2.0.8",
     "markdown-it": "^14.0.0",
     "node-html-parser": "^7.0.1",
     "sanitize-html": "^2.17.0",
     "tailwindcss": "^4.0.0",
-    "turndown": "^7.2.1"
+    "turndown": "^7.2.2"
   },
   "devDependencies": {
     "@iconify-json/mdi": "^1.2.3",
-    "@iconify-json/simple-icons": "^1.2.54",
+    "@iconify-json/simple-icons": "^1.2.58",
     "@iconify/tailwind": "^1.2.0"
   }
 }

core/src/assets/image/branding_guide_title_page.png

@@ -0,0 +1,70 @@
+---
+import Button from '@/components/ui/Button.astro';
+import { Code } from 'astro:components';
+
+const {
+  type = 'logo',
+  fillStyle = 'gradient',
+  color = 'rainbow',
+  fontColor = 'black',
+  orientation = 'horizontal',
+  style = 'regular',
+  variant = 'recommended',
+} = Astro.props;
+
+const brandUrl = `https://brand.nixos.org/logos/nixos-${type}-${color}-${fillStyle}-${fontColor}-${style}-${orientation}-${variant}.svg`;
+---
+
+<div class="bg-secondary-afghani-blue-95 rounded-2xl p-4">
+  <img
+    src={brandUrl}
+    class:list={[
+      'w-auto rounded-2xl',
+      fontColor === 'white' ? 'bg-primary-black' : 'bg-primary-white',
+    ]}
+  />
+  <div class="mb-3 flex items-center gap-2 pt-4">
+    <Code class="rounded-xl px-2 py-1" code={brandUrl} />
+  </div>
+  <div class="flex w-full justify-end gap-2">
+    <Button
+      color="semidarkblue"
+      size="sm-mobfull"
+      href={brandUrl}
+      icon="mdi:download"
+      label="Download"
+    />
+    <Button
+      color="semidarkblue"
+      size="sm-mobfull"
+      data-url={brandUrl}
+      classList={['hidden']}
+      icon="mdi:content-copy"
+      label="Copy URL"
+    />
+  </div>
+</div>
+
+<script>
+  document.querySelectorAll('button[data-url]').forEach((button) => {
+    button.classList.remove('hidden');
+    button.addEventListener('click', () => {
+      const url = button.getAttribute('data-url');
+      navigator.clipboard.writeText(url).then(
+        function () {
+          button.classList.toggle('bg-accent-zambian-green-55!');
+          setTimeout(() => {
+            button.classList.toggle('bg-accent-zambian-green-55!');
+          }, 1000);
+        },
+        function (err) {
+          console.error('Async: Could not copy text: ', err);
+          button.classList.toggle('bg-accent-persian-orange-55!');
+          setTimeout(() => {
+            button.classList.toggle('bg-accent-persian-orange-55!');
+          }, 1000);
+        },
+      );
+    });
+  });
+</script>

core/src/components/pages/branding/LogoContainer.astro

@@ -57,6 +57,7 @@ const {
   label,
   nonPublic = false,
   icon = undefined,
+  ...other
 } = Astro.props;
 
 const setIconSize = (size: string) => {
@@ -90,6 +91,7 @@ const setIconSize = (size: string) => {
           icon && 'flex items-center justify-start gap-4',
           !icon && 'flex items-center justify-center gap-1',
         ]}
+        {...other}
       >
         {icon && <Icon name={icon} size={setIconSize(size)} />}
         {nonPublic && <Icon name="mdi:lock" />}
@@ -112,9 +114,10 @@ const setIconSize = (size: string) => {
         classList,
         icon && 'flex items-center justify-start gap-4',
       ]}
+      {...other}
     >
       {icon && <Icon name={icon} />}
-      <slot />
+      {label || <slot />}
     </button>
   )
 }

core/src/components/ui/Button.astro

@@ -18,11 +18,12 @@ import Banner from '@/components/ui/Banner.astro';
       Second Steering Committee Election
     </span>
     <span class="text-md text-primary-white">
-      Registration for voters and candidates is now open!
+      Voter registration is still open and voting has started. Click for
+      details.
     </span>
   </span>
   <a
-    href="https://discourse.nixos.org/t/the-election-committee-announces-the-second-steering-committee-election/69354/1"
+    href="https://github.com/NixOS/SC-election-2025/?tab=readme-ov-file#timeline"
     target="_blank"
     rel="noopener noreferrer"
     class="bg-primary-white hover:bg-primary-black hover:text-primary-white mt-1.5 w-full rounded-md px-4 py-3 text-center leading-none font-bold text-black no-underline md:mt-0 md:w-auto"

core/src/content/banners/survey-2025-and-sc.mdx

@@ -1,27 +1,29 @@
 ---
 sitewide:
-  message: 'Nix Community Survey 2025 is here!'
+  message: 'Nix Community Survey 2025 is still running!'
   link:
     url: https://survey.nixos.org/759934
     text: 'Take the Survey'
-  wrapperClasses: 'bg-[#260D40] text-white'
+  wrapperClasses: 'bg-[#260D40] text-primary-white'
 ---
 
 import Banner from '@/components/ui/Banner.astro';
 
 <Banner
-  wrapperClasses="bg-gradient-to-r from-[#260D40] to-nix-blue text-white"
+  wrapperClasses="bg-gradient-to-r from-[#260D40] to-secondary-afghani-blue text-primary-white"
   class="font-heading flex flex-col items-center justify-between gap-1 text-lg font-bold md:flex-row"
 >
   <span class="flex flex-col">
-    <span class="text-2xl font-bold">Nix Community Survey 2025 is here!</span>
+    <span class="text-2xl font-bold">
+      Nix Community Survey 2025 is still running!
+    </span>
     <span class="text-md">Help us improve by sharing your feedback.</span>
   </span>
   <a
     href="https://survey.nixos.org/759934"
     target="_blank"
     rel="noopener noreferrer"
-    class="mt-1.5 w-full rounded-md bg-white px-4 py-3 text-center leading-none font-bold text-black no-underline hover:bg-black hover:text-white md:mt-0 md:w-auto"
+    class="bg-primary-white hover:bg-primary-black hover:text-primary-white mt-1.5 w-full rounded-md px-4 py-3 text-center leading-none font-bold text-black no-underline md:mt-0 md:w-auto"
   >
     Take the Survey
   </a>