Compare commits
2 commits
63106f5e3f
...
77ae70468b
| Author | SHA1 | Date | |
|---|---|---|---|
| 77ae70468b | |||
| 70d339140b |
2 changed files with 33 additions and 24 deletions
|
|
@ -2,7 +2,7 @@ font_size 14.0
|
|||
cursor #cccccc
|
||||
cursor_shape beam
|
||||
# Fonts are custom to me, you may need to change/modify them
|
||||
font_family FiraMono Nerd Font
|
||||
bold_font FiraMono Nerd Font
|
||||
italic_font FiraMono Nerd Font
|
||||
bold_italic_font FiraMono Nerd Font
|
||||
font_family Maple Mono NF
|
||||
bold_font Maple Mono NF
|
||||
italic_font Maple Mono NF
|
||||
bold_italic_font Maple Mono NF
|
||||
|
|
|
|||
|
|
@ -306,28 +306,37 @@ if fc-list : family 2>/dev/null | grep -qxF 'Maple Mono NF'; then
|
|||
log "Maple Mono NF already installed"
|
||||
else
|
||||
{{ if eq .os_family "arch" -}}
|
||||
# Try paru first (clean install via AUR). If it fails (e.g. sudo TTY prompt
|
||||
# in non-interactive runs, or AUR helper missing), fall back to downloading
|
||||
# the upstream zip release directly — no sudo needed.
|
||||
FONT_DIR="$USER_HOME/.local/share/fonts/maple-mono-nf"
|
||||
mkdir -p "$FONT_DIR"
|
||||
TMP_ZIP="$(mktemp /tmp/maple-font.XXXXXX.zip)"
|
||||
if curl -fL --retry 3 \
|
||||
"https://github.com/subframe7536/Maple-font/releases/download/${MAPLE_FONT_VERSION}/MapleMono-NF.zip" \
|
||||
-o "$TMP_ZIP"; then
|
||||
log "extracting font files"
|
||||
unzip -q -o "$TMP_ZIP" -d "$FONT_DIR"
|
||||
rm -f "$TMP_ZIP"
|
||||
log "refreshing font cache (fc-cache)"
|
||||
if command -v fc-cache >/dev/null 2>&1; then
|
||||
fc-cache -fv >/dev/null
|
||||
else
|
||||
log "WARNING: fc-cache not found — install fontconfig package"
|
||||
# Install from AUR via paru (maplemono-nf package; paru is set up by
|
||||
# run_once_10-add-chaotic-aur). If paru is missing or the AUR install
|
||||
# fails (e.g. sudo TTY prompt in non-interactive runs), fall back to
|
||||
# downloading the upstream zip release directly — no sudo needed.
|
||||
if command -v paru >/dev/null 2>&1 && paru -S --needed --noconfirm maplemono-nf; then
|
||||
log "maplemono-nf installed via AUR (paru)"
|
||||
if ! fc-list : family 2>/dev/null | grep -qxF 'Maple Mono NF'; then
|
||||
log "WARNING: maplemono-nf installed but 'Maple Mono NF' family not found"
|
||||
fi
|
||||
else
|
||||
log "WARNING: failed to download Maple Mono NF from GitHub"
|
||||
log "manual install: https://github.com/subframe7536/Maple-font"
|
||||
rm -f "$TMP_ZIP"
|
||||
log "AUR install unavailable or failed — falling back to GitHub zip"
|
||||
FONT_DIR="$USER_HOME/.local/share/fonts/maple-mono-nf"
|
||||
mkdir -p "$FONT_DIR"
|
||||
TMP_ZIP="$(mktemp /tmp/maple-font.XXXXXX.zip)"
|
||||
if curl -fL --retry 3 \
|
||||
"https://github.com/subframe7536/Maple-font/releases/download/${MAPLE_FONT_VERSION}/MapleMono-NF.zip" \
|
||||
-o "$TMP_ZIP"; then
|
||||
log "extracting font files"
|
||||
unzip -q -o "$TMP_ZIP" -d "$FONT_DIR"
|
||||
rm -f "$TMP_ZIP"
|
||||
log "refreshing font cache (fc-cache)"
|
||||
if command -v fc-cache >/dev/null 2>&1; then
|
||||
fc-cache -fv >/dev/null
|
||||
else
|
||||
log "WARNING: fc-cache not found — install fontconfig package"
|
||||
fi
|
||||
else
|
||||
log "WARNING: failed to download Maple Mono NF from GitHub"
|
||||
log "manual install: https://github.com/subframe7536/Maple-font"
|
||||
rm -f "$TMP_ZIP"
|
||||
fi
|
||||
fi
|
||||
{{ else if eq .os_family "debian" -}}
|
||||
log "downloading MapleMono-NF.zip from subframe7536/Maple-font $MAPLE_FONT_VERSION"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue