galaaz 2.1.10.pre.12 → 2.1.10.pre.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6665ae78ae4ac12fe5d30973d5917c1a9e8df18a686d0c826069748e75e40e64
-  data.tar.gz: 4be07e49ccc107e8309f09040224b655abcf19c78a6086e7ab2b403823e2af79
+  metadata.gz: d3edc95ba0c5748d89f2e38c550e7f80823ae2d4c03d2ae9cb8c35c9979c7409
+  data.tar.gz: 0ea188f8ac1c56e7269da71c9a7e906cb00fc5cd62c2e7c6b41b399fed353342
 SHA512:
-  metadata.gz: 0346baa6c821cbc710611ff6952231ad851055b8bc5012a6831d7e254f6dd5814f922b4dae2f7d3f5a6983d398b150925809ff571e0026f0f6f288b899576701
-  data.tar.gz: 6c2c7cbe579833af89499db3471034c6fc98977082da5f13119984916dedc278d50174c3e2cc563af026f595fc1d7b7e201441facfaeaafc8586a43c741cfd42
+  metadata.gz: bcb653a18c4a441933b3245ad516fe0eaa4b085737af5a78dad84b4c77754863e9d83411e95e515ba1228faa6c65cb1c10746cec098b07b66d9cdc02dad91d66
+  data.tar.gz: a46ac9ae0d47e69e4f7fcfb31acd02cb2e878849e8d3b8d51055ee7c290a2a64065c8184b376671c51ea9d3414cd248e4917657e4e13a08f350d12a45601364b

data/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 ## Unreleased
 
+## 2.1.10.pre.14
+
+### Fixed
+
+- Omarchy font install ends with **`omarchy restart shell`** (fallbacks:
+  `omarchy-restart-shell`, then `killall omarchy-shell` + relaunch) so the
+  Galaaz R glyph appears without logout. Menu JSON already hot-reloads; Qt
+  does not reload family `omarchy` until the shell restarts.
+
+## 2.1.10.pre.13
+
+### Fixed
+
+- Omarchy Install rows back to **`disabled:`** (dim + ✓), matching Rails / the
+  last known-good Galaaz overlay — not `when:` hide. Nested Knit/Arrow/Ledger
+  are still under **Install → Development → Galaaz**; typing a letter in the
+  menu search lists them as flat hits with a Galaaz breadcrumb (Omarchy search
+  UX, not a broken tree).
+- Font install: restore the pre.6 fontconfig snippet; always `cp -f`
+  `omarchy-with-galaaz.ttf`. After upgrade run `galaaz omarchy install` and
+  restart the Omarchy shell so Qt reloads family `omarchy` / U+E90E.
+
 ## 2.1.10.pre.12
 
 ### Fixed

data/lib/galaaz/cli.rb

@@ -373,8 +373,32 @@ module Galaaz
         system('fc-cache', '-f', fonts)
         system('fc-cache', '-f', user_fonts)
       end
-      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'))
+      restart_omarchy_shell_for_fonts!
+    end
+
+    # Menu JSON hot-reloads; Qt keeps family "omarchy" until omarchy-shell restarts.
+    def restart_omarchy_shell_for_fonts!
+      return unless ENV['OMARCHY_PATH'] || File.directory?(File.expand_path('~/.config/omarchy'))
+
+      if command_present?('omarchy') && system('omarchy', 'restart', 'shell')
+        puts 'galaaz omarchy: restarted Omarchy shell (brand font reload)'
+        return
+      end
+      if command_present?('omarchy-restart-shell') && system('omarchy-restart-shell')
+        puts 'galaaz omarchy: restarted Omarchy shell via omarchy-restart-shell'
+        return
+      end
+      if system('pgrep', '-x', 'omarchy-shell', out: File::NULL, err: File::NULL)
+        system('killall', 'omarchy-shell', out: File::NULL, err: File::NULL)
+        if command_present?('omarchy-launch-shell')
+          system('omarchy-launch-shell', out: File::NULL, err: File::NULL)
+        elsif command_present?('hyprctl')
+          system('hyprctl', 'dispatch', 'exec', 'omarchy-launch-shell', out: File::NULL, err: File::NULL)
+        end
+        puts 'galaaz omarchy: restarted omarchy-shell (fallback)'
+        return
+      end
+      warn 'galaaz omarchy: run `omarchy restart shell` so Qt reloads the brand font'
     end
 
     # ---- blogs ----

