1 files changed, 10 insertions, 23 deletions
diff --git a/config-winston-base.PKGBUILD b/config-winston-base.PKGBUILD
index a8beb86..73f57f1 100644
--- a/config-winston-base.PKGBUILD
+++ b/config-winston-base.PKGBUILD
@@ -1,8 +1,6 @@
-pkgver=1
-pkgrel=1
-arch=(any)
+. ${BUILDFILE%/*}/common.sh
+pkgver=20160712.1
 
-pkgname=config-winston-base
 depends=(linux-libre-lts grub haveged irqbalance netctl)
 conflicts=(linux-libre)
 
@@ -11,29 +9,28 @@ cd "$pkgdir"
 
 ## Base setup ##
 
-install -Dm644 /dev/stdin etc/hostname <<EOF
+add-file etc/hostname <<EOF
 winston.parabola.nu
 EOF
 
-install -Dm644 /dev/stdin etc/machine-info <<EOF
+add-file etc/machine-info <<EOF
 LOCATION=1984 Hosting Company, Iceland
 EOF
 
-install -Dm644 /dev/stdin etc/vconsole.conf <<EOF
+add-file etc/vconsole.conf <<EOF
 KEYMAP=us
 CONSOLEMAP=8859-1
 FONT_MAP=8859-1_to_uni
 EOF
 
-install -Dm644 /dev/stdin etc/locale.conf <<EOF
+add-file etc/locale.conf <<EOF
 LANG=en_US.UTF-8
 LC_COLLATE=C
 EOF
 
-install -dm755 etc/systemd/system/multi-user.target.wants
-ln -s /usr/lib/systemd/system/getty@.service     etc/systemd/system/multi-user.target.wants/getty@tty1.service
-ln -s /usr/lib/systemd/system/haveged.service    etc/systemd/system/multi-user.target.wants/haveged.service
-ln -s /usr/lib/systemd/system/irqbalance.service etc/systemd/system/multi-user.target.wants/irqbalance.service
+add-unit etc/systemd/system/multi-user.target.wants/getty@tty1.service
+add-unit etc/systemd/system/multi-user.target.wants/haveged.service
+add-unit etc/systemd/system/multi-user.target.wants/irqbalance.service
 
 ## Networking ##
 
@@ -58,16 +55,6 @@ Gateway='93.95.226.129'
 DNS=('93.95.224.28' '93.95.224.29')
 EOF
 
-# This is just `netctl enable eth0-static`
-install -Dm644 /dev/stdin 'etc/systemd/system/netctl@eth0\x2dstatic.service' <<EOF
-.include /usr/lib/systemd/system/netctl@.service
-
-[Unit]
-Description=A basic static ethernet connection
-BindsTo=sys-subsystem-net-devices-eth0.device
-After=sys-subsystem-net-devices-eth0.device
-EOF
-install -dm755 etc/systemd/system/multi-user.target.wants
-ln -s 'etc/systemd/system/netctl@eth0\x2dstatic.service' 'etc/systemd/system/multi-user.target.wants/netctl@eth0\x2dstatic.service'
+netctl-enable eth0-static
 
 }