From 048f14f04b25d78905c2c4080ab41c696bcd512f Mon Sep 17 00:00:00 2001
From: James Bunton <jbunton@atlassian.com>
Date: Sun, 3 Apr 2022 22:22:12 +1000
Subject: [PATCH] Reorganise

---
 arch/base                     | 66 +++++++++++++++++++++++++----------
 arch/base-devel               |  4 +--
 arch/base-hw                  | 15 ++++++++
 arch/base-network             | 13 -------
 arch/base-tools               | 29 ---------------
 arch/desktop-audio            |  8 -----
 arch/desktop-base             | 22 ++++++++++++
 arch/desktop-fonts            |  4 ---
 arch/desktop-gnome            |  3 ++
 arch/desktop-gnome-extensions |  3 --
 arch/desktop-wallpapers       |  3 --
 arch/filesystems              |  1 +
 12 files changed, 90 insertions(+), 81 deletions(-)
 create mode 100644 arch/base-hw
 delete mode 100644 arch/base-network
 delete mode 100644 arch/base-tools
 delete mode 100644 arch/desktop-audio
 delete mode 100644 arch/desktop-fonts
 delete mode 100644 arch/desktop-gnome-extensions
 delete mode 100644 arch/desktop-wallpapers

diff --git a/arch/base b/arch/base
index f47d40e..53c039b 100644
--- a/arch/base
+++ b/arch/base
@@ -1,44 +1,74 @@
+# My base
 base
 bash
-bzip2
+bash-completion
+busybox
 coreutils
 cronie
-e2fsprogs
-fakeroot
+diffutils
+fdupes
 file
-filesystem
 findutils
 gawk
-gettext
-glibc
+git
 grep
-gzip
-iproute2
+hexedit
+jq
 less
-licenses
-lm_sensors
 logrotate
+lsof
+m4
+make
 man-db
 man-pages
 mlocate
+moreutils
+nodejs
 openssh
 pacman
 pacman-contrib
-pciutils
+patch
 perl
 procps-ng
 psmisc
+pv
 python
+python-virtualenv
+renameutils
+ripgrep
 rsync
+screen
 sed
-shadow
+sqlite
+strace
 sudo
-sysfsutils
-systemd-sysvcompat
-tar
-unzip
-usbutils
-util-linux
 vim
 which
+yq
+
+# Compression
+bzip2
+cpio
+gzip
+p7zip
+tar
+unrar
+unzip
+xz
 zip
+
+# Network
+curl
+dog
+fping
+iftop
+iperf3
+iproute2
+iputils
+mtr
+nmap
+openbsd-netcat
+speedtest-cli
+tcpdump
+wget
+whois
diff --git a/arch/base-devel b/arch/base-devel
index 6643fc1..fbf90cc 100644
--- a/arch/base-devel
+++ b/arch/base-devel
@@ -2,13 +2,11 @@ autoconf
 automake
 bison
 cmake
+fakeroot
 flex
 gcc
 gcc-libs
 gdb
 intltool
 libtool
-m4
-make
-patch
 pkgconf
diff --git a/arch/base-hw b/arch/base-hw
new file mode 100644
index 0000000..ae1c443
--- /dev/null
+++ b/arch/base-hw
@@ -0,0 +1,15 @@
+atop
+ddrescue
+dmidecode
+ethtool
+fwupd
+gptfdisk
+hdparm
+iotop
+lm_sensors
+lshw
+pciutils
+smartmontools
+sysfsutils
+sysstat
+usbutils
diff --git a/arch/base-network b/arch/base-network
deleted file mode 100644
index 808cff0..0000000
--- a/arch/base-network
+++ /dev/null
@@ -1,13 +0,0 @@
-curl
-dog
-ethtool
-fping
-iftop
-iperf3
-iputils
-mtr
-nmap
-openbsd-netcat
-tcpdump
-wget
-whois
diff --git a/arch/base-tools b/arch/base-tools
deleted file mode 100644
index 5a07f2f..0000000
--- a/arch/base-tools
+++ /dev/null
@@ -1,29 +0,0 @@
-atop
-bash-completion
-cpio
-ddrescue
-diffutils
-dmidecode
-fdupes
-git
-gptfdisk
-hdparm
-hexedit
-iotop
-jq
-lshw
-lsof
-moreutils
-p7zip
-pv
-python-virtualenv
-renameutils
-ripgrep
-screen
-smartmontools
-sqlite
-strace
-sysstat
-unrar
-xz
-yq
diff --git a/arch/desktop-audio b/arch/desktop-audio
deleted file mode 100644
index e994c97..0000000
--- a/arch/desktop-audio
+++ /dev/null
@@ -1,8 +0,0 @@
-alsa-firmware
-alsa-lib
-alsa-plugins
-alsa-utils
-pavucontrol
-pipewire-alsa
-pipewire-pulse
-wireplumber
diff --git a/arch/desktop-base b/arch/desktop-base
index 37fd957..af9737c 100644
--- a/arch/desktop-base
+++ b/arch/desktop-base
@@ -1,5 +1,27 @@
+# Desktop base
 d-feet
 dconf-editor
 flatpak
 gcolor2
 zenity
+
+# Audio
+alsa-firmware
+alsa-lib
+alsa-plugins
+alsa-utils
+pavucontrol
+pipewire-alsa
+pipewire-pulse
+wireplumber
+
+# Fonts
+ttf-dejavu
+ttf-liberation
+ttf-ms-win10
+ttf-ubuntu-font-family
+
+# Wallpapers
+deepin-wallpapers
+gnome-backgrounds
+mate-backgrounds
diff --git a/arch/desktop-fonts b/arch/desktop-fonts
deleted file mode 100644
index 5569500..0000000
--- a/arch/desktop-fonts
+++ /dev/null
@@ -1,4 +0,0 @@
-ttf-dejavu
-ttf-liberation
-ttf-ms-win10
-ttf-ubuntu-font-family
diff --git a/arch/desktop-gnome b/arch/desktop-gnome
index ccb1e89..4034e6d 100644
--- a/arch/desktop-gnome
+++ b/arch/desktop-gnome
@@ -17,6 +17,8 @@ gnome-screenshot
 gnome-session
 gnome-settings-daemon
 gnome-shell
+gnome-shell-extension-appindicator
+gnome-shell-extensions
 gnome-sound-recorder
 gnome-system-monitor
 gnome-terminal
@@ -26,6 +28,7 @@ gvfs-afc
 gvfs-gphoto2
 gvfs-mtp
 gvfs-smb
+libappindicator-gtk3
 mutter
 nautilus
 seahorse
diff --git a/arch/desktop-gnome-extensions b/arch/desktop-gnome-extensions
deleted file mode 100644
index a14958f..0000000
--- a/arch/desktop-gnome-extensions
+++ /dev/null
@@ -1,3 +0,0 @@
-gnome-shell-extensions
-gnome-shell-extension-appindicator
-libappindicator-gtk3
diff --git a/arch/desktop-wallpapers b/arch/desktop-wallpapers
deleted file mode 100644
index 5d2a89e..0000000
--- a/arch/desktop-wallpapers
+++ /dev/null
@@ -1,3 +0,0 @@
-deepin-wallpapers
-gnome-backgrounds
-mate-backgrounds
diff --git a/arch/filesystems b/arch/filesystems
index f9469d9..fcf5989 100644
--- a/arch/filesystems
+++ b/arch/filesystems
@@ -1,5 +1,6 @@
 btrfs-progs
 dosfstools
+e2fsprogs
 exfat-utils
 ntfs-3g
 xfsprogs
-- 
2.39.2