From a6755863ddb3e5f8c14267cb8b206fd126efb08d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Mon, 17 Feb 2020 07:01:26 +0100
Subject: [PATCH] rankmirrors

---
 config/scripts/arch-rankmirrors       | 21 +++++++++++++++++++++
 config/scripts/common/installSoftware |  2 +-
 config/scripts/install-arch           |  2 ++
 config/scripts/rankmirrors            |  2 --
 config/scripts/softwareList           |  3 +++
 config/vim/pluginlist.vim             |  2 +-
 6 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100755 config/scripts/arch-rankmirrors
 delete mode 100755 config/scripts/rankmirrors

diff --git a/config/scripts/arch-rankmirrors b/config/scripts/arch-rankmirrors
new file mode 100755
index 0000000..939eb56
--- /dev/null
+++ b/config/scripts/arch-rankmirrors
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+set -e
+
+if [ $USER != root ]
+then
+    echo "This script should be run as root."
+    exit 1
+fi
+
+if ! pacman -Qq pacman-mirrorlist &> /dev/null
+then
+    pacman -S pacman-mirrorlist
+fi
+
+if [ ! -f /etc/pacman.d/mirrorlist.pacnew ]
+then
+    cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.pacnew
+fi
+
+egrep -o 'Server = .+' /etc/pacman.d/mirrorlist.pacnew | /usr/bin/rankmirrors -n 6 - > /etc/pacman.d/mirrorlist
diff --git a/config/scripts/common/installSoftware b/config/scripts/common/installSoftware
index 1f37977..8ca7866 100755
--- a/config/scripts/common/installSoftware
+++ b/config/scripts/common/installSoftware
@@ -223,7 +223,7 @@ hasInstaller() { # installerName
 # Installers that install in the user directory
 addUserInstallers() {
     addInstaller Tapt # Termux
-    addInstaller Umakepkg
+    # addInstaller Umakepkg # TODO broken
     addInstaller Upip
     # addInstaller Upkgbuild
 }
diff --git a/config/scripts/install-arch b/config/scripts/install-arch
index 964384b..29794a7 100755
--- a/config/scripts/install-arch
+++ b/config/scripts/install-arch
@@ -7,8 +7,10 @@ sudo pacman -S etckeeper --needed
 sudo etckeeper commit "install-arch script: begin"
 
 # Install yay
+sudo pacman -S base-devel --needed
 if ! pacman -Q yay &> /dev/null
 then
+    sudo pacman -S go-pie --needed
     mkdir -p $HOME/.cache/yay
     cd $HOME/.cache/yay
     curl -L https://aur.archlinux.org/cgit/aur.git/snapshot/yay.tar.gz | tar xzvf -
diff --git a/config/scripts/rankmirrors b/config/scripts/rankmirrors
deleted file mode 100755
index e2d63f3..0000000
--- a/config/scripts/rankmirrors
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-egrep -o 'Server = .+' /etc/pacman.d/mirrorlist.pacnew | /usr/bin/rankmirrors-n6 - > /etc/pacman.d/mirrorlist
diff --git a/config/scripts/softwareList b/config/scripts/softwareList
index 9112078..1d1d44f 100755
--- a/config/scripts/softwareList
+++ b/config/scripts/softwareList
@@ -107,6 +107,7 @@ i tmux # Terminal multiplexer
 i bash-completion # Shell completions
 i fzf # Fancy file finder
 i highlight # Syntax highlighter (TODO No termux)
+i powerline-go # Nice prompt (potential problem: requires go-pie)
 
 i zsh # Shell
 # TODO Arch only for the following but not a problem
@@ -114,6 +115,7 @@ i zsh-autosuggestions # Shell suggestions
 i zsh-completions # Shell completions
 i zsh-history-substring-search # Shell config
 i zsh-syntax-highlighting # Shell highlighting
+i rxvt-unicode-terminfo # So it doesn't act weird in root
 
 # Text edition
 (i neovim nvim && i python-neovim python3-neovim) || i vim || i vi # Text editor
@@ -270,6 +272,7 @@ then
     i vimpc-git # CLI UI MPD client
     i musescore # Music sheet editor
     i ashuffle # Auto-fill MPD playlist
+    i audacity # Audio editor
 fi
 
 
diff --git a/config/vim/pluginlist.vim b/config/vim/pluginlist.vim
index 986e6e7..a725fc9 100644
--- a/config/vim/pluginlist.vim
+++ b/config/vim/pluginlist.vim
@@ -79,7 +79,7 @@ Plug 'autozimu/LanguageClient-neovim', {
 " Disabled : While it works correctly when typing code,
 " when modifying existing one it's another thing
 
-Plug 'ActivityWatch/aw-watcher-vim'
+" Plug 'ActivityWatch/aw-watcher-vim'
 " Activity watch
 " (might not want this on every install)