data/script/omarchy/install-galaaz.sh

@@ -276,13 +276,13 @@ if [[ -f "${SCRIPT_DIR}/fonts/galaaz.ttf" ]]; then
 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
+  cp -f "${SCRIPT_DIR}/fonts/omarchy-with-galaaz.ttf" "${HOME}/.local/share/fonts/omarchy-with-galaaz.ttf"
+  # Same conf as the known-good pre.6 dogfood — prefer our TTF over stock omarchy.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). -->
-  <dir>${HOME}/.local/share/fonts</dir>
   <selectfont>
     <rejectfont>
       <glob>*/omarchy/omarchy.ttf</glob>
@@ -291,19 +291,27 @@ if [[ -f "${SCRIPT_DIR}/fonts/omarchy-with-galaaz.ttf" ]]; then
 </fontconfig>
 XML
   log "menu font (family omarchy + U+E90E): ${HOME}/.local/share/fonts/omarchy-with-galaaz.ttf"
-  if command -v fc-list >/dev/null 2>&1; then
-    fc-cache -f "${HOME}/.local/share/fonts" >/dev/null 2>&1 || true
-    if fc-list : file family 2>/dev/null | grep -q 'omarchy-with-galaaz.ttf'; then
-      log "fontconfig sees omarchy-with-galaaz.ttf"
-    else
-      log "WARN: omarchy-with-galaaz.ttf not listed by fc-list yet (logout/restart shell if icon missing)"
-    fi
-  fi
 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
+# Menu JSON hot-reloads; Qt keeps family "omarchy" until omarchy-shell restarts.
+if command -v omarchy >/dev/null 2>&1 && omarchy restart shell; then
+  log "restarted Omarchy shell (brand font reload)"
+elif command -v omarchy-restart-shell >/dev/null 2>&1 && omarchy-restart-shell; then
+  log "restarted Omarchy shell via omarchy-restart-shell"
+elif pgrep -x omarchy-shell >/dev/null 2>&1; then
+  killall omarchy-shell 2>/dev/null || true
+  if command -v omarchy-launch-shell >/dev/null 2>&1; then
+    omarchy-launch-shell >/dev/null 2>&1 || true
+  elif command -v hyprctl >/dev/null 2>&1; then
+    hyprctl dispatch exec omarchy-launch-shell >/dev/null 2>&1 || true
+  fi
+  log "restarted omarchy-shell (fallback)"
+else
+  log "Omarchy shell not restarted; run: omarchy restart shell"
+fi
 cp "${BASH_SOURCE[0]}" "${HOME}/.local/bin/omarchy-install-galaaz"
 chmod +x "${HOME}/.local/bin/omarchy-install-galaaz"
 if [[ -f "${SCRIPT_DIR}/remove-galaaz.sh" ]]; then

data/script/omarchy/omarchy-menu.jsonc

@@ -6,15 +6,12 @@
   // "galaaz add …" as one word — omarchy-launch-tui then does nothing useful.
   //
   // 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.
+  // Font file: ~/.local/share/fonts/omarchy-with-galaaz.ttf (installed by core).
   //
