From 6af534596f68b77aa74dcd6792f3c00afc61a04e Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Mon, 11 Nov 2019 19:44:44 +0200
Subject: [PATCH] Update Arch init script & packages

---
 .bashrc                       |  4 +++
 .config/mpv/mpv.conf          |  2 +-
 .local/arch/init.sh           | 48 +++++++++++++++++++++++------------
 .local/arch/packages.aur.txt  |  4 +--
 .local/arch/packages.repo.txt |  6 -----
 .yarnrc                       |  1 +
 6 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/.bashrc b/.bashrc
index 7bad681..29266fa 100644
--- a/.bashrc
+++ b/.bashrc
@@ -29,6 +29,10 @@ PROMPT_DIRTRIM=2
 # Don't complete files with the following extensions
 FIGNORE='~:.o:.swp:.pyc'
 
+# Show hints in ./configure --option=
+# shellcheck disable=SC2034
+COMP_CONFIGURE_HINTS=1
+
 # Alias definitions
 test -f ~/.bash_aliases && . "$_"
 
diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf
index f7294b7..fffcf5c 100644
--- a/.config/mpv/mpv.conf
+++ b/.config/mpv/mpv.conf
@@ -39,7 +39,7 @@ user-agent="Mozilla/5.0 (X11; Linux x86_64) mpv/0.30.0"
 # OSD {{{
 
 # Set the duration of the OSD messages in ms.
-osd-duration=2000
+osd-duration=5000
 
 # Specify font to use for OSD.
 osd-font="Fantasque Sans Mono"
diff --git a/.local/arch/init.sh b/.local/arch/init.sh
index d5a7d92..0fa8694 100755
--- a/.local/arch/init.sh
+++ b/.local/arch/init.sh
@@ -88,23 +88,39 @@ unset -f ghdl
 # }}}
 
 # Install bash completions {{{
-DIRECTORY=/etc/bash_completion.d
+DIRECTORY="$XDG_DATA_HOME/bash-completion/completions"
+declare -A ALIASES=(
+  [adb]=android
+  [emulator]=android
+  [fastboot]=android
+  [clang++]=clang
+  [ffprobe]=ffmpeg
+  [goapp]=go
+  [godoc]=go
+  [gradlew]=gradle
+)
+mkdir -p "$DIRECTORY"
 raw() (printf 'https://raw.githubusercontent.com/%s' "$1/$2/master/$3")
-sudo wget -P "$DIRECTORY" \
-  "$(raw mbrubeck android-completion android)" \
-  "$(raw clerk67 ffmpeg-completion ffmpeg)" \
-  "$(raw eriwn gradle-completion-bash gradle-completion.bash)" \
-  "$(raw omakoto go-completion.bash go-completion.bash)"
-sudo wget -P "$DIRECTORY" -i - <<< "$(\
-  for name in 7z chmod chown jq openssl usermod; do \
-    printf '%s\n' "$(raw scop bash-completion "completions/$name")"; \
-  done)"
-grunt --completion=bash | sudo tee \
-  "$DIRECTORY/grunt-completion.bash" >/dev/null
-gulp --completion=bash | sudo tee \
-  "$DIRECTORY/gulp-completion.bash" >/dev/null
-pip completion -b | sudo tee "$DIRECTORY/pip-completion.bash" >/dev/null
-unset -f DIRECTORY raw
+aria2c -d "$DIRECTORY" -i - <<EOF
+$(raw mbrubeck android-completion android)
+$(raw clerk67 ffmpeg-completion ffmpeg)
+$(raw gradle gradle-completion gradle-completion.bash)
+  out=gradle
+$(raw omakoto go-completion.bash go-completion.bash)
+  out=go
+$(raw llvm-mirror clang utils/bash-autocomplete.sh)
+  out=clang
+EOF
+printf 'complete -o default -F _ffmpeg ffprobe\n' >> "$DIRECTORY/ffmpeg"
+printf 'complete -o default -F _clang clang++\n' >> "$DIRECTORY/clang"
+for key in "${!ALIASES[@]}"; do
+  ln -fvs "$DIRECTORY/${ALIASES[$key]}" "$DIRECTORY/$key"
+done
+grunt --completion=bash > "$DIRECTORY/grunt"
+gulp --completion=bash > "$DIRECTORY/gulp"
+pandoc --bash-completion > "$DIRECTORY/pandoc"
+poetry completions bash > "$DIRECTORY/poetry"
+unset -f DIRECTORY ALIASES raw
 # }}}
 
 # Install from github reporisotories {{{
diff --git a/.local/arch/packages.aur.txt b/.local/arch/packages.aur.txt
index 3e993c0..0280f3d 100644
--- a/.local/arch/packages.aur.txt
+++ b/.local/arch/packages.aur.txt
@@ -12,12 +12,12 @@ google-java-format
 intellij-idea-ultimate-edition
 intellij-idea-ultimate-edition-jre
 iridium-deb
-kde-servicemenus-rootactions
 kde-thumbnailer-apk
-kde-thumbnailer-epub
 korla-icon-theme
 luacheck
+mcomix-gtk3-git
 mkv-extractor-qt
+opustags
 pandoc-bin
 phpstorm
 pycharm-professional
diff --git a/.local/arch/packages.repo.txt b/.local/arch/packages.repo.txt
index 03a8837..4396a12 100644
--- a/.local/arch/packages.repo.txt
+++ b/.local/arch/packages.repo.txt
@@ -39,12 +39,10 @@ go
 goldendict
 gradle
 htop
-httpie
 hub
 iftop
 imagemagick
 inkscape
-jdk-openjdk
 jdk8-openjdk
 jq
 kcolorchooser
@@ -61,7 +59,6 @@ libreoffice-fresh
 lldb
 llvm
 maven
-mcomix
 mesa
 mkvtoolnix-cli
 mkvtoolnix-gui
@@ -77,7 +74,6 @@ odt2txt
 okteta
 okular
 optipng
-oracle-instantclient-sqlplus
 otf-fantasque-sans-mono
 otf-fira-code
 p7zip
@@ -117,12 +113,10 @@ vifm
 vim
 vint
 virt-manager
-vulkan-intel
 wget
 whois
 wine
 words
-xf86-video-intel
 yarn
 youtube-dl
 zathura
diff --git a/.yarnrc b/.yarnrc
index 5f469ca..bb31016 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -9,6 +9,7 @@ init-author-name ObserverOfTime
 init-author-url "https://observeroftime.github.io"
 init-license MIT
 init-version "0.1.0"
+prefix "~/.local"
 user-agent "yarn/1.19.1 node/v12.13.0 linux x64"
 username ObserverOfTime
 version-git-sign true