PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: David Thurstenson <thurstylark@gmail.com>
 pkgbase=tl-archconfig
-pkgname=("tl-dmesg-unrestrict" "tl-pacdiff-hook" "tl-reflector-config" "tl-steamdummy" "tl-quiet-printk" "tl-repos")
+pkgname=("tl-dmesg-unrestrict" "tl-pacdiff-hook" "tl-reflector-config" "tl-steamdummy")
-pkgver=6
+pkgver=2
 pkgrel=1
 pkgdesc="Thurstylark's system-level tweaks for Arch Linux"
 arch=(any)
@@ -12,19 +12,11 @@ source=("tl-dmesg-unrestrict.conf"
 	"tl-pacdiff.hook"
 	"tl-reflector.service.override.conf"
 	"tl-reflector.conf"
-	"tl-quiet-printk.conf"
-	"tl-repo-local.conf"
-	"tl-repo-remote.conf"
-	"tl-repos.conf"
 )
 sha256sums=('0ccede1887575ae52e57824dd53cd9f65cf13b249a3757097e9c06dc16ac535e'
-            'ffcc1090642178dae38c51618a2c8d9ba75ae3f9ae2994287b5ba44d6f33574a'
+            'fa4010aefe4ed06d623d5915ed70442c263c41a5eb72014b1084210d4db33ed5'
             '7801aaf6d28d0bf5f7b8c0e35e04af7201f3178b3b4af07a48a36ab4d1e8d7f1'
-            'ffe8c4f0928ffd70d05b3ca04d87f8181aa21214cc62fb4dd71a3753c2a788d0'
+            'ffe8c4f0928ffd70d05b3ca04d87f8181aa21214cc62fb4dd71a3753c2a788d0')
-            '9c8ae14faa534119a258625144bd984c0d653929200dc367e3366d015ff4d6be'
-            '5a1f03b3a95b1e8ae972f8cdbbaa0ec23d201aadf5f264a6bf9cd3be14a195c2'
-            'ddcce5b7df89eca4d50d286c086b58ab14c9fde33ee17198235f2b262dce6dbf'
-            'ba4e9b7dd4b13edd11e3c5e0b46479d9d77365560d467ee7372ae3380a25bf2f')
 
 package_tl-dmesg-unrestrict() {
 	pkgdesc="Set kernel.dmesg)unrestrict=0"
@@ -35,9 +27,9 @@ package_tl-dmesg-unrestrict() {
 
 package_tl-pacdiff-hook() {
 	pkgdesc="A hook to run pacdiff after any run of pacman"
-	depends=('pacman-contrib')
+	depends=('pacman-contrib' 'vim')
 
-	install -Dm644 tl-pacdiff.hook ${pkgdir}/usr/share/libalpm/hooks/zz-tl-pacdiff.hook
+	install -Dm644 tl-pacdiff.hook ${pkgdir}/usr/share/libalpm/hooks/pacdiff.hook
 }
 
 package_tl-reflector-config() {
@@ -58,24 +50,3 @@ package_tl-steamdummy() {
 	pkgdesc="Dummy package to satisfy a req for steam"
 	provides=(steam)
 }
-
-package_tl-quiet-printk() {
-	pkgdesc="Configure printk to hide non-critical errors from the console"
-
-	install -Dm644 tl-quiet-printk.conf \
-			${pkgdir}/usr/lib/sysctl.d/20-tl-quiet-printk.conf
-}
-
-package_tl-repos() {
-	pkgdesc="Add Thurstylark's private pacman repos"
-	install="tl-repos.install"
-
-	install -Dm644 tl-repos.conf \
-		"${pkgdir}/etc/pacman.d/tl/tl-repos.conf"
-
-	install -Dm644 tl-repo-local.conf \
-		"${pkgdir}/etc/pacman.d/tl/local.conf"
-
-	install -Dm644 tl-repo-remote.conf \
-		"${pkgdir}/etc/pacman.d/tl/remote.conf"
-}

tl-pacdiff.hook

@@ -5,6 +5,6 @@ Operation = Remove
 Type = Package
 Target = *
 [Action]
-Description = The following .pacnews were found by pacdiff:
+Description = The following pacdiffs were found:
 When = PostTransaction
 Exec = /usr/bin/pacdiff -o

tl-quiet-printk.conf

@@ -1 +0,0 @@
-kernel.printk = 3 3 3 3

tl-repo-local.conf

@@ -1,6 +0,0 @@
-Usage = All
-SigLevel = PackageOptional
-SigLevel = PackageTrustAll
-SigLevel = DatabaseOptional
-SigLevel = DatabaseTrustAll
-Server = file:///var/cache/pacman/$repo

tl-repo-remote.conf

@@ -1,6 +0,0 @@
-Usage = All
-SigLevel = PackageOptional
-SigLevel = PackageTrustAll
-SigLevel = DatabaseOptional
-SigLevel = DatabaseTrustAll
-Server = http://aur.h.thurstylark.com/$repo

tl-repos.conf

@@ -1,5 +0,0 @@
-[aurto]
-Include = /etc/pacman.d/tl/remote.conf
-
-[tl]
-Include = /etc/pacman.d/tl/remote.conf

tl-repos.install

@@ -1,9 +0,0 @@
-post_install() {
-	# Add the new config to pacman.conf
-	echo -n "Include = /etc/pacman.d/tl/tl-repos.conf" >> /etc/pacman.conf
-}
-
-post_remove() {
-	# Remove the config line from pacman.conf
-	sed -i '/^Include = \/etc\/pacman.d\/tl\/tl-repos.conf$/d' /etc/pacman.conf
-}