-  // Install: when: hides a row after that profile is installed (full catalog
-  // stays visible until each item is done). Use $HOME + [[ ]] like stock Omarchy
-  // — bare ~ in test -f is unreliable in the menu guard batcher.
-  // Guide / Docs / GitHub: Learn → Galaaz. Remove: only while core present.
+  // Install rows: disabled: (dim + ✓ when installed) — same as Omarchy Rails.
+  // Do not use when: to hide Install rows; Omarchy search will still list nested
+  // children under a divider when you type a letter (that is search, not a
+  // broken tree). Guide/Docs/GitHub: Learn → Galaaz.
 
   "learn.galaaz": {
     "icon": "\uE90E",
@@ -53,7 +50,7 @@
     "label": "Galaaz (core)",
     "description": "setup + blogs (gem already installed)",
     "action": "omarchy-launch-tui omarchy-install-galaaz",
-    "when": "[[ ! -f $HOME/.config/galaaz/profiles/core ]]"
+    "disabled": "[[ -f $HOME/.config/galaaz/profiles/core ]]"
   },
   "install.development.galaaz.knit": {
     "icon": "\uE90E",
@@ -61,7 +58,7 @@
     "label": "Knit (HTML + PDF blogs)",
     "description": "pandoc + knitr/rmarkdown + TinyTeX",
     "action": "omarchy-launch-tui omarchy-galaaz-add knit",
-    "when": "[[ ! -f $HOME/.config/galaaz/profiles/knit ]]"
+    "disabled": "[[ -f $HOME/.config/galaaz/profiles/knit ]]"
   },
   "install.development.galaaz.arrow-r": {
     "icon": "\uE90E",
@@ -69,7 +66,7 @@
     "label": "Arrow (R only)",
     "description": "CRAN arrow via Apache prebuilt libarrow",
     "action": "omarchy-launch-tui omarchy-galaaz-add arrow-r",
-    "when": "[[ ! -f $HOME/.config/galaaz/profiles/arrow-r && ! -f $HOME/.config/galaaz/profiles/arrow ]]"
+    "disabled": "[[ -f $HOME/.config/galaaz/profiles/arrow-r || -f $HOME/.config/galaaz/profiles/arrow ]]"
   },
   "install.development.galaaz.arrow-ruby": {
     "icon": "\uE90E",
@@ -77,7 +74,7 @@
     "label": "Arrow (Ruby)",
     "description": "R arrow + arrow-glib / red-arrow (installs R only first)",
     "action": "omarchy-launch-tui omarchy-galaaz-add arrow-ruby",
-    "when": "[[ ! -f $HOME/.config/galaaz/profiles/arrow-ruby && ! -f $HOME/.config/galaaz/profiles/arrow ]]"
+    "disabled": "[[ -f $HOME/.config/galaaz/profiles/arrow-ruby || -f $HOME/.config/galaaz/profiles/arrow ]]"
   },
   "install.development.galaaz.arrow-debug": {
     "icon": "\uE90E",
@@ -91,14 +88,14 @@
     "iconFont": "omarchy",
     "label": "Bioconductor (DESeq2)",
     "action": "omarchy-launch-tui omarchy-galaaz-add bio",
-    "when": "[[ ! -f $HOME/.config/galaaz/profiles/bio ]]"
+    "disabled": "[[ -f $HOME/.config/galaaz/profiles/bio ]]"
   },
   "install.development.galaaz.examples": {
     "icon": "\uE90E",
     "iconFont": "omarchy",
     "label": "Examples",
     "action": "omarchy-launch-tui omarchy-galaaz-add examples",
-    "when": "[[ ! -f $HOME/.config/galaaz/profiles/examples ]]"
+    "disabled": "[[ -f $HOME/.config/galaaz/profiles/examples ]]"
   },
   "install.development.galaaz.ledger": {
     "icon": "\uE90E",
@@ -106,7 +103,7 @@
     "label": "Ledger (R-on-Rails demo)",
     "description": "Clone app, seed, bin/dev",
     "action": "omarchy-launch-tui omarchy-galaaz-add ledger",
-    "when": "[[ ! -f $HOME/.config/galaaz/profiles/ledger ]]"
+    "disabled": "[[ -f $HOME/.config/galaaz/profiles/ledger ]]"
   },
   "remove.development.galaaz": {
     "icon": "\uE90E",

data/version.rb

@@ -1,2 +1,2 @@
 $gem_name = "galaaz"
-$version="2.1.10.pre.12"
+$version="2.1.10.pre.14"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: galaaz
 version: !ruby/object:Gem::Version
-  version: 2.1.10.pre.12
+  version: 2.1.10.pre.14
 platform: ruby
 authors:
 - Rodrigo Botafogo