Merge branch 'main' into feat/focus

.github/CODEOWNERS

@@ -55,6 +55,7 @@
 /styles/nitter @AnubisNekhet
 /styles/nixos-search @cecelot
 /styles/npm @uncenter
+/styles/ollama @NeonGamerBot-QK
 /styles/openmediavault @Gandalf-the-Blue
 /styles/paste.rs @Guaxinim5573
 /styles/perplexity @Tnixc

.github/ISSUE_TEMPLATE/userstyle.yml

@@ -16,7 +16,7 @@ body:
       label: What userstyles are you seeing the problem on?
       description: "Don't worry about the `lbl:` prefix, it allows issues to be automatically labeled!"
       multiple: true
-      options: ["lbl:advent-of-code", "lbl:amplenote", "lbl:anilist", "lbl:arch-wiki", "lbl:boringproxy", "lbl:brave-search", "lbl:bsky", "lbl:bstats", "lbl:canvas-lms", "lbl:chatgpt", "lbl:chatreplay", "lbl:chess.com", "lbl:cinny", "lbl:codeberg", "lbl:cobalt", "lbl:crates.io", "lbl:crowdin", "lbl:deepl", "lbl:docs.rs", "lbl:duckduckgo", "lbl:ecosia", "lbl:elk", "lbl:freedesktop", "lbl:formative", "lbl:github", "lbl:gmail", "lbl:go.dev", "lbl:google", "lbl:google-drive", "lbl:google-photos", "lbl:graphite", "lbl:google-gemini", "lbl:hackage", "lbl:hacker-news", "lbl:holodex", "lbl:home-manager-options-search", "lbl:homepage", "lbl:hoppscotch", "lbl:hyperpipe", "lbl:ichi.moe", "lbl:inoreader", "lbl:instagram", "lbl:invidious", "lbl:invokeai", "lbl:keyoxide", "lbl:lastfm", "lbl:lemmy", "lbl:libreddit", "lbl:lichess", "lbl:lingva", "lbl:linkedin", "lbl:listenbrainz", "lbl:mastodon", "lbl:mdbook", "lbl:mdn", "lbl:modrinth", "lbl:microsoft-word", "lbl:migadu-webmail", "lbl:minesweeper", "lbl:nitter", "lbl:nixos-search", "lbl:nixos.wiki", "lbl:npm", "lbl:openmediavault", "lbl:paste.rs", "lbl:perplexity", "lbl:phanpy", "lbl:picrew", "lbl:pinterest", "lbl:planet-minecraft", "lbl:porkbun", "lbl:pronouns.page", "lbl:proton", "lbl:pypi", "lbl:quizlet", "lbl:raindrop", "lbl:reddit", "lbl:searxng", "lbl:shinigami-eyes", "lbl:snapchat-web", "lbl:spotify-web", "lbl:stack-overflow", "lbl:startpage", "lbl:stylus", "lbl:substack", "lbl:syncthing", "lbl:tabnews", "lbl:tldraw", "lbl:trinket", "lbl:tuta", "lbl:twitch", "lbl:twitter", "lbl:vercel", "lbl:vikunja", "lbl:web.dev", "lbl:whatsapp-web", "lbl:wikipedia", "lbl:wikiwand", "lbl:youtube"]
+      options: ["lbl:advent-of-code", "lbl:amplenote", "lbl:anilist", "lbl:arch-wiki", "lbl:boringproxy", "lbl:brave-search", "lbl:bsky", "lbl:bstats", "lbl:canvas-lms", "lbl:chatgpt", "lbl:chatreplay", "lbl:chess.com", "lbl:cinny", "lbl:codeberg", "lbl:cobalt", "lbl:crates.io", "lbl:crowdin", "lbl:deepl", "lbl:docs.rs", "lbl:duckduckgo", "lbl:ecosia", "lbl:elk", "lbl:freedesktop", "lbl:formative", "lbl:github", "lbl:gmail", "lbl:go.dev", "lbl:google", "lbl:google-drive", "lbl:google-photos", "lbl:graphite", "lbl:google-gemini", "lbl:hackage", "lbl:hacker-news", "lbl:holodex", "lbl:home-manager-options-search", "lbl:homepage", "lbl:hoppscotch", "lbl:hyperpipe", "lbl:ichi.moe", "lbl:inoreader", "lbl:instagram", "lbl:invidious", "lbl:invokeai", "lbl:keyoxide", "lbl:lastfm", "lbl:lemmy", "lbl:libreddit", "lbl:lichess", "lbl:lingva", "lbl:linkedin", "lbl:listenbrainz", "lbl:mastodon", "lbl:mdbook", "lbl:mdn", "lbl:modrinth", "lbl:microsoft-word", "lbl:migadu-webmail", "lbl:minesweeper", "lbl:nitter", "lbl:nixos-search", "lbl:nixos.wiki", "lbl:npm", "lbl:ollama", "lbl:openmediavault", "lbl:paste.rs", "lbl:perplexity", "lbl:phanpy", "lbl:picrew", "lbl:pinterest", "lbl:planet-minecraft", "lbl:porkbun", "lbl:pronouns.page", "lbl:proton", "lbl:pypi", "lbl:quizlet", "lbl:raindrop", "lbl:reddit", "lbl:searxng", "lbl:shinigami-eyes", "lbl:snapchat-web", "lbl:spotify-web", "lbl:stack-overflow", "lbl:startpage", "lbl:stylus", "lbl:substack", "lbl:syncthing", "lbl:tabnews", "lbl:tldraw", "lbl:trinket", "lbl:tuta", "lbl:twitch", "lbl:twitter", "lbl:vercel", "lbl:vikunja", "lbl:web.dev", "lbl:whatsapp-web", "lbl:wikipedia", "lbl:wikiwand", "lbl:youtube"]
     validations:
       required: true
   - type: textarea

