rain/gnu-plus-dotfiles
rain/gnu-plus-dotfiles
1
0
Fork 0
Code Wiki Activity

Compare commits

base: rain:77ae70468bc73e104ae52e300f2de895c438f02a
Branches Tags
rain:main
rain:legacy-2025
rain:master
..
compare: rain:63106f5e3faa2d4b77613d9dcc87e6259ef6a75b
Branches Tags
rain:main
rain:legacy-2025
rain:master

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

2 changed files with 24 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dot_config/kitty/other.conf
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

49
run_once_20-install-user-packages.sh.tmpl
View file

@ -306,37 +306,28 @@ 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. FONT_DIR="$USER_HOME/.local/share/fonts/maple-mono-nf"
if command -v paru >/dev/null 2>&1 && paru -S --needed --noconfirm maplemono-nf; then mkdir -p "$FONT_DIR"
log "maplemono-nf installed via AUR (paru)" TMP_ZIP="$(mktemp /tmp/maple-font.XXXXXX.zip)"
if ! fc-list : family 2>/dev/null | grep -qxF 'Maple Mono NF'; then if curl -fL --retry 3 \
log "WARNING: maplemono-nf installed but 'Maple Mono NF' family not found" "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 fi
else else
log "AUR install unavailable or failed — falling back to GitHub zip" log "WARNING: failed to download Maple Mono NF from GitHub"
FONT_DIR="$USER_HOME/.local/share/fonts/maple-mono-nf" log "manual install: https://github.com/subframe7536/Maple-font"
mkdir -p "$FONT_DIR" rm -f "$TMP_ZIP"
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 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"