Add bos-update + replicate the dev zsh shell
bos-update: one command that updates both BOS channels — pacman -Syu (snap-pac snapshotted) and bakery update --all — best-effort so one failing doesn't abort the other. Baked into the live env and skel. Shell: match the dev laptop's zsh. Ship Powerlevel10k + zsh-autosuggestions, zsh-history-substring-search and zsh-syntax-highlighting, sourced from the distro packages (no oh-my-zsh framework) in the correct order, plus the dev .p10k.zsh. Powerlevel10k is AUR-only, so it's republished to [breadway] via packaging/powerlevel10k + a CI workflow (builds libgit2 + gitstatus from source), same pattern as bibata / zen-browser-bin. skel/.zshrc keeps the BOS QoL aliases and pywal palette import, with `update` aliased to bos-update.
This commit is contained in:
parent
fbe9c9693e
commit
aadda08797
7 changed files with 1966 additions and 13 deletions
1745
iso/airootfs/etc/skel/.p10k.zsh
Normal file
1745
iso/airootfs/etc/skel/.p10k.zsh
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1,4 +1,15 @@
|
|||
# BOS default zsh config — quality-of-life defaults, easy to extend.
|
||||
# BOS default zsh config — Powerlevel10k prompt + plugins + pywal palette.
|
||||
#
|
||||
# Mirrors the BOS dev shell, but sources plugins from the distro packages
|
||||
# (/usr/share/zsh/...) instead of oh-my-zsh, so there's no framework to manage.
|
||||
# Customise the prompt with `p10k configure` (rewrites ~/.p10k.zsh).
|
||||
|
||||
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
||||
# Initialization code that may require console input (password prompts, [y/n]
|
||||
# confirmations, etc.) must go above this block; everything else may go below.
|
||||
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
|
||||
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||
fi
|
||||
|
||||
# History
|
||||
HISTFILE=~/.zsh_history
|
||||
|
|
@ -11,10 +22,21 @@ autoload -Uz compinit && compinit
|
|||
zstyle ':completion:*' menu select
|
||||
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'
|
||||
|
||||
# Key bindings (emacs style + common extras)
|
||||
# Emacs-style key bindings
|
||||
bindkey -e
|
||||
bindkey '^[[A' history-search-backward
|
||||
bindkey '^[[B' history-search-forward
|
||||
|
||||
# Prompt — Powerlevel10k (republished to [breadway] as zsh-theme-powerlevel10k).
|
||||
source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme
|
||||
|
||||
# Plugins (order matters: syntax-highlighting must be sourced LAST).
|
||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=60'
|
||||
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null
|
||||
source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh 2>/dev/null
|
||||
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null
|
||||
|
||||
# history-substring-search: ↑/↓ search history by the typed prefix.
|
||||
bindkey '^[[A' history-substring-search-up
|
||||
bindkey '^[[B' history-substring-search-down
|
||||
|
||||
# fzf — fuzzy history search on Ctrl+R, fuzzy file find on Ctrl+T
|
||||
if command -v fzf &>/dev/null; then
|
||||
|
|
@ -54,12 +76,18 @@ alias free='free -h'
|
|||
alias grep='grep --color=auto'
|
||||
alias ip='ip --color=auto'
|
||||
|
||||
# bakery / bread
|
||||
alias update='bakery update'
|
||||
# Updates — bos-update runs both channels (pacman + bakery). pacman aliased to
|
||||
# sudo so `pacman -Syu` etc. just work.
|
||||
alias update='bos-update'
|
||||
alias pacman='sudo pacman'
|
||||
|
||||
# Prompt — simple and fast (no starship dep)
|
||||
autoload -Uz vcs_info
|
||||
precmd() { vcs_info }
|
||||
zstyle ':vcs_info:git:*' formats ' (%b)'
|
||||
setopt PROMPT_SUBST
|
||||
PROMPT='%F{cyan}%~%f%F{yellow}${vcs_info_msg_0_}%f %(?.%F{green}.%F{red})❯%f '
|
||||
# ~/.local/bin holds the bread* binaries baked in at build time.
|
||||
export PATH="$HOME/.local/bin:$PATH"
|
||||
|
||||
# Powerlevel10k prompt configuration.
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
|
||||
# Import pywal colour palette (drives the terminal colours from the wallpaper).
|
||||
if [ -f "$HOME/.cache/wal/sequences" ]; then
|
||||
cat "$HOME/.cache/wal/sequences"
|
||||
fi
|
||||
|
|
|
|||
32
iso/airootfs/usr/local/bin/bos-update
Normal file
32
iso/airootfs/usr/local/bin/bos-update
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
#!/bin/bash
|
||||
# bos-update — update all of BOS in one go.
|
||||
#
|
||||
# BOS packages come from two channels, so a full update touches both:
|
||||
# 1. pacman — Arch base/desktop + the [breadway] repo (bos-settings, etc.).
|
||||
# Every transaction is snapshotted by snap-pac, so you can roll
|
||||
# back from the GRUB "snapshots" submenu or BOS Settings.
|
||||
# 2. bakery — the bread ecosystem apps in ~/.local/bin (bread, breadbar,
|
||||
# breadbox, breadcrumbs, breadpad, breadman, bread-theme).
|
||||
#
|
||||
# Best-effort: a failure in one channel doesn't abort the other.
|
||||
set -uo pipefail
|
||||
|
||||
bold() { printf '\033[1m%s\033[0m\n' "$1"; }
|
||||
|
||||
bold "==> System packages (pacman -Syu)"
|
||||
if command -v pacman >/dev/null; then
|
||||
sudo pacman -Syu || echo "WARN: pacman update failed"
|
||||
else
|
||||
echo "pacman not found; skipping"
|
||||
fi
|
||||
|
||||
echo
|
||||
bold "==> Bread ecosystem (bakery update --all)"
|
||||
if command -v bakery >/dev/null; then
|
||||
bakery update --all || echo "WARN: bakery update failed"
|
||||
else
|
||||
echo "bakery not found; skipping"
|
||||
fi
|
||||
|
||||
echo
|
||||
bold "==> BOS is up to date."
|
||||
|
|
@ -207,8 +207,15 @@ man-pages
|
|||
less
|
||||
|
||||
# Base CLI tools every install should have.
|
||||
# Shell
|
||||
# Shell — zsh with the same prompt + plugins as the dev laptop. Powerlevel10k is
|
||||
# AUR-only, so it's republished to [breadway] (see packaging/powerlevel10k). The
|
||||
# three plugins come from the official repos; skel/.zshrc sources them in order
|
||||
# (autosuggestions → history-substring-search → syntax-highlighting LAST).
|
||||
zsh
|
||||
zsh-theme-powerlevel10k
|
||||
zsh-autosuggestions
|
||||
zsh-history-substring-search
|
||||
zsh-syntax-highlighting
|
||||
# Editors
|
||||
nano
|
||||
micro
|
||||
|
|
|
|||
|
|
@ -23,4 +23,5 @@ file_permissions=(
|
|||
["/usr/local/bin/bos-session"]="0:0:755"
|
||||
["/usr/local/bin/bos-keybinds"]="0:0:755"
|
||||
["/usr/local/bin/bos-welcome"]="0:0:755"
|
||||
["/usr/local/bin/bos-update"]="0:0:755"
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue