janek
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config/yadm/bootstrap: improve sectioning

This commit is contained in:
xeruf 2021-12-11 02:02:01 +01:00
parent f8da1fe449
commit 0afb39d42f
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.config/yadm/bootstrap
View File

@ -1,18 +1,18 @@
# Headings # Headings
section() { printf "\n$1\n"; } SECTION() { printf "\n$1\n"; }
highlight() { printf "$1\n"; } highlight() { printf "$1\n"; }
subhighlight() { printf "$1\n"; }
## System SECTION "System"
section "System"
highlight "Default sudoers configuration" highlight "Sudoers defaults"
echo 'Defaults editor=/usr/bin/nvim echo 'Defaults editor=/usr/bin/nvim
Defaults env_keep="EDITOR"' | Defaults env_keep="EDITOR"' |
sudo tee /etc/sudoers.d/editor sudo tee /etc/sudoers.d/editor
echo 'Defaults timestamp_timeout=120 echo 'Defaults timestamp_timeout=120
Defaults passwd_timeout=30' | Defaults passwd_timeout=30' |
sudo tee /etc/sudoers.d/timeout sudo tee /etc/sudoers.d/timeout
highlight "password-free reboot" subhighlight "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" | 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 sudo tee /etc/sudoers.d/shutdown
@ -26,8 +26,8 @@ ExecStart=-/usr/bin/agetty --skip-login --login-options $USER %I" |
highlight "Sysyadm setup" highlight "Sysyadm setup"
test -d "/etc/yadm" || sy clone test -d "/etc/yadm" || sy clone
## Software SECTION "Software"
section "Software"
link() { link() {
test -e "$2" || $(checkaccess -w "$2" || echo sudo) ln -sv "$@" test -e "$2" || $(checkaccess -w "$2" || echo sudo) ln -sv "$@"
} }
@ -53,8 +53,8 @@ test "$hasService" && sudo service cron reload || sudo systemctl reload cronie
highlight "Zsh" highlight "Zsh"
test -n "$ZSH" || export ZSH="${XDG_DATA_HOME:-$HOME/.local/share}/zsh/oh-my-zsh" test -n "$ZSH" || export ZSH="${XDG_DATA_HOME:-$HOME/.local/share}/zsh/oh-my-zsh"
mkdir -p "$ZSH" mkdir -p "$(dirname $ZSH)"
oldzsh="$XDG_STATE_HOME/zsh/oh-my-zsh" && test ! -d "$ZSH" && test -d "$oldzsh" && mv -vn $oldzsh $ZSH oldzsh="$XDG_STATE_HOME/zsh/oh-my-zsh" && test ! -d "$ZSH" -a -d "$oldzsh" && mv -vn $oldzsh $ZSH
cloneshallow() { cloneshallow() {
url=https://github.com/$2/$1.git url=https://github.com/$2/$1.git
dir="${3:-$ZSH/plugins/$1}" dir="${3:-$ZSH/plugins/$1}"
@ -71,12 +71,12 @@ cloneshallow zsh-autosuggestions zsh-users
cloneshallow zsh-vim-mode softmoth cloneshallow zsh-vim-mode softmoth
case "$(grep "^$USER" /etc/passwd | sed 's/.*://')" in (*zsh);; (*) chsh -s $(which zsh);; esac case "$(grep "^$USER" /etc/passwd | sed 's/.*://')" in (*zsh);; (*) chsh -s $(which zsh);; esac
### Arch highlight "Arch"
if test -f /etc/pacman.conf; then if test -f /etc/pacman.conf; then
highlight "Pacman" subhighlight "Pacman"
sudo sed -i 's/#Color/Color/' /etc/pacman.conf sudo sed -i 's/#Color/Color/' /etc/pacman.conf
sudo sed -i "$(grep -n "\[multilib\]" /etc/pacman.conf | cut -d':' -f1),+1 s/# *//" /etc/pacman.conf sudo sed -i "$(grep -n "\[multilib\]" /etc/pacman.conf | cut -d':' -f1),+1 s/# *//" /etc/pacman.conf
highlight "Reflector" subhighlight "Reflector"
echo "--save /etc/pacman.d/mirrorlist echo "--save /etc/pacman.d/mirrorlist
--protocol https --protocol https
--country Germany --country Germany
@ -86,10 +86,10 @@ if test -f /etc/pacman.conf; then
sudo systemctl enable reflector.timer sudo systemctl enable reflector.timer
fi fi
### Applications
test "$DISPLAY" || exit 0 test "$DISPLAY" || exit 0
highlight "Desktop Applications"
highlight "Application symlinks" subhighlight "Application symlinks"
link "$XDG_STATE_HOME/gradle/gradle.properties" "$XDG_CONFIG_HOME/gradle.properties" link "$XDG_STATE_HOME/gradle/gradle.properties" "$XDG_CONFIG_HOME/gradle.properties"
link "$XDG_DATA_HOME/applications/signal-tray.desktop" "$XDG_CONFIG_HOME/autostart/" link "$XDG_DATA_HOME/applications/signal-tray.desktop" "$XDG_CONFIG_HOME/autostart/"
link "/usr/share/applications/stretchly.desktop" "$XDG_CONFIG_HOME/autostart/" link "/usr/share/applications/stretchly.desktop" "$XDG_CONFIG_HOME/autostart/"
@ -98,8 +98,8 @@ if ! test -d "$mx"
then mkdir "$mx" && ln -sv -t "$mx" ${XDG_DATA_HOME:-$HOME/.local/share}/mixxx/* ${XDG_CONFIG_HOME:-$HOME/.config}/mixxx/* then mkdir "$mx" && ln -sv -t "$mx" ${XDG_DATA_HOME:-$HOME/.local/share}/mixxx/* ${XDG_CONFIG_HOME:-$HOME/.config}/mixxx/*
fi fi
highlight "Block internet at night & on weekdays in the morning to force focus" subhighlight "Block internet at night & on weekdays in the morning to force focus"
walli 22 --save walli 22 --save
highlight "Setup kakoune plugin loader" subhighlight "Setup kakoune plugin loader"
cloneshallow plug.kak robertmeta "${XDG_CONFIG_HOME:-$HOME/.config}/kak/plugins/plug.kak" cloneshallow plug.kak robertmeta "${XDG_CONFIG_HOME:-$HOME/.config}/kak/plugins/plug.kak"