Modifications after reinstall

Xresources.d/configure

@@ -3,7 +3,7 @@
 mkdir -p $HOME/.local/share/fonts
 echo $(for i in "" "%20Bold" "%20Oblique" "%20Bold%20Oblique"; do
     cd $HOME/.local/share/fonts
-    wget http://raw.githubusercontent.com/powerline/fonts/master/DejaVuSansMono/DejaVu%20Sans%20Mono$i%20for%20Powerline.ttf
+    wget -c http://raw.githubusercontent.com/powerline/fonts/master/DejaVuSansMono/DejaVu%20Sans%20Mono$i%20for%20Powerline.ttf
 done)
-wget "https://aur.archlinux.org/cgit/aur.git/plain/icons.ttf?h=ttf-font-icons" -O $HOME/.local/share/fonts/icons.ttf
+wget -c "https://aur.archlinux.org/cgit/aur.git/plain/icons.ttf?h=ttf-font-icons" -O $HOME/.local/share/fonts/icons.ttf
 

config/i3/config

@@ -234,7 +234,7 @@ assign [class="Clementine"] $WS10
 assign [title="TweetDeck"] $WS8
 
 # Open specific applications in floating mode
-for_window [title="alsamixer"] floating enable border pixel 2
+for_window [title="pacmixer"] floating enable border pixel 2
 for_window [class="Firefox"] layout tabbed
 for_window [class="qutebrowser"] layout tabbed
 

scripts/install-arch

@@ -3,9 +3,9 @@
 # Setups an Arch Linux system the way I like it
 # (requires sudo)
 
-if which pacman &> /dev/null; then
+if ! which pacman &> /dev/null; then
     echo "This is not an Arch Linux system (or pacman isn't installed)"
-    return 1
+    exit 1
 fi
 
 # Configuration
@@ -21,21 +21,21 @@ function prompt { # text
 }
 
 # Don't ask for things that are already there
-if which yaourt &> /dev/null; then
-    local YAOURT=1
+if which pacaur &> /dev/null; then
+    PACAUR=1
 fi
 if which bauerbill &> /dev/null; then
-    local BAUERBILL=1
+    BAUERBILL=1
 fi
 
-if [ -z $YAOURT ]; then
-    prompt "Do you want yaourt on this machine?"
-    local YAOURT=$?
+if [ -z $PACAUR ]; then
+    prompt "Do you want pacaur on this machine?"
+    PACAUR=$?
 fi
-if [ $YAOURT == 1 ]; then
+if [ $PACAUR == 1 ]; then
     if [ -z $BAUERBILL ]; then
         prompt "Do you want bauerbill on this machine?"
-        local BAUERBILL=$?
+        BAUERBILL=$?
     fi
 else
     BAUERBILL=0
