diff --git a/bootstrap.sh b/bootstrap.sh index 013fc0f..9ba67cd 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -151,7 +151,7 @@ sudo systemctl enable "${units[@]}" step "Linking dotfiles with stow" # Create real parent dirs first, otherwise stow symlinks the whole directory # (e.g. ~/.config) into the repo and every app's files end up in git -mkdir -p "$HOME/.config" "$HOME/.local/bin" "$HOME/.local/share" "$HOME/Pictures" +mkdir -p "$HOME/.config" "$HOME/.local/bin" "$HOME/.local/share/fonts" "$HOME/Pictures" # Sunshine keeps credentials and logs beside its config; those must stay out of git mkdir -p "$HOME/.config/sunshine" mkdir -p -m 700 "$HOME/.ssh" @@ -165,4 +165,7 @@ if [[ "$(getent passwd "$USER" | cut -d: -f7)" != */zsh ]]; then chsh -s /usr/bin/zsh fi +# Picks up the stowed fonts in ~/.local/share/fonts (SF Pro Display for hyprlock) +fc-cache -f "$HOME/.local/share/fonts" >/dev/null + step "Done — reboot to load drivers and start Hyprland" diff --git a/dotfiles/.config/hypr/hyprlock.conf b/dotfiles/.config/hypr/hyprlock.conf index fb0b7e1..6bf5770 100644 --- a/dotfiles/.config/hypr/hyprlock.conf +++ b/dotfiles/.config/hypr/hyprlock.conf @@ -113,7 +113,7 @@ label { text = cmd[update:1000] echo "$(~/.config/hypr/hyprlock/Scripts/songdetail.sh)" color = rgba(255, 255, 255, 0.6) font_size = 18 - font_family = JetBrains Mono Nerd, SF Pro Display Bold + font_family = JetBrainsMono Nerd Font, SF Pro Display Bold position = 0, 90 halign = center valign = bottom @@ -221,7 +221,7 @@ label { text = cmd[update:1000] echo "$(~/.config/hypr/hyprlock/Scripts/songdetail.sh)" color = rgba(255, 255, 255, 0.6) font_size = 28 - font_family = JetBrains Mono Nerd, SF Pro Display Bold + font_family = JetBrainsMono Nerd Font, SF Pro Display Bold position = 0, 90 halign = center valign = bottom diff --git a/dotfiles/.config/hypr/hyprlock/Fonts/JetBrains/JetBrains Mono Nerd.ttf b/dotfiles/.config/hypr/hyprlock/Fonts/JetBrains/JetBrains Mono Nerd.ttf deleted file mode 100644 index f9f0185..0000000 Binary files a/dotfiles/.config/hypr/hyprlock/Fonts/JetBrains/JetBrains Mono Nerd.ttf and /dev/null differ diff --git a/dotfiles/.config/quickshell/scripts/sync-dotfiles.sh b/dotfiles/.config/quickshell/scripts/sync-dotfiles.sh index b706114..82234b8 100755 --- a/dotfiles/.config/quickshell/scripts/sync-dotfiles.sh +++ b/dotfiles/.config/quickshell/scripts/sync-dotfiles.sh @@ -40,9 +40,12 @@ if ! command -v stow &> /dev/null; then fi info "Applying dotfiles with stow..." +# Real dirs first, or stow links the whole folder into the repo (see bootstrap.sh) +mkdir -p "$HOME/.local/share/fonts" # -R restows: drops links for files removed from the repo and adds new ones. if stow -R -d "$DOTFILES" -t "$HOME" dotfiles; then info "Dotfiles applied." + fc-cache "$HOME/.local/share/fonts" >/dev/null 2>&1 else warn "stow hit a conflict — nothing was changed. Fix it and re-run:" warn " stow -R -d $DOTFILES -t ~ dotfiles" diff --git a/dotfiles/.config/hypr/hyprlock/Fonts/SF Pro Display/SF Pro Display Bold.otf b/dotfiles/.local/share/fonts/SF-Pro-Display-Bold.otf similarity index 100% rename from dotfiles/.config/hypr/hyprlock/Fonts/SF Pro Display/SF Pro Display Bold.otf rename to dotfiles/.local/share/fonts/SF-Pro-Display-Bold.otf diff --git a/dotfiles/.config/hypr/hyprlock/Fonts/SF Pro Display/SF Pro Display Regular.otf b/dotfiles/.local/share/fonts/SF-Pro-Display-Regular.otf similarity index 100% rename from dotfiles/.config/hypr/hyprlock/Fonts/SF Pro Display/SF Pro Display Regular.otf rename to dotfiles/.local/share/fonts/SF-Pro-Display-Regular.otf