.github/issue-labeler.yml

@@ -125,6 +125,8 @@ nixos.wiki:
   - '/lbl:nixos.wiki(,.*)?$/gm'
 npm:
   - '/lbl:npm(,.*)?$/gm'
+ollama:
+  - '/lbl:ollama(,.*)?$/gm'
 openmediavault:
   - '/lbl:openmediavault(,.*)?$/gm'
 paste.rs:

.github/labels.yml

@@ -188,6 +188,9 @@
 - name: npm
   description: npm
   color: '#ed8796'
+- name: ollama
+  description: Ollama
+  color: '#cad3f5'
 - name: openmediavault
   description: openmediavault
   color: '#91d7e3'

.github/pr-labeler.yml

@@ -62,6 +62,7 @@ nitter: styles/nitter/**/*
 nixos-search: styles/nixos-search/**/*
 nixos.wiki: styles/nixos.wiki/**/*
 npm: styles/npm/**/*
+ollama: styles/ollama/**/*
 openmediavault: styles/openmediavault/**/*
 paste.rs: styles/paste.rs/**/*
 perplexity: styles/perplexity/**/*

README.md

@@ -109,6 +109,7 @@ See [CONTRIBUTING.md](docs/CONTRIBUTING.md).
 - [Keyoxide](styles/keyoxide)
 - [MDN](styles/mdn)
 - [npm](styles/npm)
+- [Ollama](styles/ollama)
 - [paste.rs](styles/paste.rs)
 - [PyPI](styles/pypi)
 - [Stack Overflow](styles/stack-overflow)

deno.json

@@ -9,7 +9,7 @@
     "@std/fmt": "jsr:@std/fmt@^0.225.6",
     "@std/fs": "jsr:@std/fs@^1.0.1",
     "@std/path": "jsr:@std/path@^1.0.2",
-    "@std/yaml": "jsr:@std/yaml@^1.0.2",
+    "@std/yaml": "jsr:@std/yaml@^1.0.3",
     "ajv": "npm:[email protected]",
     "catppuccin-repo/": "https://raw.githubusercontent.com/catppuccin/catppuccin/d4f2666c2b04337f0a8632713de0889d9a7d332d/",
     "handlebars": "npm:[email protected]",

scripts/userstyles.yml

@@ -138,6 +138,8 @@ collaborators:
     url: https://github.com/stellophiliac
   - &incognitotgt
     url: https//github.com/incognitotgt
+  - &neongamerbot
+    url: https://github.com/NeonGamerBot-QK
 
 userstyles:
   advent-of-code:
@@ -664,6 +666,13 @@ userstyles:
     readme:
       app-link: "https://www.npmjs.com/"
     current-maintainers: [*uncenter]
+  ollama:
+    name: Ollama
+    categories: [development]
+    color: text
+    readme:
+      app-link: "https://ollama.com"
+    current-maintainers: [*neongamerbot]
   openmediavault:
     name: openmediavault
     categories: [productivity]

shell.nix

@@ -1,14 +1,12 @@
 {
   deno,
-  typos,
   mkShellNoCC,
   nodePackages,
   ...
 }:
 mkShellNoCC {
   packages = [
     deno
-    typos
     nodePackages.prettier
   ];
 }

styles/chess.com/generate.py

@@ -0,0 +1,38 @@
+# /// script
+# requires-python = ">=3.11"
+# dependencies = [
+#     "boardinator==0.1.0",
+#     "catppuccin==2.1.0",
+# ]
+# ///
+import os
+from catppuccin import PALETTE
+from boardinator.boardinator import replace_colors
+
+cwd = os.getcwd()
+
+for flavor in PALETTE:
+    for color in flavor.colors:
+        if not color.accent:
+            continue
+        color_dict = {
+            # Light grayish yellow green
+            (237, 238, 209): (
+                flavor.colors.base.rgb.r,
+                flavor.colors.base.rgb.g,
+                flavor.colors.base.rgb.b,
+            ),
+            # Dark grayish yellow green
+            (119, 153, 82): (
+                color.rgb.r,
+                color.rgb.g,
+                color.rgb.b,
+            ),
+        }
+        replace_colors(
+            image_path=os.path.join(cwd, "assets/base/colorboard.png"),
+            output_path=os.path.join(
+                cwd, f"assets/{flavor.identifier}/{color.identifier}.png"
+            ),
+            color_dict=color_dict,
+        )