@@ -55,10 +55,11 @@ function inst {
 
 # Install package from PKGBUILD file
 function installPKGBUILD { # url
+    # TODO Download snapshots
     TMP_DIR="$(mktemp -d /tmp/pkgbuild.XXXXXXXXXX)"
     cd "$TMP_DIR"
     wget "$1" -O PKGBUILD
-    makepkg -si
+    makepkg -si --noconfirm
     cd -
     rm -rf "$TMP_DIR"
 }
@@ -66,41 +67,62 @@ function installPKGBUILD { # url
 # SYSTEM
 inst wget
 
-pacman -Q yaourt &> /dev/null
-if [[ $YAOURT == 1 && $? == 1 ]]; then
-    installPKGBUILD "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=package-query"
-    installPKGBUILD "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=yaourt"
+# Aur
+
+pacman -Q pacaur &> /dev/null
+if [[ $PACAUR == 1 && $? == 1 ]]; then
+    installPKGBUILD "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=cower"
+    installPKGBUILD "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=pacaur"
 fi
 
-if pacman -Q pamac ; then
-    sudo pacman -Rsc pamac
+# Git for /etc
+sudo pacman -S etckeeper --noconfirm --needed
+sudo etckeeper init
+sudo etckeeper commit "~/.dotfiles/scripts/install-arch commit"
+
+# Uninstall Manjaro's pamac
+if pacman -Q pamac &> /dev/null ; then
+    sudo pacman -Rsc pamac --noconfirm
 fi
 
+# Ccache
+sudo pacman -S ccache --noconfirm --needed
+sudo sed 's|BUILDENV=\(.\+\)!ccache\(.\+\)|BUILDENV=\1ccache\2|' /etc/makepkg.conf -i
+
+# Bauerbill
 pacman -Q bauerbill &> /dev/null
 if [[ $BAUERBILL == 1 && $? == 1 ]]; then
-    sudo pacman -Sy manjaro-{hotfixes,keyring,release,system} --noconfirm
+    sudo pacman -Sy
 
     gpg --recv-keys 1D1F0DC78F173680
     installPKGBUILD http://xyne.archlinux.ca/projects/reflector/pkgbuild/PKGBUILD
-    yaourt -S bauerbill --noconfirm
+    pacaur -S bauerbill --noconfirm --noedit
 
-    bb-wrapper -Su
-    # TODO Prompt if all went well, if not restart
+    bauerbill -Su --noconfirm
 else
     sudo pacman -Syu
 fi
 
-# Disable predictable network names
-sudo ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
-
 # TLP
-# sudo pacman -S tlp
-# sudo systemctl enable tlp.service tlp-sleep.service
-# sudo systemctl disable systemd-rfkill
+sudo pacman -S tlp --noconfirm --needed
+sudo sed 's|SATA_LINKPWR_ON_BAT=min_power|SATA_LINKPWR_ON_BAT=max_performance|' /etc/default/tlp -i
+sudo systemctl enable tlp.service tlp-sleep.service
+sudo systemctl disable systemd-rfkill.service systemd-rfkill.socket
+sudo tlp start
 
-# TODO
-# make -j8 in MAKEPKG
-# time
-# nfs
-# hibernate
+# Numlock on boot
+echo -e "[Service]\nExecStartPre=/bin/sh -c 'setleds +num < /dev/%I'" | sudo systemctl edit getty\@.service
+
+# Makeflags
+sudo sed "s|#MAKEFLAGS=\"-j2\"|MAKEFLAGS=\"-j$(nproc)\"|" /etc/makepkg.conf -i
+
+# Time synchronisation
+sudo pacman -S ntp --noconfirm --needed
+sudo systemctl start ntpd
+sudo systemctl enable ntpd
+
+# MANUAL
+
+# Hibernation
+# Add resume=UUID=<UUID-of-swap-partition> to GRUB_CMDLINE_LINUX_DEFAULT and run `sudo grub-mkconfig -o /boot/grub/grub.cfg`
 

scripts/install-prefs

@@ -54,7 +54,14 @@ if which pacman &> /dev/null; then
         function installFileOne { # file
             sudo pacman -U "$1"
         }
-        if which yaourt &> /dev/null; then
+        if which pacaur &> /dev/null; then
+            function altInstallOne { # package
+                pacman -Q $1 &> /dev/null
+                if [ $? == 1 ]; then
+                    pacaur -S "$1" --noconfirm --noedit
+                fi
+            }
+        elif which yaourt &> /dev/null; then
             function altInstallOne { # package
                 pacman -Q $1 &> /dev/null
                 if [ $? == 1 ]; then
@@ -175,8 +182,8 @@ if [ $TERMUX == 1 ]; then
 fi
 inst moreutils screen ncdu lsof htop proxytunnel pv curl wget sshfs netcat mosh bash-completion rsync
 if [ $ARCH == 1 ]; then
-    inst gopass
-    altInst tldr-bash-git
+    inst bash-completion
+    altInst gopass
 else
     inst pass
     wget -qO ~/.bin/ https://raw.githubusercontent.com/pepa65/tldr-bash-client/master/tldr
@@ -243,7 +250,8 @@ if [ $GUI == 1 ]; then
     # Desktop manager
     inst i3 i3lock dunst unclutter xautolock feh numlockx scrot xterm xclip
     if [ $ARCH == 1 ]; then
-        altInst polybar-git ttf-font-awesome autorandr-git keynav-enhanced
+        inst xorg-xinit
+        altInst polybar-git ttf-font-awesome autorandr-git keynav-enhanced pacmixer
     else
         # Compiling polybar
         if ! which polybar > /dev/null; then
@@ -311,7 +319,7 @@ if [ $EXTRA == 1 ]; then
     inst cmake clang llvm npm
 
     # Extra CLI
-    inst sl ffmpeg youtube-dl optipng syncthing
+    inst sl ffmpeg youtube-dl optipng syncthing ccache
 
     if [ $ARCH == 1 ]; then
         inst jq
@@ -324,11 +332,11 @@ if [ $EXTRA == 1 ]; then
 
     # Extra GUI
     if [ $GUI == 1 ]; then
-        inst vlc gimp mpd vimpc
+        inst vlc gimp mpd thunar
 
         if [ $ARCH == 1 ]; then
             inst simplescreenrecorder
-            altInst pacmixer
+            altInst pacmixer xcursor-menda-git menda-themes-git menda-maia-icon-theme vimpc-git
         fi
 
     fi