tidy

2 files changed, 31 insertions, 49 deletions

diff --git a/config-winston-network.PKGBUILD b/config-winston-base.PKGBUILD
index 6da7147..a8beb86 100644
--- a/config-winston-network.PKGBUILD
+++ b/config-winston-base.PKGBUILD
@@ -2,12 +2,41 @@ pkgver=1
 pkgrel=1
 arch=(any)
 
-pkgname=config-winston-network
-depends=(netctl)
+pkgname=config-winston-base
+depends=(linux-libre-lts grub haveged irqbalance netctl)
+conflicts=(linux-libre)
 
 package() {
 cd "$pkgdir"
 
+## Base setup ##
+
+install -Dm644 /dev/stdin etc/hostname <<EOF
+winston.parabola.nu
+EOF
+
+install -Dm644 /dev/stdin etc/machine-info <<EOF
+LOCATION=1984 Hosting Company, Iceland
+EOF
+
+install -Dm644 /dev/stdin etc/vconsole.conf <<EOF
+KEYMAP=us
+CONSOLEMAP=8859-1
+FONT_MAP=8859-1_to_uni
+EOF
+
+install -Dm644 /dev/stdin 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
+
+## Networking ##
+
 # /etc/udev/rules.d/80-net-setup-link.rules is a symlink to /dev/null,
 # which disables new-style [predictable network interface names][0]
 # (enp0s3? ens3?), and causes it to fall back to the old-style names
diff --git a/config-winston-base.PKGBUILD.sh b/config-winston-base.PKGBUILD.sh
deleted file mode 100644
index 1911902..0000000
--- a/config-winston-base.PKGBUILD.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-pkgver=1
-pkgrel=1
-arch=(any)
-install=${BUILDFILE#${PWD}/}
-
-pkgname=config-winston-base
-depends=(linux-libre-lts haveged irqbalance)
-conflicts=(linux-libre)
-
-package() {
-cd "$pkgdir"
-
-install -Dm644 /dev/stdin etc/hostname <<EOF
-winston.parabola.nu
-EOF
-
-install -Dm644 /dev/stdin etc/machine-info <<EOF
-LOCATION=1984 Hosting Company, Iceland
-EOF
-
-install -Dm644 /dev/stdin etc/vconsole.conf <<EOF
-KEYMAP=us
-CONSOLEMAP=8859-1
-FONT_MAP=8859-1_to_uni
-EOF
-
-install -Dm644 /dev/stdin 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
-
-}
-
-post_install() {
-	sed -i 's/^#(en_US\.UTF-8)/\1/' etc/locale.gen
-	locale-gen
-}
-
-pre_remove() {
-	sed -i 's/^[^#]/#&/' etc/locale.gen
-	locale-gen
-}