Merge branch 'master' into vhs

distros/arch/basic-install.md

@@ -1,6 +1,6 @@
 ---
 title: "basic-install"
-tags: [ "Documentation", "distros" ]
+tags: [ "Documentation", "arch" ]
 ---
 Keyboard layout changed.
 
@@ -109,12 +109,11 @@ Ping some sites to make sure the network's working
 
 > umount -R /mnt
 
-Remove retarded beep sound:
+Remove that awful beep sound:
-
-> sudo echo "blacklist pcspkr" >> /etc/modprobe.d/nobeep.conf
 
 > rmmod pcspkr
 
-# Fonts
+...and make the change permanent:
+
+> sudo echo "blacklist pcspkr" >> /etc/modprobe.d/nobeep.conf
 
-sudo pacman -S ttf-hack ttf-font-awesome ttf-fira-mono

distros/arch/blackarch.md

@@ -1,50 +0,0 @@
----
-title: "blackarch"
-tags: [ "Documentation", "distros" ]
----
-
-## Basics
-
-List Blackarch Packages
-
-> sudo pacman -Sgg | grep blackarch | cut -d' ' -f2 | sort -u
-
-Install all with 
-
-> sudo pacman -S blackarch
-
-List availalble groups with
-
-> sudo pacman -Sg | grep blackarch | cut -d- -f2
-
-Install a group with
-
-> sudo pacman blackarch-$thing
-
-e.g.
-
-> sudo blackarch-cracker
-
-## Install from Source
-
-First install blackman.
-
-> sudo pacman -S blackman
-
-List categories:
-
-> blackman -l
-
-Then install all from a category with:
-
-> sudo blackman -p [ category ]
-
-Or install from source with:
-
-> sudo blackman -g [ group name]
-
-or 
-
-> sudo blackman -i [ package ]
-
-

distros/arch/blackarch.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-# Just tested - working fine so far.
-
-# update
-
-pacman -Syyu
-
-curl -O https://blackarch.org/strap.sh
-
-sh="$(sha1sum strap.sh)"
-
-echo "Does $sh equal 9f770789df3b7803105e5fbc19212889674cd503 ?"
-
-read ent
-
-if [ ! $(echo $ent | grep -c y ) ] ; then
-	echo bye
-	exit 1
-fi
-
-chmod +x strap.sh
-
-./strap.sh
-
-echo Finished
-

distros/arch/pacman.md

@@ -36,3 +36,14 @@ If you're constantly getting 'everything corrupted, nothing upgraded', try runni
 List all orphaned packages:
 
 > sudo pacman -Qtdq
+
+## Cleaning Config Files
+
+Arch does not overwrite your changes to configuration files.
+Instead, it updates them by adding the `.pacnew` suffix.
+
+So when `/etc/pacman.conf` receives an update, this will be placed in `/etc/pacman.conf.pacnew`.
+These changes must be merge manually.
+
+Install the `pacdiff` tool to make this easier, from the `pacman-contrib` package, then simply run `sudo pacdiff` to sort through the various mergers.
+