From 2f9559afe65330236945062611397d7ea44f99e0 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Sat, 11 Dec 2021 00:59:42 +0100
Subject: [PATCH] config: fix manjaro bootstrap issues

---
 .config/shell/arch     |  3 +--
 .config/yadm/bootstrap |  6 ++++--
 README.org             | 10 ++++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.config/shell/arch b/.config/shell/arch
index b213d80..dd73d95 100644
--- a/.config/shell/arch
+++ b/.config/shell/arch
@@ -4,9 +4,8 @@ which pacman >/dev/null || return 0
 alias pac='noglob sudo pacman'
 alias pacs='pac -Syu --needed'
 alias pacr='pac -R --recursive'
-alias yays='noglob yay -Sy --needed'
+alias yays='noglob yay -Sy --needed --noprovides --noremovemake'
 alias yayr='noglob yay -R --cascade --recursive'
-alias yau='yay -Syu --nobatchinstall'
 
 # Helper function to integrate yay and fzf
 yzf() {
diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 8ced0e0..1694f39 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -16,8 +16,8 @@ highlight "password-free reboot"
 echo "$USER ALL = NOPASSWD: /usr/bin/halt, /usr/bin/shutdown, /usr/bin/reboot, /usr/bin/poweroff, /bin/reboot, /bin/shutdown. /usr/bin/umount" |
 	sudo tee /etc/sudoers.d/shutdown
 
-highlight "Default to current user in tty1,2,3"
-sudo mkdir -p /etc/systemd/system/getty@tty1.service.d /etc/systemd/system/getty@tty2.service.d /etc/systemd/system/getty@tty3.service.d
+highlight "Set default user in tty1,2,3"
+sudo mkdir -p /etc/systemd/system/getty@tty{1,2,3}.service.d
 echo "[Service]
 ExecStart=
 ExecStart=-/usr/bin/agetty --skip-login --login-options $USER %I" |
@@ -53,6 +53,8 @@ test "$hasService" && sudo service cron reload || sudo systemctl reload cronie
 
 highlight "Zsh"
 test -n "$ZSH" || export ZSH="${XDG_DATA_HOME:-$HOME/.local/share}/zsh/oh-my-zsh"
+mkdir -p "$ZSH"
+oldzsh="$XDG_STATE_HOME/zsh/oh-my-zsh" && test ! -d "$ZSH" && test -d "$oldzsh" && mv -vn $oldzsh $ZSH
 cloneshallow() {
 	url=https://github.com/$2/$1.git
 	dir="${3:-$ZSH/plugins/$1}"
diff --git a/README.org b/README.org
index 2f068a2..dcae075 100644
--- a/README.org
+++ b/README.org
@@ -30,13 +30,15 @@ and configuration for ~less~ and ~fzf~.
 : pacman -Qe | cut -d\  -f1 | xclip -selection clipboard
 # Use org-yank-visible
 - essentials :: curl git zsh bat neovim man-db
-- basic tools :: tree wget locate texinfo man-pages base-devel fzf
-  fd zsh-completions python-pynvim unrar mlocate
+- basic tools :: tree wget texinfo man-pages base-devel fzf topgrade
+  fd ripgrep zsh-completions python-pynvim unrar mlocate
 - dotfiles :: yadm
   : yadm clone --bootstrap git@git.jfischer.org:xeruf/dotfiles.git
   : yadm clone --bootstrap https://git.jfischer.org/xeruf/dotfiles.git
 ** Applications
-- common tools :: ripgrep topgrade ffmpeg imagemagick pandoc [[https://lftp.yar.ru/][lftp]] glances youtube-dl dos2unix zsh-doc pacman-contrib
+- utilities :: youtube-dl dos2unix
+- powertools :: hexedit hexyl [[https://lftp.yar.ru/][lftp]] glances zsh-doc pacman-contrib
+- multitools :: ffmpeg imagemagick pandoc
 - music :: mpd mpc ncmpc vlc phonon-qt5-vlc mpdris2
   : mkdir -p ~/.local/state/mpd && systemctl --user enable --now mpd mpDris2
 - music management :: puddletag beets picard ffmpegthumbnailer sox
@@ -99,7 +101,7 @@ After running android-studio setup, accept licenses:
 : $ANDROID_SDK_ROOT/tools/bin/sdkmanager --licenses
 ** Server
 Setup systemd-resolved and systemd-networkd
-- tools :: fd-find
+- tools :: fd-find locate
 - rust :: cargo install zoxide diffr
   : curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 - ssh (Ubuntu) :: lemonade openssh