From 3af285ac53a2cfffb0509991b507ae102d48afa6 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Wed, 13 Oct 2021 20:02:37 +0200
Subject: [PATCH] config/shell: enable rootless sysyadm

---
 .config/shell/functions | 17 ++++++++---------
 .config/shell/git       |  2 +-
 .config/yadm/bootstrap  | 36 +++++++++++-------------------------
 .config/zsh/.zshrc      |  1 +
 4 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/.config/shell/functions b/.config/shell/functions
index 794011b..a815941 100644
--- a/.config/shell/functions
+++ b/.config/shell/functions
@@ -249,15 +249,6 @@ killJava() {
 
 alias l="ls -l --almost-all --human-readable --group-directories-first --file-type"
 
-# Swap the names of two files
-swap() {
-	test $# -eq 2 || exit 1
-	mv -n $1 $1.tmp
-	mv -n $2 $1
-	mv -n $1.tmp $2
-}
-
-
 alias f="noglob fdd"
 fdd() { $(which fd >/dev/null && echo fd || echo fdfind) --color=always --hidden --no-ignore-vcs --one-file-system "$@" | less -F; }
 compdef f=fd
@@ -270,6 +261,14 @@ which perl-rename >/dev/null && alias lowercase="perl-rename '$lowercase_transli
 alias move='rsync --recursive --progress --human-readable --remove-source-files'
 alias rdiff='rsync --recursive --progress --delete --links --dry-run'
 
+# Swap the names of two files
+swap() {
+	test $# -eq 2 || exit 1
+	mv -n $1 $1.tmp
+	mv -n $2 $1
+	mv -n $1.tmp $2
+}
+
 # mv with automatic sudo if neccessary
 smv() {
 	test -w "$1" && test -w "$(dirname $2)" && mv "$@" || sudo mv "$@"
diff --git a/.config/shell/git b/.config/shell/git
index 7147a50..d350e15 100644
--- a/.config/shell/git
+++ b/.config/shell/git
@@ -12,7 +12,7 @@ yc() {
   yadm commit -v --template /tmp/yc-msg ${@:2} -- "$XDG_CONFIG_HOME/$folder"
 }
 
-alias sysyadm="sudo yadm -Y /etc/yadm"
+alias sysyadm="yadm --yadm-dir /etc/yadm --yadm-data /etc/yadm"
 alias sysinit="sysyadm init -b main -w /; sysyadm gitconfig include.path '$XDG_CONFIG_HOME/git/config'"
 sy() {
   unignore="/etc/yadm/unignore"
diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 29a92af..50df310 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -3,39 +3,25 @@ section() { printf "\n$1\n"; }
 highlight() { printf "$1\n"; }
 
 ## System
-### TODO move to sysyadm
 section "System"
 
-highlight "Enable REISUB and increase watch limit for Intellij & co"
-echo "kernel.sysrq=1" | sudo tee /etc/sysctl.d/60-sysrq.conf
-echo "fs.inotify.max_user_watches=800000" | sudo tee /etc/sysctl.d/60-max-user-watches.conf
-sudo sysctl --system
-
 highlight "Default sudoers configuration"
 echo 'Defaults	editor=/usr/bin/nvim
-Defaults env_keep="EDITOR"' | sudo tee /etc/sudoers.d/editor
-echo -e "Defaults	timestamp_timeout=120\nDefaults	passwd_timeout=30" | sudo tee /etc/sudoers.d/timeout
+Defaults        env_keep="EDITOR"' |
+  sudo tee /etc/sudoers.d/editor
+echo 'Defaults	timestamp_timeout=120
+Defaults	passwd_timeout=30' |
+  sudo tee /etc/sudoers.d/timeout
 highlight "password-free reboot"
-echo "$USER ALL = NOPASSWD: /sbin/halt, /sbin/reboot, /usr/sbin/reboot, /sbin/poweroff, /usr/sbin/shutdown" | sudo tee /etc/sudoers.d/shutdown
-
-highlight "Reduce system startup & shutdown timeout"
-sudo mkdir -p /etc/systemd/system.conf.d /etc/systemd/user.conf.d
-echo "[Manager]
-DefaultTimeoutStartSec=5s
-DefaultTimeoutStopSec=10s" | sudo tee /etc/systemd/system.conf.d/boot.conf /etc/systemd/user.conf.d/boot.conf
+echo "$USER ALL = NOPASSWD: /usr/bin/halt, /usr/bin/shutdown, /usr/bin/reboot, /usr/bin/poweroff, /bin/reboot, /bin/shutdown" |
+  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
 echo "[Service]
 ExecStart=
-ExecStart=-/usr/bin/agetty --skip-login --login-options $USER %I" | sudo tee /etc/systemd/system/getty@tty1.service.d/override.conf /etc/systemd/system/getty@tty2.service.d/override.conf /etc/systemd/system/getty@tty3.service.d/override.conf
-
-highlight '/etc/locale.conf'
-echo 'LANG=en_IE.UTF-8
-LANGUAGE=en_IE.UTF-8
-LC_ALL=en_IE.UTF-8
-LC_MONETARY=de_DE.UTF-8
-LC_COLLATE=C' | sudo tee /etc/locale.conf
+ExecStart=-/usr/bin/agetty --skip-login --login-options $USER %I" |
+  sudo tee /etc/systemd/system/getty@tty1.service.d/override.conf /etc/systemd/system/getty@tty2.service.d/override.conf /etc/systemd/system/getty@tty3.service.d/override.conf
 
 ## Hardware
 section 'Hardware'
@@ -97,6 +83,6 @@ highlight "Mixxx symlinks"
 mkdir -p ~/.mixxx
 ln -s -t ~/.mixxx ${XDG_DATA_HOME:-$HOME/.local/share}/mixxx/* ${XDG_CONFIG_HOME:-$HOME/.config}/mixxx/*
 
-highlight "Setup kakoune for plugins"
+highlight "Setup kakoune plugin loader"
 plugkak="${XDG_CONFIG_HOME:-$HOME/.config}/kak/plugins/plug.kak"
-! test -d "$plugkak" && mkdir -p "$(dirname $plugkak)" && git clone https://github.com/robertmeta/plug.kak.git "$plugkak"
+test -d "$plugkak" || { mkdir -p "$(dirname $plugkak)" && git clone https://github.com/robertmeta/plug.kak.git "$plugkak"; }
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 8b49669..6195191 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -153,6 +153,7 @@ unsetopt CASE_GLOB
 setopt pipefail
 
 # Enable zmv (see ZSHCONTRIB(1))
+alias szmv='sudo zsh -c autoload zmv && zmv'
 autoload zmv
 alias zmv='noglob zmv'
 alias zmw='noglob zmv -W'