From: James Bunton <jamesbunton@delx.net.au>
Date: Sun, 31 Jul 2016 00:56:19 +0000 (+1000)
Subject: Split repository, only keep scripts
X-Git-Url: https://code.delx.au/monosys/commitdiff_plain/468b442da9caba54b39054ac0cf6d33a2f1234d0

Split repository, only keep scripts
---

diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index a064003..0000000
--- a/.hgignore
+++ /dev/null
@@ -1,4 +0,0 @@
-syntax: glob
-# ignore python byte compiled files
-*.py[oc]
-
diff --git a/scripts/Makefile b/Makefile
similarity index 100%
rename from scripts/Makefile
rename to Makefile
diff --git a/scripts/apple-time-machine-symlink.py b/apple-time-machine-symlink.py
similarity index 100%
rename from scripts/apple-time-machine-symlink.py
rename to apple-time-machine-symlink.py
diff --git a/scripts/aptorphan b/aptorphan
similarity index 100%
rename from scripts/aptorphan
rename to aptorphan
diff --git a/backup/backup-all b/backup/backup-all
deleted file mode 100755
index f11cf93..0000000
--- a/backup/backup-all
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-for script in /backup/scripts/*; do
-    if ! grep -q '^function run_backup' "$script"; then
-        continue
-    fi
-    if [ ! -x "$script" ]; then
-        echo "Skipping $script because it is not executable"
-        continue
-    fi
-    output="$("$script" 2>&1)"
-    if [ "$?" -ne 0 ]; then
-        echo "Failed to run: $script"
-        echo "$output"
-    fi
-done
-
diff --git a/backup/common b/backup/common
deleted file mode 100644
index ef5972c..0000000
--- a/backup/common
+++ /dev/null
@@ -1,18 +0,0 @@
-#! bash
-
-set -e
-ionice -c 3 -p $$
-renice -n 19 -p $$ > /dev/null
-
-script="$(basename "${BASH_SOURCE[1]}" .sh)"
-
-(
-if ! flock -n -x 200; then
-    echo "Failed to get a lock!"
-    exit 1
-fi
-
-run_backup
-
-) 200>"/run/lock/backup-${script}"
-
diff --git a/backup/etc-cron.d-backup b/backup/etc-cron.d-backup
deleted file mode 100644
index 61838a6..0000000
--- a/backup/etc-cron.d-backup
+++ /dev/null
@@ -1,6 +0,0 @@
-SHELL=/bin/bash
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-MAILTO=root
-
-# m    h  dom mon dow   user    command
-  0    2   *   *   *    root    /backup/scripts/backup-all
diff --git a/backup/template-rdiff-backup b/backup/template-rdiff-backup
deleted file mode 100755
index 1073912..0000000
--- a/backup/template-rdiff-backup
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-function run_backup {
-    rdiff-backup \
-        --preserve-numerical-ids \
-        --exclude-sockets \
-        --exclude '/home/*/tmp' \
-        --include '/home' \
-        --exclude '/var/cache' \
-        --exclude '/var/log' \
-        --exclude '/var/tmp' \
-        --exclude '/tmp' \
-        --include '/var' \
-        --include '/boot' \
-        --exclude-other-filesystems \
-        my-host.example.com::/ /backup/my-host
-
-    rdiff-backup -v1 --force --remove-older-than 365D /backup/my-host
-}
-
-. /backup/scripts/common
-
diff --git a/backup/template-rsync b/backup/template-rsync
deleted file mode 100755
index 6ba2077..0000000
--- a/backup/template-rsync
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-function run_backup {
-    rsync -a --numeric-ids --delete my-host.example.com:/backup/my-host/ /backup/my-host/
-}
-
-. /backup/scripts/common
-
diff --git a/scripts/banshee-reset-sync b/banshee-reset-sync
similarity index 100%
rename from scripts/banshee-reset-sync
rename to banshee-reset-sync
diff --git a/scripts/bashttpd b/bashttpd
similarity index 100%
rename from scripts/bashttpd
rename to bashttpd
diff --git a/bin b/bin
deleted file mode 120000
index 528dc4e..0000000
--- a/bin
+++ /dev/null
@@ -1 +0,0 @@
-scripts
\ No newline at end of file
diff --git a/scripts/bt-dun-connect b/bt-dun-connect
similarity index 100%
rename from scripts/bt-dun-connect
rename to bt-dun-connect
diff --git a/scripts/checkspace b/checkspace
similarity index 100%
rename from scripts/checkspace
rename to checkspace
diff --git a/scripts/dnsctl b/dnsctl
similarity index 100%
rename from scripts/dnsctl
rename to dnsctl
diff --git a/etc/NetworkManager/dispatcher.d/drop-wifi-on-ethernet b/etc/NetworkManager/dispatcher.d/drop-wifi-on-ethernet
deleted file mode 100755
index 06ed1b2..0000000
--- a/etc/NetworkManager/dispatcher.d/drop-wifi-on-ethernet
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-iface="$1"
-action="$2"
-
-if [ "$iface" = "ethernet" -a "$action" = "up" ]; then
-    nmcli radio wifi off
-fi
-
-if [ "$iface" = "ethernet" -a "$action" = "down" ]; then
-    nmcli radio wifi on
-fi
-
diff --git a/etc/modprobe.d/apple-keyboard.conf b/etc/modprobe.d/apple-keyboard.conf
deleted file mode 100644
index 3fe75a7..0000000
--- a/etc/modprobe.d/apple-keyboard.conf
+++ /dev/null
@@ -1 +0,0 @@
-options hid_apple fnmode=2 swap_opt_cmd=1
diff --git a/etc/modprobe.d/audio-powersave.conf b/etc/modprobe.d/audio-powersave.conf
deleted file mode 100644
index e49bd75..0000000
--- a/etc/modprobe.d/audio-powersave.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-options snd_hda_intel power_save=1
-options snd_ac97_codec power_save=1
diff --git a/etc/modprobe.d/blacklist-pcspkr.conf b/etc/modprobe.d/blacklist-pcspkr.conf
deleted file mode 100644
index b46792e..0000000
--- a/etc/modprobe.d/blacklist-pcspkr.conf
+++ /dev/null
@@ -1 +0,0 @@
-blacklist pcspkr
diff --git a/etc/smartd.conf b/etc/smartd.conf
deleted file mode 100644
index 7b3e20a..0000000
--- a/etc/smartd.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# /etc/smartd.conf
-# See the manual for smartd.conf
-# 1) Scan for all devices (DEVICESCAN)
-# 2) Check the SMART health status (-H)
-# 3) Report increases in SMART error logs (-l)
-# 4) Check for failure of any Usage Attributes (-f)
-# 5) Run an Offline Immediate Test every six hours (O/../.././(00|06|12|18))
-# 6) Run a Short Self-Test every day at 0100 (S/../.././01)
-# 7) Run a Long Self-Test every Saturday at 0300 (L/../../6/03)
-# 8) Report any output by running scripts in /etc/smartmontools/run.d
-
-DEVICESCAN -H -l error -l selftest -f -s (O/../.././(00|06|12|18)|S/../.././01|L/../../6/03) -m root -M exec /usr/share/smartmontools/smartd-runner
-
diff --git a/etc/sudoers.d/10_env_keep b/etc/sudoers.d/10_env_keep
deleted file mode 100644
index 7374eac..0000000
--- a/etc/sudoers.d/10_env_keep
+++ /dev/null
@@ -1,7 +0,0 @@
-Defaults umask=0022
-Defaults umask_override
-
-Defaults env_keep += "LANG LANGUAGE LINGUAS LC_* _XKB_CHARSET"
-Defaults env_keep += "HOME"
-Defaults env_keep += "COLORFGBG"
-Defaults env_keep += "EDITOR"
diff --git a/etc/sudoers.d/20_sudo_group b/etc/sudoers.d/20_sudo_group
deleted file mode 100644
index 5e3c1bb..0000000
--- a/etc/sudoers.d/20_sudo_group
+++ /dev/null
@@ -1 +0,0 @@
-%sudo ALL=(ALL) ALL
diff --git a/etc/sudoers.d/30_aptitude b/etc/sudoers.d/30_aptitude
deleted file mode 100644
index 6390ee8..0000000
--- a/etc/sudoers.d/30_aptitude
+++ /dev/null
@@ -1 +0,0 @@
-%sudo ALL = NOPASSWD: /usr/bin/aptitude update, /usr/bin/aptitude full-upgrade
diff --git a/etc/sudoers.d/30_pacman b/etc/sudoers.d/30_pacman
deleted file mode 100644
index 7d0460c..0000000
--- a/etc/sudoers.d/30_pacman
+++ /dev/null
@@ -1 +0,0 @@
-%sudo ALL = NOPASSWD: /usr/bin/pacman -Syu
diff --git a/etc/sysctl.d/ipv6-tempaddr.conf b/etc/sysctl.d/ipv6-tempaddr.conf
deleted file mode 100644
index 8934be2..0000000
--- a/etc/sysctl.d/ipv6-tempaddr.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-net.ipv6.conf.all.use_tempaddr = 2
-net.ipv6.conf.default.use_tempaddr = 2
diff --git a/etc/sysctl.d/powersave.conf b/etc/sysctl.d/powersave.conf
deleted file mode 100644
index 1949f87..0000000
--- a/etc/sysctl.d/powersave.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-kernel.nmi_watchdog = 0
-vm.dirty_writeback_centisecs = 6000
-vm.laptop_mode = 5
diff --git a/etc/systemd/system/disable-crypto_keyfile@.service b/etc/systemd/system/disable-crypto_keyfile@.service
deleted file mode 100644
index 19dd58f..0000000
--- a/etc/systemd/system/disable-crypto_keyfile@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Disable /crypto_keyfile.bin on every boot
-After=basic.target
-
-[Service]
-Type=oneshot
-ExecStart=/bin/cryptsetup luksRemoveKey /dev/disk/by-uuid/%i /crypto_keyfile.bin --key-slot 7
-SuccessExitStatus=2
-
-[Install]
-WantedBy=basic.target
diff --git a/etc/systemd/system/pulseaudio.service b/etc/systemd/system/pulseaudio.service
deleted file mode 100644
index 4c0aa54..0000000
--- a/etc/systemd/system/pulseaudio.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=pulseaudio service
-Requires=bluetooth.target
-
-[Service]
-User=pulse
-ExecStart=/usr/bin/pulseaudio -v
-Restart=always
-LimitRTPRIO=65
-LimitNICE=-10
-LimitMEMLOCK=40000
-
-[Install]
-WantedBy=multi-user.target
diff --git a/etc/systemd/system/user-hook-sleep.service b/etc/systemd/system/user-hook-sleep.service
deleted file mode 100644
index 4411c46..0000000
--- a/etc/systemd/system/user-hook-sleep.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=User hook for sleep action
-Before=sleep.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/local/bin/xuserrun bash -c '. ~/.bashrc && ~/.hooks/sleep'
-
-[Install]
-WantedBy=sleep.target
diff --git a/etc/udev/rules.d/10-bluetooth.rules b/etc/udev/rules.d/10-bluetooth.rules
deleted file mode 100644
index 22e0acb..0000000
--- a/etc/udev/rules.d/10-bluetooth.rules
+++ /dev/null
@@ -1 +0,0 @@
-ACTION=="add", KERNEL=="hci0", RUN+="/usr/bin/hciconfig hci0 down; /usr/bin/hciconfig hci0 up"
diff --git a/etc/udev/rules.d/10-monitor.rules b/etc/udev/rules.d/10-monitor.rules
deleted file mode 100644
index c7e8747..0000000
--- a/etc/udev/rules.d/10-monitor.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="card0", SUBSYSTEM=="drm" RUN+="/usr/local/bin/xuserrun bash -c '. ~/.bashrc && ~/.hooks/monitor'"
diff --git a/etc/udev/rules.d/10-network.rules b/etc/udev/rules.d/10-network.rules
deleted file mode 100644
index 07d5859..0000000
--- a/etc/udev/rules.d/10-network.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="00:00:00:00:00:00", NAME="ethernet"
-SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="00:00:00:00:00:00", NAME="wifi"
diff --git a/etc/udev/rules.d/10-powersave.rules b/etc/udev/rules.d/10-powersave.rules
deleted file mode 100644
index 17b7fc2..0000000
--- a/etc/udev/rules.d/10-powersave.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-# PCI Runtime Power Management
-ACTION=="add", SUBSYSTEM=="pci", ATTR{power/control}="auto"
-
-# SATA Active Link Power Management
-ACTION=="add", SUBSYSTEM=="scsi_host", KERNEL=="host*", ATTR{link_power_management_policy}="min_power"
diff --git a/etc/udev/rules.d/51-flirc.rules b/etc/udev/rules.d/51-flirc.rules
deleted file mode 100644
index 994ba61..0000000
--- a/etc/udev/rules.d/51-flirc.rules
+++ /dev/null
@@ -1,4 +0,0 @@
-# Flirc USB User-Mode Driver
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="20a0", ATTR{idProduct}=="0000", MODE="0666"
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="20a0", ATTR{idProduct}=="0001", MODE="0666"
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="20a0", ATTR{idProduct}=="0002", MODE="0666"
diff --git a/scripts/find-services-to-restart b/find-services-to-restart
similarity index 100%
rename from scripts/find-services-to-restart
rename to find-services-to-restart
diff --git a/scripts/java-decompile-recursive b/java-decompile-recursive
similarity index 100%
rename from scripts/java-decompile-recursive
rename to java-decompile-recursive
diff --git a/scripts/magnet b/magnet
similarity index 100%
rename from scripts/magnet
rename to magnet
diff --git a/scripts/make-persistent-journal b/make-persistent-journal
similarity index 100%
rename from scripts/make-persistent-journal
rename to make-persistent-journal
diff --git a/mediapc-utils/disable-screen-blank.desktop b/mediapc-utils/disable-screen-blank.desktop
deleted file mode 100644
index 6805d80..0000000
--- a/mediapc-utils/disable-screen-blank.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=Disable screen blanking
-Comment=
-Exec=/bin/sh -c 'xset -dpms; xset s off'
-StartupNotify=false
-Terminal=false
-Hidden=false
-
diff --git a/mediapc-utils/ffclicker b/mediapc-utils/ffclicker
deleted file mode 100755
index 46eab35..0000000
--- a/mediapc-utils/ffclicker
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/python3
-
-import cherrypy
-import os
-import sys
-import webbrowser
-
-class Listener(object):
-    @cherrypy.expose
-    def firefox(self, url):
-        print("Loading:", url)
-        webbrowser.open(url)
-        raise cherrypy.HTTPRedirect(url, status=303)
-
-def do_fork():
-    pid = os.fork()
-    if pid < 0:
-        print("Unable to fork!", file=sys.stderr)
-        sys.exit(1)
-    if pid != 0:
-        sys.exit(0)
-
-def main(fork):
-    if fork:
-        do_fork()
-    cherrypy.tree.mount(Listener())
-    cherrypy.server.socket_host = "0.0.0.0"
-    cherrypy.server.socket_port = 8080
-    cherrypy.engine.start()
-
-if __name__ == "__main__":
-    fork = False
-    if len(sys.argv) != 1:
-        if sys.argv[1] == "--fork":
-            fork = True
-        else:
-            print("Usage: %s [--fork]" % sys.argv[0], file=sys.stderr)
-            sys.exit(1)
-    main(fork)
-
diff --git a/mediapc-utils/focus-desktop.desktop b/mediapc-utils/focus-desktop.desktop
deleted file mode 100644
index f2cb8f6..0000000
--- a/mediapc-utils/focus-desktop.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=Focus the desktop
-Comment=
-Exec=/bin/sh -c 'sleep 30; xdotool click 1'
-StartupNotify=false
-Terminal=false
-Hidden=false
-
diff --git a/mediapc-utils/gen-new-list b/mediapc-utils/gen-new-list
deleted file mode 100755
index 9c072e7..0000000
--- a/mediapc-utils/gen-new-list
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ -z "$1" ]; then
-    echo "Usage: $0 /path/to/videos [new-link-dir] [num_days]"
-    exit 1
-fi
-
-watch_dir="$1"
-new_link_dir="${2:-${watch_dir}/-NEW-}"
-num_days="${3:-14}"
-
-find "$watch_dir/-NEW-" -type l -delete
-
-find "$watch_dir" -type f -mtime "-${num_days}" |
-    while read line; do
-        if basename "$line" | grep -q '^\.'; then
-            continue
-        fi
-        linkname="$(echo "$line" | sed -e "s|$watch_dir/||" -e "s|/| - |g")"
-        ln -s "$line" "$watch_dir/-NEW-/$linkname"
-    done
-
diff --git a/mediapc-utils/mediawrap b/mediapc-utils/mediawrap
deleted file mode 100755
index 312072a..0000000
--- a/mediapc-utils/mediawrap
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-LOCKFILE="$HOME/.mediawrap.lock"
-
-(
-if ! flock -w 10 -x 200; then
-    echo "Failed to get a lock!"
-    exit 1
-fi
-
-# Run the program
-"$@" &> /dev/null
-
-
-) 200>"$LOCKFILE"
-
-# Cleanup so other programs can start
-rm -f "$LOCKFILE"
-
diff --git a/mediapc-utils/monitor-dir b/mediapc-utils/monitor-dir
deleted file mode 100755
index baf02e4..0000000
--- a/mediapc-utils/monitor-dir
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash -e
-
-# Use with crontab entry like:
-#   */5 *   *   *   *     $HOME/bin/monitor-dir /path/to/something
-
-if [ -z "$1" ]; then
-    echo "Usage $0 dir [monitor_file] [ls]"
-    exit 1
-fi
-mon="${2:-$1/.monitor_dir}"
-mon_tmp="${mon}_tmp"
-
-${3:-ls} "$1" > "$mon_tmp"
-if [ -r "$mon" ] && ! cmp -s "$mon" "$mon_tmp" && [ -n "$(ls "$1")" ]; then
-    comm -13 "$mon" "$mon_tmp"
-fi
-mv "$mon_tmp" "$mon"
-
diff --git a/mediapc-utils/mythsymlink b/mediapc-utils/mythsymlink
deleted file mode 100755
index a8391ac..0000000
--- a/mediapc-utils/mythsymlink
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/env python2
-
-import os
-import re
-import socket
-import sys
-
-import lxml.etree
-import MySQLdb
-
-os.chdir(sys.argv[1])
-
-# Remove any symlinks and empty dirs in the tree
-for dirpath, dirnames, filenames in os.walk(".", topdown=False):
-    for filename in filenames:
-        filename = os.path.join(dirpath, filename)
-        if os.path.islink(filename):
-            os.unlink(filename)
-    for dirname in dirnames:
-        dirname = os.path.join(dirpath, dirname)
-        os.rmdir(dirname)
-
-# Connect to the MythTV database based on the MythTV config
-with open(os.path.expanduser("~/.mythtv/config.xml")) as f:
-    config_xml = lxml.etree.parse(f, lxml.etree.XMLParser(encoding="utf-8"))
-
-db_connection = MySQLdb.connect(
-    host = config_xml.xpath("/Configuration/Database/Host/text()")[0],
-    port = int(config_xml.xpath("/Configuration/Database/Port/text()")[0]),
-    user = config_xml.xpath("/Configuration/Database/UserName/text()")[0],
-    passwd = config_xml.xpath("/Configuration/Database/Password/text()")[0],
-    db = config_xml.xpath("/Configuration/Database/DatabaseName/text()")[0],
-)
-cursor = db_connection.cursor(MySQLdb.cursors.DictCursor)
-
-# Regexp for what is allowed in the symlink name
-unsafe = re.compile("[^a-zA-Z0-9\-_ ,\\.]+")
-
-try:
-    localhostname = config_xml.xpath("/Configuration/LocalHostName/text()")[0]
-except IndexError:
-    localhostname = socket.gethostname()
-
-# Find the recordings directory
-cursor.execute("""
-    SELECT * FROM settings
-    WHERE value='RecordFilePrefix' AND hostname='%s'
-""" % localhostname)
-recordingsdir = cursor.fetchone()["data"]
-
-# Now find all the recordings we have at the moment
-cursor.execute("""
-    SELECT title, subtitle, starttime, basename, watched FROM recorded
-""")
-for row in cursor:
-    title = row["title"]
-    starttime = str(row["starttime"]).replace(":", "-")
-    subtitle = row["subtitle"]
-    basename = row["basename"]
-    watched = bool(row["watched"])
-
-    title = unsafe.sub("", title)
-    subtitle = unsafe.sub("", subtitle)
-    extn = os.path.splitext(basename)[1]
-
-
-    if subtitle:
-        filename = "%s - %s%s" % (starttime, subtitle, extn)
-    else:
-        filename = "%s%s" % (starttime, extn)
-    if watched:
-        filename = "watched/" + filename
-
-    source = "%s/%s" % (recordingsdir, basename)
-    dest = "%s/%s" % (title, filename)
-
-    if not os.path.isfile(source):
-        continue
-
-    dirnames = dest.split("/")[:-1]
-    for i in xrange(1, len(dirnames)+1):
-        dirname = "/".join(dirnames[:i])
-        if not os.path.isdir(dirname):
-            os.mkdir(dirname)
-
-    os.symlink(source, dest)
-
diff --git a/scripts/multiboot-setup.sh b/multiboot-setup.sh
similarity index 100%
rename from scripts/multiboot-setup.sh
rename to multiboot-setup.sh
diff --git a/scripts/opal-card-tool b/opal-card-tool
similarity index 100%
rename from scripts/opal-card-tool
rename to opal-card-tool
diff --git a/package-lists/arch/base b/package-lists/arch/base
deleted file mode 100644
index 27d52c5..0000000
--- a/package-lists/arch/base
+++ /dev/null
@@ -1,46 +0,0 @@
-bash
-bzip2
-coreutils
-cronie
-cryptsetup
-device-mapper
-e2fsprogs
-fakeroot
-file
-filesystem
-findutils
-gawk
-gettext
-glibc
-grep
-gzip
-haveged
-iproute2
-less
-licenses
-lvm2
-man-db
-man-pages
-mlocate
-ntp
-openssh
-pacman
-pciutils
-perl
-procps-ng
-psmisc
-python
-rng-tools
-rsync
-sed
-shadow
-sudo
-sysfsutils
-systemd-sysvcompat
-tar
-unzip
-usbutils
-util-linux
-vim
-which
-zip
diff --git a/package-lists/arch/desktop-apps b/package-lists/arch/desktop-apps
deleted file mode 100644
index 35aab63..0000000
--- a/package-lists/arch/desktop-apps
+++ /dev/null
@@ -1,11 +0,0 @@
-firefox
-google-chrome
-
-libreoffice-still
-libreoffice-still-en-GB
-
-gnome-keyring
-seahorse
-
-xfce4-power-manager
-xscreensaver
diff --git a/package-lists/arch/desktop-audio b/package-lists/arch/desktop-audio
deleted file mode 100644
index 5fda06d..0000000
--- a/package-lists/arch/desktop-audio
+++ /dev/null
@@ -1,9 +0,0 @@
-alsa-firmware
-alsa-lib
-alsa-plugins
-alsa-utils
-espeak
-pavucontrol
-pulseaudio
-pulseaudio-alsa
-pulseaudio-gconf
diff --git a/package-lists/arch/desktop-fonts b/package-lists/arch/desktop-fonts
deleted file mode 100644
index faab1c2..0000000
--- a/package-lists/arch/desktop-fonts
+++ /dev/null
@@ -1,8 +0,0 @@
-adobe-source-code-pro-fonts
-adobe-source-sans-pro-fonts
-ttf-dejavu
-ttf-droid
-ttf-liberation
-ttf-inconsolata
-ttf-ubuntu-font-family
-ttf-win7-fonts
diff --git a/package-lists/arch/desktop-lightdm b/package-lists/arch/desktop-lightdm
deleted file mode 100644
index 5c087b8..0000000
--- a/package-lists/arch/desktop-lightdm
+++ /dev/null
@@ -1,2 +0,0 @@
-lightdm
-lightdm-gtk-greeter
diff --git a/package-lists/arch/desktop-printing b/package-lists/arch/desktop-printing
deleted file mode 100644
index d56529d..0000000
--- a/package-lists/arch/desktop-printing
+++ /dev/null
@@ -1,13 +0,0 @@
-cups
-ghostscript
-gsfonts
-avahi
-
-# drivers
-foomatic-db
-foomatic-db-engine
-foomatic-db-nonfree
-gutenprint
-hplip
-python2-pyqt4 # hplip
-splix
diff --git a/package-lists/arch/desktop-xfce b/package-lists/arch/desktop-xfce
deleted file mode 100644
index 30ab2f5..0000000
--- a/package-lists/arch/desktop-xfce
+++ /dev/null
@@ -1,34 +0,0 @@
-baobab
-cheese
-d-feet
-eog
-evince
-file-roller
-gcolor2
-gedit
-gnome-backgrounds
-gnome-font-viewer
-gnome-screenshot
-gnome-sound-recorder
-gnome-system-monitor
-gnome-themes-standard
-gtk-xfce-engine
-gvfs
-gvfs-mtp
-gvfs-smb
-notify-osd
-thunar
-thunar-volman
-tumbler
-xdotool
-xfce4-appfinder
-xfce4-datetime-plugin
-xfce4-genmon-plugin
-xfce4-panel
-xfce4-pulseaudio-plugin
-xfce4-session
-xfce4-settings
-xfce4-terminal
-xfdesktop
-xsel
-zenity
diff --git a/package-lists/arch/desktop-xfwm b/package-lists/arch/desktop-xfwm
deleted file mode 100644
index 7f7614a..0000000
--- a/package-lists/arch/desktop-xfwm
+++ /dev/null
@@ -1,2 +0,0 @@
-xfwm4
-xfwm4-themes
diff --git a/package-lists/arch/desktop-xmonad b/package-lists/arch/desktop-xmonad
deleted file mode 100644
index 4041ba2..0000000
--- a/package-lists/arch/desktop-xmonad
+++ /dev/null
@@ -1,5 +0,0 @@
-kupfer
-xcompmgr
-xmobar
-xmonad
-xmonad-contrib
diff --git a/package-lists/arch/desktop-xorg b/package-lists/arch/desktop-xorg
deleted file mode 100644
index cb69e2d..0000000
--- a/package-lists/arch/desktop-xorg
+++ /dev/null
@@ -1,70 +0,0 @@
-xf86-input-evdev
-xf86-input-joystick
-xf86-input-keyboard
-xf86-input-mouse
-xf86-input-synaptics
-xf86-input-vmmouse
-xf86-input-void
-xf86-video-ark
-xf86-video-ati
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-glint
-xf86-video-i128
-xf86-video-intel
-xf86-video-mach64
-xf86-video-neomagic
-xf86-video-nouveau
-xf86-video-nv
-xf86-video-openchrome
-xf86-video-r128
-xf86-video-savage
-xf86-video-siliconmotion
-xf86-video-sis
-xf86-video-tdfx
-xf86-video-trident
-xf86-video-vesa
-xf86-video-vmware
-xf86-video-voodoo
-xorg-bdftopcf
-xorg-docs
-xorg-font-util
-xorg-fonts-encodings
-xorg-iceauth
-xorg-luit
-xorg-mkfontdir
-xorg-mkfontscale
-xorg-server
-xorg-sessreg
-xorg-setxkbmap
-xorg-smproxy
-xorg-x11perf
-xorg-xauth
-xorg-xbacklight
-xorg-xcmsdb
-xorg-xcursorgen
-xorg-xdpyinfo
-xorg-xdriinfo
-xorg-xev
-xorg-xgamma
-xorg-xhost
-xorg-xinput
-xorg-xkbcomp
-xorg-xkbevd
-xorg-xkbutils
-xorg-xkill
-xorg-xlsatoms
-xorg-xlsclients
-xorg-xmodmap
-xorg-xpr
-xorg-xprop
-xorg-xrandr
-xorg-xrdb
-xorg-xrefresh
-xorg-xset
-xorg-xsetroot
-xorg-xvinfo
-xorg-xwd
-xorg-xwininfo
-xorg-xwud
-xterm
diff --git a/package-lists/arch/dev b/package-lists/arch/dev
deleted file mode 100644
index 2dfb400..0000000
--- a/package-lists/arch/dev
+++ /dev/null
@@ -1,19 +0,0 @@
-aspell-en
-autoconf
-automake
-bison
-clang
-cmake
-emacs
-flex
-gcc
-gcc-libs
-gdb
-hexedit
-intltool
-libtool
-m4
-make
-patch
-pkg-config
-yasm
diff --git a/package-lists/arch/filesystems b/package-lists/arch/filesystems
deleted file mode 100644
index 89a420f..0000000
--- a/package-lists/arch/filesystems
+++ /dev/null
@@ -1,6 +0,0 @@
-btrfs-progs
-cifs-utils
-dosfstools
-exfat-utils
-ntfs-3g
-xfsprogs
diff --git a/package-lists/arch/tools b/package-lists/arch/tools
deleted file mode 100644
index 310fe91..0000000
--- a/package-lists/arch/tools
+++ /dev/null
@@ -1,21 +0,0 @@
-atop
-bash-completion
-binutils
-cpio
-diffutils
-fdupes
-git
-gptfdisk
-jq
-lsof
-mercurial
-moreutils
-procmail
-pv
-python-virtualenv
-renameutils
-screen
-smartmontools
-srm
-strace
-xz
diff --git a/package-lists/arch/tools-multimedia b/package-lists/arch/tools-multimedia
deleted file mode 100644
index f2b62f5..0000000
--- a/package-lists/arch/tools-multimedia
+++ /dev/null
@@ -1,14 +0,0 @@
-exiv2
-ffmpeg
-gst-libav
-gst-plugins-bad
-gst-plugins-good
-gst-plugins-ugly
-handbrake-cli
-imagemagick
-livestreamer
-mkvtoolnix-cli
-mplayer
-mpv
-sox
-vlc
diff --git a/package-lists/arch/tools-network b/package-lists/arch/tools-network
deleted file mode 100644
index fdf71c0..0000000
--- a/package-lists/arch/tools-network
+++ /dev/null
@@ -1,16 +0,0 @@
-bind-tools
-curl
-elinks
-fping
-iftop
-inetutils
-iptraf-ng
-iputils
-mtr
-nmap
-openbsd-netcat
-tcpdump
-traceroute
-wget
-whois
-wol
diff --git a/package-lists/debian/apticron b/package-lists/debian/apticron
deleted file mode 100644
index 6d9c52c..0000000
--- a/package-lists/debian/apticron
+++ /dev/null
@@ -1,3 +0,0 @@
-apticron
-apt-listchanges
-ssmtp
diff --git a/package-lists/debian/base b/package-lists/debian/base
deleted file mode 100644
index 355e580..0000000
--- a/package-lists/debian/base
+++ /dev/null
@@ -1,43 +0,0 @@
-acl
-apt-utils
-aptitude
-ca-certificates
-cryptsetup
-dbus
-debian-keyring
-doc-debian
-e2fsprogs
-eject
-file
-info
-iproute2
-less
-locales
-logrotate
-lvm2
-makedev
-man-db
-manpages
-mktemp
-mlocate
-nano
-net-tools
-netbase
-ntp
-openssh-client
-openssh-server
-patch
-pciutils
-popularity-contest
-psmisc
-python3
-reportbug
-rsync
-ruby
-sudo
-time
-unzip
-usbutils
-vim
-whiptail
-zip
diff --git a/package-lists/debian/tools b/package-lists/debian/tools
deleted file mode 100644
index 2c8c2b1..0000000
--- a/package-lists/debian/tools
+++ /dev/null
@@ -1,21 +0,0 @@
-atop
-bash-completion
-binutils
-diffutils
-fdupes
-gdisk
-git
-jq
-lsof
-mercurial
-moreutils
-procmail
-pv
-renameutils
-screen
-secure-delete
-smartmontools
-strace
-uuid-runtime
-virtualenv
-xz-utils
diff --git a/package-lists/debian/tools-network b/package-lists/debian/tools-network
deleted file mode 100644
index 94a9038..0000000
--- a/package-lists/debian/tools-network
+++ /dev/null
@@ -1,16 +0,0 @@
-curl
-dnsutils
-elinks
-fping
-iftop
-iptraf
-iputils-ping
-mtr-tiny
-netcat-openbsd
-nmap
-tcpdump
-telnet
-traceroute
-wakeonlan
-wget
-whois
diff --git a/package-lists/ubuntu/apticron b/package-lists/ubuntu/apticron
deleted file mode 120000
index ffdef1a..0000000
--- a/package-lists/ubuntu/apticron
+++ /dev/null
@@ -1 +0,0 @@
-../debian/apticron
\ No newline at end of file
diff --git a/package-lists/ubuntu/base b/package-lists/ubuntu/base
deleted file mode 120000
index 1ce04d4..0000000
--- a/package-lists/ubuntu/base
+++ /dev/null
@@ -1 +0,0 @@
-../debian/base
\ No newline at end of file
diff --git a/package-lists/ubuntu/desktop-apps b/package-lists/ubuntu/desktop-apps
deleted file mode 100644
index cbf239b..0000000
--- a/package-lists/ubuntu/desktop-apps
+++ /dev/null
@@ -1,11 +0,0 @@
-firefox
-google-chrome-stable
-
-libreoffice
-libreoffice-l10n-en-gb
-
-gnome-keyring
-seahorse
-
-xfce4-power-manager
-xscreensaver
diff --git a/package-lists/ubuntu/desktop-audio b/package-lists/ubuntu/desktop-audio
deleted file mode 100644
index 40640d6..0000000
--- a/package-lists/ubuntu/desktop-audio
+++ /dev/null
@@ -1,8 +0,0 @@
-alsa-base
-alsa-utils
-espeak
-pavucontrol
-pulseaudio
-pulseaudio-module-gconf
-pulseaudio-module-x11
-pulseaudio-utils
diff --git a/package-lists/ubuntu/desktop-base b/package-lists/ubuntu/desktop-base
deleted file mode 100644
index c42822a..0000000
--- a/package-lists/ubuntu/desktop-base
+++ /dev/null
@@ -1,8 +0,0 @@
-accountsservice
-console-setup
-desktop-base
-language-pack-en
-language-pack-gnome-en
-policykit-1
-policykit-1-gnome
-software-properties-common
diff --git a/package-lists/ubuntu/desktop-fonts b/package-lists/ubuntu/desktop-fonts
deleted file mode 100644
index 2950b52..0000000
--- a/package-lists/ubuntu/desktop-fonts
+++ /dev/null
@@ -1,4 +0,0 @@
-ttf-dejavu
-ttf-liberation
-ttf-mscorefonts-installer
-ttf-ubuntu-font-family
diff --git a/package-lists/ubuntu/desktop-lightdm b/package-lists/ubuntu/desktop-lightdm
deleted file mode 100644
index 5c087b8..0000000
--- a/package-lists/ubuntu/desktop-lightdm
+++ /dev/null
@@ -1,2 +0,0 @@
-lightdm
-lightdm-gtk-greeter
diff --git a/package-lists/ubuntu/desktop-wallpapers b/package-lists/ubuntu/desktop-wallpapers
deleted file mode 100644
index b46b5c2..0000000
--- a/package-lists/ubuntu/desktop-wallpapers
+++ /dev/null
@@ -1,14 +0,0 @@
-ubuntu-wallpapers-karmic
-ubuntu-wallpapers-lucid
-ubuntu-wallpapers-maverick
-ubuntu-wallpapers-natty
-ubuntu-wallpapers-oneiric
-ubuntu-wallpapers-precise
-ubuntu-wallpapers-quantal
-ubuntu-wallpapers-raring
-ubuntu-wallpapers-saucy
-ubuntu-wallpapers-trusty
-ubuntu-wallpapers-utopic
-ubuntu-wallpapers-vivid
-ubuntu-wallpapers-wily
-ubuntu-wallpapers-xenial
diff --git a/package-lists/ubuntu/desktop-xfce b/package-lists/ubuntu/desktop-xfce
deleted file mode 100644
index 163d93d..0000000
--- a/package-lists/ubuntu/desktop-xfce
+++ /dev/null
@@ -1,40 +0,0 @@
-baobab
-cheese
-d-feet
-eog
-evince
-file-roller
-gcolor2
-gedit
-gnome-backgrounds
-gnome-font-viewer
-gnome-icon-theme
-gnome-icon-theme-extras
-gnome-icon-theme-symbolic
-gnome-screenshot
-gnome-sound-recorder
-gnome-system-monitor
-gnome-themes-standard
-gtk2-engines-pixbuf
-gtk2-engines-xfce
-gtk3-engines-xfce
-gvfs
-gvfs-backends
-gvfs-bin
-gvfs-fuse
-notify-osd
-thunar
-thunar-volman
-tumbler
-xdotool
-xfce4-appfinder
-xfce4-datetime-plugin
-xfce4-genmon-plugin
-xfce4-panel
-xfce4-pulseaudio-plugin
-xfce4-session
-xfce4-settings
-xfce4-terminal
-xfdesktop4
-xsel
-zenity
diff --git a/package-lists/ubuntu/desktop-xfwm b/package-lists/ubuntu/desktop-xfwm
deleted file mode 100644
index 7f7614a..0000000
--- a/package-lists/ubuntu/desktop-xfwm
+++ /dev/null
@@ -1,2 +0,0 @@
-xfwm4
-xfwm4-themes
diff --git a/package-lists/ubuntu/desktop-xorg b/package-lists/ubuntu/desktop-xorg
deleted file mode 100644
index 803b291..0000000
--- a/package-lists/ubuntu/desktop-xorg
+++ /dev/null
@@ -1,6 +0,0 @@
-x11-session-utils
-x11-xserver-utils
-xauth
-xserver-xorg
-xserver-xorg-video-all
-xterm
diff --git a/package-lists/ubuntu/filesystems b/package-lists/ubuntu/filesystems
deleted file mode 100644
index 26266e5..0000000
--- a/package-lists/ubuntu/filesystems
+++ /dev/null
@@ -1,7 +0,0 @@
-btrfs-tools
-cifs-utils
-dosfstools
-exfat-fuse
-exfat-utils
-ntfs-3g
-xfsprogs
diff --git a/package-lists/ubuntu/tools b/package-lists/ubuntu/tools
deleted file mode 120000
index 898718c..0000000
--- a/package-lists/ubuntu/tools
+++ /dev/null
@@ -1 +0,0 @@
-../debian/tools
\ No newline at end of file
diff --git a/package-lists/ubuntu/tools-dvd b/package-lists/ubuntu/tools-dvd
deleted file mode 100644
index 0badf37..0000000
--- a/package-lists/ubuntu/tools-dvd
+++ /dev/null
@@ -1,4 +0,0 @@
-dvdbackup
-gddrescue
-libdvdcss2
-regionset
diff --git a/package-lists/ubuntu/tools-multimedia b/package-lists/ubuntu/tools-multimedia
deleted file mode 100644
index 9ce2691..0000000
--- a/package-lists/ubuntu/tools-multimedia
+++ /dev/null
@@ -1,13 +0,0 @@
-exiv2
-ffmpeg
-gstreamer1.0-libav
-gstreamer1.0-plugins-bad
-gstreamer1.0-plugins-good
-gstreamer1.0-plugins-ugly
-handbrake-cli
-imagemagick
-livestreamer
-mkvtoolnix
-mpv
-sox
-vlc
diff --git a/package-lists/ubuntu/tools-network b/package-lists/ubuntu/tools-network
deleted file mode 120000
index 46d17a7..0000000
--- a/package-lists/ubuntu/tools-network
+++ /dev/null
@@ -1 +0,0 @@
-../debian/tools-network
\ No newline at end of file
diff --git a/scripts/pacorphan b/pacorphan
similarity index 100%
rename from scripts/pacorphan
rename to pacorphan
diff --git a/scripts/photocopy b/photocopy
similarity index 100%
rename from scripts/photocopy
rename to photocopy
diff --git a/scripts/pysendmail b/pysendmail
similarity index 100%
rename from scripts/pysendmail
rename to pysendmail
diff --git a/scripts/reboot-no-passphrase b/reboot-no-passphrase
similarity index 100%
rename from scripts/reboot-no-passphrase
rename to reboot-no-passphrase
diff --git a/scripts/rename-by-date b/rename-by-date
similarity index 100%
rename from scripts/rename-by-date
rename to rename-by-date
diff --git a/scripts/rsync-ssh-backup b/rsync-ssh-backup
similarity index 100%
rename from scripts/rsync-ssh-backup
rename to rsync-ssh-backup
diff --git a/scripts/scanimage-easy b/scanimage-easy
similarity index 100%
rename from scripts/scanimage-easy
rename to scanimage-easy
diff --git a/scripts/set-font-xfce4-terminal b/set-font-xfce4-terminal
similarity index 100%
rename from scripts/set-font-xfce4-terminal
rename to set-font-xfce4-terminal
diff --git a/scripts/shaper b/shaper
similarity index 100%
rename from scripts/shaper
rename to shaper
diff --git a/scripts/ssh-screen-wrapper b/ssh-screen-wrapper
similarity index 100%
rename from scripts/ssh-screen-wrapper
rename to ssh-screen-wrapper
diff --git a/scripts/sync-boot-mirror b/sync-boot-mirror
similarity index 100%
rename from scripts/sync-boot-mirror
rename to sync-boot-mirror
diff --git a/scripts/tcp-proxy b/tcp-proxy
similarity index 100%
rename from scripts/tcp-proxy
rename to tcp-proxy
diff --git a/scripts/usb-reset b/usb-reset
similarity index 100%
rename from scripts/usb-reset
rename to usb-reset
diff --git a/scripts/wifi-scan b/wifi-scan
similarity index 100%
rename from scripts/wifi-scan
rename to wifi-scan
diff --git a/scripts/xfce4-genmon-script.c b/xfce4-genmon-script.c
similarity index 100%
rename from scripts/xfce4-genmon-script.c
rename to xfce4-genmon-script.c
diff --git a/scripts/xuserrun b/xuserrun
similarity index 100%
rename from scripts/xuserrun
rename to xuserrun