1
0
Fork 0

Compare commits

..

No commits in common. "77ae70468bc73e104ae52e300f2de895c438f02a" and "63106f5e3faa2d4b77613d9dcc87e6259ef6a75b" have entirely different histories.

2 changed files with 24 additions and 33 deletions

View file

@ -2,7 +2,7 @@ font_size 14.0
cursor #cccccc cursor #cccccc
cursor_shape beam cursor_shape beam
# Fonts are custom to me, you may need to change/modify them # Fonts are custom to me, you may need to change/modify them
font_family Maple Mono NF font_family FiraMono Nerd Font
bold_font Maple Mono NF bold_font FiraMono Nerd Font
italic_font Maple Mono NF italic_font FiraMono Nerd Font
bold_italic_font Maple Mono NF bold_italic_font FiraMono Nerd Font

View file

@ -306,17 +306,9 @@ if fc-list : family 2>/dev/null | grep -qxF 'Maple Mono NF'; then
log "Maple Mono NF already installed" log "Maple Mono NF already installed"
else else
{{ if eq .os_family "arch" -}} {{ if eq .os_family "arch" -}}
# Install from AUR via paru (maplemono-nf package; paru is set up by # Try paru first (clean install via AUR). If it fails (e.g. sudo TTY prompt
# run_once_10-add-chaotic-aur). If paru is missing or the AUR install # in non-interactive runs, or AUR helper missing), fall back to downloading
# fails (e.g. sudo TTY prompt in non-interactive runs), fall back to # the upstream zip release directly — no sudo needed.
# 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 "AUR install unavailable or failed — falling back to GitHub zip"
FONT_DIR="$USER_HOME/.local/share/fonts/maple-mono-nf" FONT_DIR="$USER_HOME/.local/share/fonts/maple-mono-nf"
mkdir -p "$FONT_DIR" mkdir -p "$FONT_DIR"
TMP_ZIP="$(mktemp /tmp/maple-font.XXXXXX.zip)" TMP_ZIP="$(mktemp /tmp/maple-font.XXXXXX.zip)"
@ -337,7 +329,6 @@ else
log "manual install: https://github.com/subframe7536/Maple-font" log "manual install: https://github.com/subframe7536/Maple-font"
rm -f "$TMP_ZIP" rm -f "$TMP_ZIP"
fi fi
fi
{{ else if eq .os_family "debian" -}} {{ else if eq .os_family "debian" -}}
log "downloading MapleMono-NF.zip from subframe7536/Maple-font $MAPLE_FONT_VERSION" log "downloading MapleMono-NF.zip from subframe7536/Maple-font $MAPLE_FONT_VERSION"
FONT_DIR="$USER_HOME/.local/share/fonts/maple-mono-nf" FONT_DIR="$USER_HOME/.local/share/fonts/maple-mono-nf"