galaaz 2.1.10.pre.4 → 2.1.10.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3ee446f657b5eac4bb8ef351c3a7adbe0246b8d750288bffab68c43e83e10bf
-  data.tar.gz: e00e643ae69cc1fae159706c6b06b8e9c291e4060814b5b3feafc4abb722454c
+  metadata.gz: b1175b28a0271d54017f9688e6436c326da0305c6b383285d9a4adb11538018d
+  data.tar.gz: 43c3c80c7764e8a959d45b382a781c1a504e4ea7b3c7028dc3763e8c3493b04e
 SHA512:
-  metadata.gz: 7a6fac11ad1080ebb3d4161fb228f5c259dfe979562842d3284af368538fec452f2a3ee78074dcca444f9889f4f3808a86d4e4d9b616805ff4cc0281c9e7400c
-  data.tar.gz: 87e43043e7bc22a13e96a691c23e9b9410655ec3b4df22c99766177cf5c9b08961ade4b27e6894ee777c13113abeab23bbd27c719d785f7079091c5ff2b1f36c
+  metadata.gz: a038c5ac9ff9eaacd0cd85af5e8613675e27157e2eea28b006d15d6b9083f8059b65b45e5ad8eedacffba22b464c68e288c82f1c2cb2dbf0c3074526f16eaa2e
+  data.tar.gz: 4f2eb91d9ccf66c15ad503116a0e14602491b73623eca7395ca2a2dedc6342e900f34ba2d838405879660ff62a74b7fed62163658a6ea33ae0085108affc7149

data/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 ## Unreleased
 
+## 2.1.10.pre.6
+
+### Changed
+
+- Omarchy **Galaaz (core)** no longer runs `gem install` / uninstall. Flow is:
+  `gem install galaaz` → `galaaz omarchy install` → menu core (setup + blogs).
+- `galaaz --version` / `-v` / `version` prints the installed gem version;
+  `galaaz doctor` shows `version:`.
+- `galaaz blogs sync` refreshes sty + logo includes without wiping blogs;
+  core installer syncs on re-run; `galaaz add knit` refreshes brand assets.
+
+## 2.1.10.pre.5
+
+### Fixed
+
+- Omarchy menu icons: use `"iconFont": "omarchy"` + **U+E90E** via shipped
+  `omarchy-with-galaaz.ttf` (Omarchy brand font + Galaaz R/gem). A custom
+  family `galaaz` alone rendered as missing-glyph tofu (`//'`) because Qt
+  does not load that family for the menu.
+
 ## 2.1.10.pre.4
 
 ### Fixed

data/lib/galaaz/cli.rb

@@ -30,8 +30,12 @@ module Galaaz
       ['debug-galaaz.sh', 'omarchy-galaaz-debug', true]
     ].freeze
     OMARCHY_MENU_FILE = 'omarchy-menu.jsonc'
+    # Standalone family "galaaz" (debug). Menu uses the merged Omarchy brand font.
     OMARCHY_FONT_REL = File.join('fonts', 'galaaz.ttf')
-    OMARCHY_FONT_FAMILY = 'galaaz'
+    OMARCHY_MERGED_FONT_REL = File.join('fonts', 'omarchy-with-galaaz.ttf')
+    # Menu rows use iconFont "omarchy" + U+E90E (Qt already loads family omarchy).
+    OMARCHY_MENU_FONT_FAMILY = 'omarchy'
+    OMARCHY_MENU_CODEPOINT = 0xE90E
     BLOGS_MARKER = '.galaaz-blogs'
     EXAMPLES_MARKER = '.galaaz-examples'
     CRAN = 'https://cloud.r-project.org'
@@ -44,12 +48,34 @@ module Galaaz
       File.expand_path('../..', __dir__)
     end
 
+    def gem_version
+      spec = Gem.loaded_specs['galaaz']
+      return spec.version.to_s if spec
+
+      begin
+        return Gem::Specification.find_by_name('galaaz').version.to_s
+      rescue LoadError, Gem::LoadError, NameError
+        # fall through to version.rb
+      end
+
+      version_rb = File.join(root, 'version.rb')
+      if File.file?(version_rb)
+        load version_rb
+        return $version.to_s if defined?($version) && $version
+      end
+
+      'unknown'
+    end
+
     def run(argv)
       cmd = argv[0]
       case cmd
       when nil, '-h', '--help', 'help'
         print_help
         0
+      when '-v', '--version', 'version'
+        puts "galaaz #{gem_version}"
+        0
       when 'setup'
         cmd_setup
       when 'blogs'
@@ -78,18 +104,21 @@ module Galaaz
     def print_help
       puts <<~HELP
         Usage: galaaz <command> [args]
+               galaaz --version
 
         Commands:
           setup                 Build the NewBridge gatekeeper; ensure Rcpp
           blogs init [DIR]      Copy blog sources (default: ~/galaaz-blogs)
                                 and sty/galaaz.sty for PDF headers
                                 Options: --force
+          blogs sync [DIR]      Refresh sty + logo includes without wiping blogs
           doctor                Report Ruby, R, gatekeeper, Rcpp, sty, profiles
           add PROFILE           Install an add-on (idempotent)
                                 Profiles: #{PROFILES.join(', ')}
           omarchy [install]     Install Omarchy menu overlay (bundled in gem)
                                 Options: --from-git [--ref REF]
           omarchy status        Show whether overlay helpers are installed
+          --version, -v         Print installed gem version (#{gem_version})
 
         Legacy: any other argument is passed to rake in the Galaaz root
         (e.g. galaaz master_list:scatter_plot).
@@ -152,7 +181,8 @@ module Galaaz
         Writes:
           ~/.local/bin/omarchy-install-galaaz (and add/remove/guide/gknit/debug)
           ~/.config/omarchy/extensions/omarchy-menu.jsonc
-          ~/.local/share/fonts/galaaz/galaaz.ttf (menu brand mark)
+          ~/.local/share/fonts/galaaz/galaaz.ttf
+          ~/.local/share/fonts/omarchy-with-galaaz.ttf (family omarchy + U+E90E)
 
         Then: Super+Space → Install → Development → Galaaz
       HELP
@@ -199,7 +229,9 @@ module Galaaz
       end
       puts "  menu: #{File.file?(menu) ? menu : 'MISSING'}"
       font = File.expand_path('~/.local/share/fonts/galaaz/galaaz.ttf')
-      puts "  font: #{File.file?(font) ? font : 'MISSING'}"
+      puts "  font galaaz: #{File.file?(font) ? font : 'MISSING'}"
+      merged = File.expand_path('~/.local/share/fonts/omarchy-with-galaaz.ttf')
+      puts "  font omarchy+galaaz: #{File.file?(merged) ? merged : 'MISSING'}"
       bundled = File.join(root, 'script', 'omarchy')
       puts "  gem overlay: #{File.directory?(bundled) ? bundled : 'MISSING (reinstall gem)'}"
       0
@@ -211,7 +243,8 @@ module Galaaz
       abort_unless(
         File.file?(File.join(d, 'install-galaaz.sh')) &&
           File.file?(File.join(d, OMARCHY_MENU_FILE)) &&
-          File.file?(File.join(d, OMARCHY_FONT_REL)),
+          File.file?(File.join(d, OMARCHY_FONT_REL)) &&
+          File.file?(File.join(d, OMARCHY_MERGED_FONT_REL)),
         "incomplete Omarchy overlay in gem (#{d})"
       )
       d
@@ -222,7 +255,7 @@ module Galaaz
       tmp = Dir.mktmpdir('galaaz-omarchy-')
       base = "https://raw.githubusercontent.com/#{OMARCHY_GITHUB_REPO}/#{ref}/script/omarchy"
       puts "galaaz omarchy: fetching #{base}/…"
-      names = OMARCHY_BIN_FILES.map(&:first) + [OMARCHY_MENU_FILE, OMARCHY_FONT_REL]
+      names = OMARCHY_BIN_FILES.map(&:first) + [OMARCHY_MENU_FILE, OMARCHY_FONT_REL, OMARCHY_MERGED_FONT_REL]
       names.uniq.each do |name|
         url = "#{base}/#{name}"
         dest = File.join(tmp, name)
@@ -262,18 +295,53 @@ module Galaaz
     end
 
     def install_omarchy_font_from!(src_dir)
+      # 1) Standalone galaaz.ttf (family galaaz) — debugging / fc-list checks.
       src = File.join(src_dir, OMARCHY_FONT_REL)
       abort_unless(File.file?(src), "missing #{src} (rebuild with logos/icon-font/build_font.py)")
       fonts = File.expand_path('~/.local/share/fonts/galaaz')
       FileUtils.mkdir_p(fonts)
       dest = File.join(fonts, 'galaaz.ttf')
       FileUtils.cp(src, dest)
-      puts "galaaz omarchy: #{dest} (family #{OMARCHY_FONT_FAMILY}, U+E920)"
+      puts "galaaz omarchy: #{dest} (family galaaz, debug)"
+
+      # 2) Merged Omarchy brand font with Galaaz at U+E90E. Menu uses
+      #    iconFont "omarchy" — the same family Cursor/Grok icons use, which Qt
+      #    already loads. A custom family "galaaz" alone shows missing-glyph tofu.
+      merged_src = File.join(src_dir, OMARCHY_MERGED_FONT_REL)
+      abort_unless(
+        File.file?(merged_src),
+        "missing #{merged_src} (rebuild with logos/icon-font/build_font.py)"
+      )
+      # Prefer user font over /usr/share/fonts/**/omarchy.ttf
+      user_fonts = File.expand_path('~/.local/share/fonts')
+      FileUtils.mkdir_p(user_fonts)
+      merged_dest = File.join(user_fonts, 'omarchy-with-galaaz.ttf')
+      FileUtils.cp(merged_src, merged_dest)
+      puts "galaaz omarchy: #{merged_dest} (family #{OMARCHY_MENU_FONT_FAMILY}, U+#{OMARCHY_MENU_CODEPOINT.to_s(16).upcase})"
+
+      conf_dir = File.expand_path('~/.config/fontconfig/conf.d')
+      FileUtils.mkdir_p(conf_dir)
+      conf = File.join(conf_dir, '99-galaaz-omarchy-brand.conf')
+      File.write(conf, <<~XML)
+        <?xml version="1.0"?>
+        <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+        <fontconfig>
+          <!-- Prefer Galaaz-extended Omarchy brand font (adds U+E90E). -->
+          <selectfont>
+            <rejectfont>
+              <glob>*/omarchy/omarchy.ttf</glob>
+            </rejectfont>
+          </selectfont>
+        </fontconfig>
+      XML
+      puts "galaaz omarchy: #{conf}"
+
       if command_present?('fc-cache')
         system('fc-cache', '-r')
         system('fc-cache', '-f', fonts)
+        system('fc-cache', '-f', user_fonts)
       end
-      warn 'galaaz omarchy: restart the Omarchy shell so Qt picks up the galaaz font' \
+      warn 'galaaz omarchy: logout/reboot required for Qt to reload brand fonts (killall omarchy-shell is often not enough)' \
         if ENV['OMARCHY_PATH'] || File.directory?(File.expand_path('~/.config/omarchy'))
     end
 
@@ -284,11 +352,14 @@ module Galaaz
       case sub
       when 'init'
         blogs_init(argv[1..])
+      when 'sync'
+        blogs_sync(argv[1..])
       when nil, '-h', '--help'
         puts 'Usage: galaaz blogs init [DIR] [--force]'
+        puts '       galaaz blogs sync [DIR]   # refresh sty + logo includes (no wipe)'
         0
       else
-        raise CliError, "unknown blogs subcommand: #{sub.inspect} (try: init)"
+        raise CliError, "unknown blogs subcommand: #{sub.inspect} (try: init|sync)"
       end
     end
 
@@ -301,7 +372,7 @@ module Galaaz
       if File.exist?(dest)
         entries = Dir.children(dest).reject { |n| n.start_with?('.') }
         if !entries.empty? && !force
-          raise CliError, "#{dest} exists and is not empty (use --force to replace)"
+          raise CliError, "#{dest} exists and is not empty (use --force to replace, or: galaaz blogs sync)"
         end
         FileUtils.rm_rf(dest) if force
       end
@@ -316,16 +387,28 @@ module Galaaz
       end
 
       File.write(File.join(dest, BLOGS_MARKER), "galaaz blogs init\n")
-      install_galaaz_sty_for_blogs!(dest)
+      ensure_blog_knit_assets!(dest)
       puts "galaaz blogs init: #{dest}"
       puts "You can now knit with gknit (after: galaaz add knit)"
       0
     end
 
+    # Refresh sty + per-blog logo includes without wiping ~/galaaz-blogs.
+    # Needed after gem upgrades that ship new branding assets (pandoc error 99
+    # when _logo_before_body.html / lockup PNG / sty were missing from an older init).
+    def blogs_sync(argv)
+      dest = File.expand_path(argv[0] || detect_blogs_dir || DEFAULT_BLOGS_DIR)
+      abort_unless(File.directory?(dest), "blogs dir missing: #{dest} (run: galaaz blogs init)")
+      n = ensure_blog_knit_assets!(dest)
+      puts "galaaz blogs sync: #{dest} (#{n} brand files refreshed)"
+      0
+    end
+
     # ---- doctor ----
 
     def cmd_doctor
       puts "galaaz doctor"
+      puts "  version:  #{gem_version}"
       puts "  root:     #{root}"
       print_ruby_engines
 
@@ -508,6 +591,11 @@ module Galaaz
       end
       mark_profile!('knit')
       puts 'galaaz add knit: OK'
+      blogs = detect_blogs_dir
+      if blogs
+        ensure_blog_knit_assets!(blogs)
+        puts 'galaaz add knit: refreshed blog brand assets (sty + logos)'
+      end
       puts 'Example knits (after blogs init → ~/galaaz-blogs):'
       puts '  gknit ~/galaaz-blogs/oh_my/oh_my.Rmd'
       puts '  gknit ~/galaaz-blogs/galaaz_ggplot/galaaz_ggplot.Rmd'
@@ -874,6 +962,35 @@ module Galaaz
       dest
     end
 
+    # Copy/overwrite brand includes required by blog YAML (pandoc before_body + PDF splash).
+    # Returns number of files written.
+    def ensure_blog_knit_assets!(blogs_dest)
+      blogs_dest = File.expand_path(blogs_dest)
+      install_galaaz_sty_for_blogs!(blogs_dest)
+      written = 0
+      BLOG_NAMES.each do |name|
+        src_blog = File.join(root, 'blogs', name)
+        dest_blog = File.join(blogs_dest, name)
+        next unless File.directory?(src_blog) && File.directory?(dest_blog)
+
+        logo_html = '_logo_before_body.html'
+        src_html = File.join(src_blog, logo_html)
+        if File.file?(src_html)
+          FileUtils.cp(src_html, File.join(dest_blog, logo_html))
+          written += 1
+        end
+
+        lockup = File.join('images', 'galaaz-lockup-stacked.png')
+        src_png = File.join(src_blog, lockup)
+        if File.file?(src_png)
+          FileUtils.mkdir_p(File.join(dest_blog, 'images'))
+          FileUtils.cp(src_png, File.join(dest_blog, lockup))
+          written += 1
+        end
+      end
+      written
+    end
+
     # TinyTeX installs to ~/.TinyTeX and often ~/bin; Omarchy PATH prefers ~/.local/bin.
     def ensure_pdflatex_on_path!
       return if command_present?('pdflatex')

data/logos/icon-font/README.md

@@ -4,9 +4,12 @@ Private TrueType font (`family: galaaz`) with one private-use glyph:
 
 | Codepoint | Name | Role |
 |-----------|------|------|
-| `U+E920` | `galaaz` | Monochrome R + gem cutout for Install menu rows |
+| `U+E90E` | `galaaz` | R + gem in **family omarchy** (`omarchy-with-galaaz.ttf`) |
 
-Do **not** reuse `U+E900` — Omarchy's private font already maps E900–E90D
+Menu rows must use `"iconFont": "omarchy"` (not `"galaaz"`). Qt already loads
+the Omarchy brand family; a custom family alone renders as missing-glyph tofu.
+
+Do **not** reuse `U+E900`–`U+E90D` — Omarchy's private font already maps those
 (waybar logo is `\ue900`).
 
 ## Sources

data/logos/icon-font/build_font.py

@@ -1,9 +1,18 @@
 #!/usr/bin/env python3
-"""Build script/omarchy/fonts/galaaz.ttf from logos/icon-font/galaaz-mark.svg."""
+"""Build Galaaz Omarchy menu fonts from logos/icon-font/galaaz-mark.svg.
+
+Produces:
+  script/omarchy/fonts/galaaz.ttf
+      Standalone family "galaaz" (previews / debugging).
+  script/omarchy/fonts/omarchy-with-galaaz.ttf
+      Omarchy brand font + Galaaz glyph at U+E90E (family still "omarchy").
+      Menu rows must use iconFont "omarchy" — Qt already loads that family.
+"""
 from __future__ import annotations
 
 import re
 import sys
+import urllib.request
 from pathlib import Path
 
 from fontTools.fontBuilder import FontBuilder
@@ -17,11 +26,17 @@ from fontTools.ttLib.tables._g_l_y_f import GlyphCoordinates
 ROOT = Path(__file__).resolve().parents[2]
 SVG = ROOT / "logos" / "icon-font" / "galaaz-mark.svg"
 OUT = ROOT / "script" / "omarchy" / "fonts" / "galaaz.ttf"
+OUT_MERGED = ROOT / "script" / "omarchy" / "fonts" / "omarchy-with-galaaz.ttf"
 PREVIEW_DIR = ROOT / "logos" / "icon-font" / "preview"
-# NOT U+E900: Omarchy's own brand font already owns E900–E90D (waybar logo).
-# Using that slot makes fallback look like Omarchy's mark, not Galaaz.
-CODEPOINT = 0xE920
-# Gem cutout must stay visible at menu size (~16px). Tiny holes collapse.
+OMARCHY_TTF_URL = (
+    "https://raw.githubusercontent.com/basecamp/omarchy/quattro/"
+    "default/fonts/omarchy/omarchy.ttf"
+)
+# Standalone family uses E920 (outside Omarchy E900–E90D).
+STANDALONE_CODEPOINT = 0xE920
+# Merged into family "omarchy" at first free slot after Omarchy's E90D.
+OMARCHY_CODEPOINT = 0xE90E
+GLYPH_NAME = "galaaz"
 MIN_HOLE_AREA_RATIO = 0.04
 
 
@@ -57,7 +72,6 @@ def fix_hole_windings(glyph: TTGlyph) -> None:
         pts = coords[start : end + 1]
         fl = flags[start : end + 1]
         area = signed_area(pts)
-        # Contour 0 = outer (CW); contour 1 = gem hole (CCW). Extra contours = CW fills.
         want_cw = i != 1
         is_cw = area < 0
         if want_cw != is_cw:
@@ -73,8 +87,41 @@ def fix_hole_windings(glyph: TTGlyph) -> None:
     glyph.numberOfContours = len(new_ends)
 
 
-def write_previews(ttf_path: Path) -> None:
-    """Write menu-size PNG previews next to the SVG (requires Pillow)."""
+def build_glyph() -> TTGlyph:
+    d = extract_path_d(SVG.read_text(encoding="utf-8"))
+    transform = Transform(1, 0, 0, -1, 0, 1000)
+    pen = TTGlyphPen(glyphSet=None)
+    SVGPath.fromstring(
+        f'<path d="{d}" fill-rule="evenodd"/>', transform=transform
+    ).draw(pen)
+    glyph = pen.glyph()
+    fix_hole_windings(glyph)
+    return glyph
+
+
+def assert_hole_ok(glyph: TTGlyph) -> None:
+    coords = list(glyph.coordinates)
+    ends = list(glyph.endPtsOfContours)
+    start = 0
+    areas = []
+    for i, end in enumerate(ends):
+        pts = coords[start : end + 1]
+        a = signed_area(pts)
+        areas.append(a)
+        print(f"  contour {i}: {'CW' if a < 0 else 'CCW'} area={a:.0f}")
+        start = end + 1
+    if len(areas) < 2:
+        raise SystemExit("expected outer + gem hole contours")
+    ratio = abs(areas[1]) / abs(areas[0]) if areas[0] else 0.0
+    print(f"  hole/outer area ratio: {ratio:.3f} (min {MIN_HOLE_AREA_RATIO})")
+    if ratio < MIN_HOLE_AREA_RATIO:
+        raise SystemExit(
+            f"gem cutout too small for menu size ({ratio:.3f} < {MIN_HOLE_AREA_RATIO}); "
+            "enlarge the hole in galaaz-mark.svg"
+        )
+
+
+def write_previews(ttf_path: Path, codepoint: int) -> None:
     try:
         from PIL import Image, ImageDraw, ImageFont
     except ImportError:
@@ -87,7 +134,7 @@ def write_previews(ttf_path: Path) -> None:
         img = Image.new("RGBA", (canvas, canvas), (30, 30, 30, 255))
         draw = ImageDraw.Draw(img)
         font = ImageFont.truetype(str(ttf_path), size)
-        ch = chr(CODEPOINT)
+        ch = chr(codepoint)
         bbox = draw.textbbox((0, 0), ch, font=font)
         w, h = bbox[2] - bbox[0], bbox[3] - bbox[1]
         x = (canvas - w) // 2 - bbox[0]
@@ -98,22 +145,12 @@ def write_previews(ttf_path: Path) -> None:
         print(f"  preview: {out}")
 
 
-def main() -> int:
-    d = extract_path_d(SVG.read_text(encoding="utf-8"))
-    transform = Transform(1, 0, 0, -1, 0, 1000)
-
-    pen = TTGlyphPen(glyphSet=None)
-    SVGPath.fromstring(
-        f'<path d="{d}" fill-rule="evenodd"/>', transform=transform
-    ).draw(pen)
-    glyph = pen.glyph()
-    fix_hole_windings(glyph)
-
+def build_standalone(glyph: TTGlyph) -> None:
     fb = FontBuilder(1000, isTTF=True)
-    fb.setupGlyphOrder([".notdef", "galaaz"])
-    fb.setupCharacterMap({CODEPOINT: "galaaz"})
-    fb.setupGlyf({".notdef": TTGlyph(), "galaaz": glyph})
-    fb.setupHorizontalMetrics({".notdef": (600, 0), "galaaz": (1000, 0)})
+    fb.setupGlyphOrder([".notdef", GLYPH_NAME])
+    fb.setupCharacterMap({STANDALONE_CODEPOINT: GLYPH_NAME})
+    fb.setupGlyf({".notdef": TTGlyph(), GLYPH_NAME: glyph})
+    fb.setupHorizontalMetrics({".notdef": (600, 0), GLYPH_NAME: (1000, 0)})
     fb.setupHorizontalHeader(ascent=1000, descent=0)
     fb.setupOS2(
         sTypoAscender=1000,
@@ -129,43 +166,87 @@ def main() -> int:
         {
             "familyName": "galaaz",
             "styleName": "Regular",
-            "uniqueFontIdentifier": "galaaz Regular 1.002 U+E920",
-            "fullName": "galaaz Regular",
-            "psName": "galaaz-Regular",
-            "version": "Version 1.002",
+            "uniqueFontIdentifier": "galaaz",
+            "fullName": "galaaz",
+            "psName": "galaaz",
+            "version": "Version 1.003",
             "manufacturer": "Galaaz",
-            "description": "Monochrome Galaaz mark for Omarchy menu rows (U+E920).",
+            "description": "Standalone Galaaz mark (U+E920). Menu uses omarchy-with-galaaz.ttf.",
         }
     )
     OUT.parent.mkdir(parents=True, exist_ok=True)
     fb.save(OUT)
+    assert TTFont(OUT).getBestCmap().get(STANDALONE_CODEPOINT) == GLYPH_NAME
+    print(f"wrote {OUT}  glyph U+{STANDALONE_CODEPOINT:04X} family=galaaz")
+    write_previews(OUT, STANDALONE_CODEPOINT)
 
-    tt = TTFont(OUT)
-    assert tt["cmap"].getBestCmap().get(CODEPOINT) == "galaaz"
-    g = tt["glyf"]["galaaz"]
-    coords = list(g.coordinates)
-    ends = list(g.endPtsOfContours)
-    start = 0
-    areas = []
-    for i, end in enumerate(ends):
-        pts = coords[start : end + 1]
-        a = signed_area(pts)
-        areas.append(a)
-        print(f"  contour {i}: {'CW' if a < 0 else 'CCW'} area={a:.0f}")
-        start = end + 1
-    if len(areas) < 2:
-        raise SystemExit("expected outer + gem hole contours")
-    outer = abs(areas[0])
-    hole = abs(areas[1])
-    ratio = hole / outer if outer else 0.0
-    print(f"  hole/outer area ratio: {ratio:.3f} (min {MIN_HOLE_AREA_RATIO})")
-    if ratio < MIN_HOLE_AREA_RATIO:
-        raise SystemExit(
-            f"gem cutout too small for menu size ({ratio:.3f} < {MIN_HOLE_AREA_RATIO}); "
-            "enlarge the hole in galaaz-mark.svg"
-        )
-    print(f"wrote {OUT}  glyph U+{CODEPOINT:04X} family=galaaz")
-    write_previews(OUT)
+
+def scale_glyph(glyph: TTGlyph, factor: float) -> TTGlyph:
+    if glyph.numberOfContours <= 0:
+        return glyph
+    coords = GlyphCoordinates(list(glyph.coordinates))
+    coords.scale((factor, factor))
+    glyph.coordinates = coords
+    if hasattr(glyph, "xMin"):
+        glyph.recalcBounds(glyph)
+    return glyph
+
+
+def fetch_omarchy_ttf() -> Path:
+    cache = Path("/tmp/omarchy-brand.ttf")
+    if cache.is_file() and cache.stat().st_size > 1000:
+        return cache
+    print(f"  fetching {OMARCHY_TTF_URL}")
+    urllib.request.urlretrieve(OMARCHY_TTF_URL, cache)
+    return cache
+
+
+def build_merged(glyph_1000: TTGlyph) -> None:
+    from copy import deepcopy
+
+    base_path = fetch_omarchy_ttf()
+    base = TTFont(str(base_path))
+    upem = base["head"].unitsPerEm
+    glyph = deepcopy(glyph_1000)
+    scale = upem / 1000.0
+    if scale != 1.0:
+        scale_glyph(glyph, scale)
+    advance = int(round(1000 * scale))
+
+    order = list(base.getGlyphOrder())
+    if GLYPH_NAME in order:
+        order.remove(GLYPH_NAME)
+    order.append(GLYPH_NAME)
+    base.setGlyphOrder(order)
+    base["glyf"][GLYPH_NAME] = glyph
+    base["hmtx"][GLYPH_NAME] = (advance, 0)
+
+    for table in base["cmap"].tables:
+        if table.isUnicode():
+            table.cmap[OMARCHY_CODEPOINT] = GLYPH_NAME
+
+    for rec in base["name"].names:
+        if rec.nameID == 5:  # version
+            rec.string = "Version 1.2+galaaz"
+        if rec.nameID == 3:  # unique
+            rec.string = "omarchy+galaaz"
+
+    OUT_MERGED.parent.mkdir(parents=True, exist_ok=True)
+    base.save(OUT_MERGED)
+    merged = TTFont(OUT_MERGED)
+    assert merged.getBestCmap().get(OMARCHY_CODEPOINT) == GLYPH_NAME
+    assert merged["name"].getDebugName(1) == "omarchy"
+    print(
+        f"wrote {OUT_MERGED}  glyph U+{OMARCHY_CODEPOINT:04X} family=omarchy "
+        f"(from {base_path.name}, upem={upem})"
+    )
+
+
+def main() -> int:
+    glyph = build_glyph()
+    assert_hole_ok(glyph)
+    build_standalone(glyph)
+    build_merged(glyph)
     return 0
 
 

data/script/omarchy/README.md

@@ -6,16 +6,15 @@ or a real Omarchy install. Works **with or without** an upstream Omarchy PR.
 ## Recommended: `galaaz omarchy` (gem-bundled)
 
 ```bash
-gem install galaaz
-galaaz setup
-galaaz omarchy              # A: copy overlay from this gem
+gem install galaaz            # choose version yourself (stable or .pre.N)
+galaaz omarchy install        # menu overlay + helpers (no second gem install)
 # optional, newer overlay than the gem:
 # galaaz omarchy install --from-git
-# galaaz omarchy install --from-git --ref galaaz2_0
 galaaz omarchy status
 ```
 
-Then Super+Space → Install → Development → **Galaaz**.
+Then Super+Space → Install → Development → **Galaaz** → **Galaaz (core)**  
+(core configures R/gatekeeper/blogs using the **already-installed** gem).
 
 **Important:** `gem install galaaz` alone does **not** add an Omarchy menu until you run
 `galaaz omarchy` (or an upstream catalog row exists).
@@ -24,14 +23,15 @@ Then Super+Space → Install → Development → **Galaaz**.
 
 | File | Role |
 |------|------|
-| `install-galaaz.sh` | Core install; always writes `~/.local/share/galaaz/install-core.log` |
+| `install-galaaz.sh` | Core configure (R/setup/blogs); uses installed gem; log `~/.local/share/galaaz/install-core.log` |
 | `galaaz-guide.sh` | Guide / docs / knit-demo helper (`omarchy-galaaz-guide`) |
 | `galaaz-add.sh` | Add-on wrapper (`omarchy-galaaz-add`) — pandoc without Arch Haskell stack |
 | `galaaz-gknit.sh` | Safe HTML gknit helper |
 | `debug-galaaz.sh` | Snapshot doctor/PATH/gem/bridge |
 | `remove-galaaz.sh` | Uninstall gem + marked blogs; leave R |
 | `omarchy-menu.jsonc` | Menu overlay submenu under Install → Development |
-| `fonts/galaaz.ttf` | Monochrome brand mark (`iconFont: galaaz`, U+E920; not E900) |
+| `fonts/galaaz.ttf` | Standalone family `galaaz` (debug/previews) |
+| `fonts/omarchy-with-galaaz.ttf` | Omarchy brand font + Galaaz at U+E90E (`iconFont: omarchy`) |
 
 Menu rows use the Galaaz icon font (not the Ruby-on-Rails Nerd Font gem). Source SVG
 and rebuild script live under `logos/icon-font/`.
@@ -66,10 +66,12 @@ chmod +x ~/.local/bin/omarchy-*
 ## TryOmarchy steps
 
 1. Install → Development → Ruby on Rails (mise Ruby).
-2. `gem install galaaz && galaaz setup && galaaz omarchy`
-3. Super+Space → search **Galaaz**, or Install → Development → **Galaaz** → **Galaaz (core)**.
+2. `gem install galaaz && galaaz omarchy install`
+3. Super+Space → Install → Development → **Galaaz** → **Galaaz (core)**.
 
-That action must finish **gem + setup + blogs + doctor**. It fails if the gatekeeper `.so` is missing — “gem installed” alone is not success.
+Core configures **setup + blogs + doctor** using the gem you already installed
+(it does **not** run `gem install` again). It fails if the gatekeeper `.so` is
+missing — “gem installed” alone is not success.
 
 4. After core finishes, the same submenu shows Knit / Arrow / TeX / Bio / Examples / Ledger.
 

data/script/omarchy/install-galaaz.sh

@@ -1,15 +1,17 @@
 #!/bin/bash
 # Omarchy-shaped core installer for Galaaz (R-on-Rails).
-# omarchy:summary=Install Galaaz (R-on-Rails)
+# omarchy:summary=Configure Galaaz (R-on-Rails)
 # omarchy:name=galaaz
 #
+# Prerequisite (do this yourself first — this script does NOT gem install):
+#   gem install galaaz          # or: gem install galaaz -v x.y.z / .pre.N
+#   galaaz omarchy install      # menu overlay + helpers
+# Then: Super+Space → Install → Development → Galaaz → Galaaz (core)
+#
 # Debug log (always written, even if TUI tee fails):
 #   ~/.local/share/galaaz/install-core.log
 set -euo pipefail
 
-# Optional pin: GALAAZ_GEM_VERSION=2.1.2 omarchy-install-galaaz
-# Default: latest from RubyGems (Omarchy/Rails shape).
-GALAAZ_GEM_VERSION="${GALAAZ_GEM_VERSION:-}"
 LOG_DIR="${HOME}/.local/share/galaaz"
 LOG="${LOG_DIR}/install-core.log"
 mkdir -p "${LOG_DIR}"
@@ -45,13 +47,13 @@ on_err() {
 }
 trap on_err ERR
 
-log "=== galaaz core install $(date -Iseconds) ==="
+log "=== galaaz core configure $(date -Iseconds) ==="
 log "log file: ${LOG}"
 log "script: ${BASH_SOURCE[0]}"
 log "pwd: $(pwd)"
 log "user: $(id -un) home=${HOME}"
 log "PATH: ${PATH}"
-log "GALAAZ_GEM_VERSION=${GALAAZ_GEM_VERSION:-latest}"
+log "(uses already-installed galaaz gem — does not gem install)"
 log ""
 
 pkg_add() {
@@ -167,35 +169,21 @@ WRAP
   log "wrapper: ${HOME}/.local/bin/galaaz"
 }
 
-run_ruby gem uninstall galaaz -x -a --ignore-dependencies >>"${LOG}" 2>&1 || true
-if [[ -n "${GALAAZ_GEM_VERSION}" ]]; then
-  log "==> gem install galaaz -v ${GALAAZ_GEM_VERSION}"
-  set +e
-  run_ruby gem install galaaz -v "${GALAAZ_GEM_VERSION}" --no-document --source https://rubygems.org 2>&1 | tee -a "${LOG}"
-  st=${PIPESTATUS[0]}
-  set -e
-  [[ ${st} -eq 0 ]] || exit "${st}"
-else
-  LATEST="$(curl -fsSL https://rubygems.org/api/v1/versions/galaaz/latest.json 2>/dev/null \
-    | sed -n 's/.*"version":"\([^"]*\)".*/\1/p' || true)"
-  if [[ -n "${LATEST}" ]]; then
-    log "==> gem install galaaz ${LATEST} (latest on RubyGems)"
-  else
-    log "==> gem install galaaz (latest on RubyGems)"
-  fi
-  set +e
-  run_ruby gem install galaaz --no-document --source https://rubygems.org 2>&1 | tee -a "${LOG}"
-  st=${PIPESTATUS[0]}
-  set -e
-  [[ ${st} -eq 0 ]] || exit "${st}"
+# Gem must already be installed (user: gem install galaaz [ -v … ]).
+# Do NOT gem install/uninstall here — that pulled stable latest over prereleases.
+log "==> require installed galaaz gem"
+if ! ROOT="$(gem_root 2>/dev/null)" || [[ -z "${ROOT}" || ! -d "${ROOT}" ]]; then
+  log "ERROR: galaaz gem not found under this Ruby."
+  log "Install first, then re-run core configure:"
+  log "  gem install galaaz    # or gem install galaaz -v <version>"
+  log "  galaaz omarchy install"
+  exit 1
 fi
-
 INSTALLED="$(run_ruby ruby -e "puts Gem::Specification.find_by_name('galaaz').version")"
-log "installed galaaz ${INSTALLED}"
+log "using galaaz ${INSTALLED}"
+log "gem root: ${ROOT}"
 
-ROOT="$(gem_root)"
 BRIDGE="${ROOT}/ext/new_bridge"
-log "gem root: ${ROOT}"
 log "bridge: ${BRIDGE}"
 ls -la "${BRIDGE}" >>"${LOG}" 2>&1 || true
 if [[ ! -f "${BRIDGE}/Makefile" ]]; then
@@ -254,8 +242,14 @@ log "gatekeeper OK: ${SO}"
 log "==> galaaz setup (CLI)"
 galaaz_cli setup >>"${LOG}" 2>&1 || log "WARN: galaaz setup non-zero (so exists; continuing)"
 
-log "==> galaaz blogs init"
-galaaz_cli blogs init "${HOME}/galaaz-blogs" >>"${LOG}" 2>&1
+log "==> galaaz blogs init/sync"
+# Fresh machine: init. Upgrade / re-run: sync brand assets without wiping blogs
+# (older gems omitted _logo_before_body.html → pandoc error 99).
+if [[ -f "${HOME}/galaaz-blogs/.galaaz-blogs" ]]; then
+  galaaz_cli blogs sync "${HOME}/galaaz-blogs" >>"${LOG}" 2>&1 || log "WARN: blogs sync non-zero"
+else
+  galaaz_cli blogs init "${HOME}/galaaz-blogs" >>"${LOG}" 2>&1 || log "WARN: blogs init non-zero"
+fi
 
 install_wrapper
 
@@ -276,12 +270,30 @@ if [[ -f "${SCRIPT_DIR}/omarchy-menu.jsonc" ]]; then
   cp "${SCRIPT_DIR}/omarchy-menu.jsonc" "${HOME}/.config/omarchy/extensions/omarchy-menu.jsonc"
 fi
 if [[ -f "${SCRIPT_DIR}/fonts/galaaz.ttf" ]]; then
+  mkdir -p "${HOME}/.local/share/fonts/galaaz"
   cp "${SCRIPT_DIR}/fonts/galaaz.ttf" "${HOME}/.local/share/fonts/galaaz/galaaz.ttf"
-  if command -v fc-cache >/dev/null 2>&1; then
-    fc-cache -r >/dev/null 2>&1 || true
-    fc-cache -f "${HOME}/.local/share/fonts/galaaz" >/dev/null 2>&1 || true
-  fi
-  log "menu font: ${HOME}/.local/share/fonts/galaaz/galaaz.ttf"
+  log "menu font (debug family galaaz): ${HOME}/.local/share/fonts/galaaz/galaaz.ttf"
+fi
+if [[ -f "${SCRIPT_DIR}/fonts/omarchy-with-galaaz.ttf" ]]; then
+  mkdir -p "${HOME}/.local/share/fonts" "${HOME}/.config/fontconfig/conf.d"
+  cp "${SCRIPT_DIR}/fonts/omarchy-with-galaaz.ttf" "${HOME}/.local/share/fonts/omarchy-with-galaaz.ttf"
+  cat >"${HOME}/.config/fontconfig/conf.d/99-galaaz-omarchy-brand.conf" <<'XML'
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<fontconfig>
+  <!-- Prefer Galaaz-extended Omarchy brand font (adds U+E90E). -->
+  <selectfont>
+    <rejectfont>
+      <glob>*/omarchy/omarchy.ttf</glob>
+    </rejectfont>
+  </selectfont>
+</fontconfig>
+XML
+  log "menu font (family omarchy + U+E90E): ${HOME}/.local/share/fonts/omarchy-with-galaaz.ttf"
+fi
+if command -v fc-cache >/dev/null 2>&1; then
+  fc-cache -r >/dev/null 2>&1 || true
+  fc-cache -f "${HOME}/.local/share/fonts" >/dev/null 2>&1 || true
 fi
 cp "${BASH_SOURCE[0]}" "${HOME}/.local/bin/omarchy-install-galaaz"
 chmod +x "${HOME}/.local/bin/omarchy-install-galaaz"
@@ -309,7 +321,7 @@ mkdir -p "${HOME}/.config/galaaz/profiles"
 date -Iseconds >"${HOME}/.config/galaaz/profiles/core"
 
 log ""
-log "Core install complete."
+log "Core configure complete."
 log "Next: Super+Space → Install → Development → Galaaz → Guide (what's next)"
 log "Docs: https://rbotafogo.github.io/galaaz/"
 log "FULL LOG: ${LOG}"

data/script/omarchy/omarchy-menu.jsonc

@@ -5,23 +5,23 @@
   // Use ~/.local/bin/galaaz (installer wrapper). Do not quote the whole
   // "galaaz add …" as one word — omarchy-launch-tui then does nothing useful.
   //
-  // Brand mark: U+E920 (\uE920) + iconFont "galaaz".
-  // Do NOT use U+E900 — that slot is Omarchy's own logo (waybar \ue900,
-  // private font family "omarchy", range E900–E90D). Fallback without our
-  // font then shows Omarchy's mark, not Galaaz.
-  // TTF: script/omarchy/fonts/galaaz.ttf → ~/.local/share/fonts/galaaz/
+  // Brand mark: U+E90E in family "omarchy" (same iconFont Cursor/Grok use).
+  // Omarchy's stock font owns E900–E90D; we ship omarchy-with-galaaz.ttf which
+  // is that font plus our R+gem at E90E, installed to
+  // ~/.local/share/fonts/omarchy-with-galaaz.ttf. A separate family "galaaz"
+  // alone shows missing-glyph tofu in Qt — do not use iconFont "galaaz" here.
 
   "install.development.galaaz": {
-    "icon": "\uE920",
-    "iconFont": "galaaz",
+    "icon": "\uE90E",
+    "iconFont": "omarchy",
     "label": "Galaaz",
     "description": "R on Rails"
   },
   "install.development.galaaz.core": {
-    "icon": "\uE920",
-    "iconFont": "galaaz",
+    "icon": "\uE90E",
+    "iconFont": "omarchy",
     "label": "Galaaz (core)",
-    "description": "gem + setup + blogs (not just gem install)",
+    "description": "setup + blogs (gem already installed)",
     "action": "omarchy-launch-tui omarchy-install-galaaz",
     "disabled": "test -f ~/.config/galaaz/profiles/core"
   },
@@ -47,45 +47,45 @@
     "when": "test -f ~/.config/galaaz/profiles/core"
   },
   "install.development.galaaz.knit": {
-    "icon": "\uE920",
-    "iconFont": "galaaz",
+    "icon": "\uE90E",
+    "iconFont": "omarchy",
     "label": "Knit (HTML + PDF blogs)",
     "description": "pandoc + knitr/rmarkdown + TinyTeX",
     "action": "omarchy-launch-tui omarchy-galaaz-add knit",
     "disabled": "test -f ~/.config/galaaz/profiles/knit"
   },
   "install.development.galaaz.arrow": {
-    "icon": "\uE920",
-    "iconFont": "galaaz",
+    "icon": "\uE90E",
+    "iconFont": "omarchy",
     "label": "Arrow",
     "action": "omarchy-launch-tui omarchy-galaaz-add arrow",
     "disabled": "test -f ~/.config/galaaz/profiles/arrow"
   },
   "install.development.galaaz.bio": {
-    "icon": "\uE920",
-    "iconFont": "galaaz",
+    "icon": "\uE90E",
+    "iconFont": "omarchy",
     "label": "Bioconductor (DESeq2)",
     "action": "omarchy-launch-tui omarchy-galaaz-add bio",
     "disabled": "test -f ~/.config/galaaz/profiles/bio"
   },
   "install.development.galaaz.examples": {
-    "icon": "\uE920",
-    "iconFont": "galaaz",
+    "icon": "\uE90E",
+    "iconFont": "omarchy",
     "label": "Examples",
     "action": "omarchy-launch-tui omarchy-galaaz-add examples",
     "disabled": "test -f ~/.config/galaaz/profiles/examples"
   },
   "install.development.galaaz.ledger": {
-    "icon": "\uE920",
-    "iconFont": "galaaz",
+    "icon": "\uE90E",
+    "iconFont": "omarchy",
     "label": "Ledger (R-on-Rails demo)",
     "description": "Clone app, seed, bin/dev",
     "action": "omarchy-launch-tui omarchy-galaaz-add ledger",
     "disabled": "test -f ~/.config/galaaz/profiles/ledger"
   },
   "remove.development.galaaz": {
-    "icon": "\uE920",
-    "iconFont": "galaaz",
+    "icon": "\uE90E",
+    "iconFont": "omarchy",
     "label": "Galaaz",
     "description": "Core gem (add-on R packages stay)",
     "action": "omarchy-launch-tui omarchy-remove-galaaz"

data/version.rb

@@ -1,2 +1,2 @@
 $gem_name = "galaaz"
-$version="2.1.10.pre.4"
+$version="2.1.10.pre.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: galaaz
 version: !ruby/object:Gem::Version
-  version: 2.1.10.pre.4
+  version: 2.1.10.pre.6
 platform: ruby
 authors:
 - Rodrigo Botafogo
@@ -444,6 +444,7 @@ files:
 - script/omarchy/README.md
 - script/omarchy/debug-galaaz.sh
 - script/omarchy/fonts/galaaz.ttf
+- script/omarchy/fonts/omarchy-with-galaaz.ttf
 - script/omarchy/galaaz-add.sh
 - script/omarchy/galaaz-gknit.sh
 - script/omarchy/galaaz-guide.sh