programs: reorder package groups

hosts/common/programs/assorted.nix

@@ -3,15 +3,62 @@
 {
   sane.programs = {
     # PACKAGE SETS
-    consoleMediaUtils = {
+    sysadminUtils = {
       package = null;
       suggestedPrograms = [
-        "ffmpeg"
+        "btrfs-progs"
-        "imagemagick"
+        "cacert.unbundled"  # some services require unbundled /etc/ssl/certs
-        "sox"
+        "cryptsetup"
-        "yt-dlp"
+        "dig"
+        "efibootmgr"
+        "fatresize"
+        "fd"
+        "file"
+        "gawk"
+        "git"
+        "gptfdisk"
+        "hdparm"
+        "htop"
+        "iftop"
+        "inetutils"  # for telnet
+        "iotop"
+        "iptables"
+        "jq"
+        "killall"
+        "lsof"
+        "miniupnpc"
+        "nano"
+        "neovim"
+        "netcat"
+        "nethogs"
+        "nmap"
+        "openssl"
+        "parted"
+        "pciutils"
+        "powertop"
+        "pstree"
+        "ripgrep"
+        "screen"
+        "smartmontools"
+        "socat"
+        "strace"
+        "subversion"
+        "tcpdump"
+        "tree"
+        "usbutils"
+        "wget"
+        "wirelesstools"  # iwlist
       ];
     };
+    sysadminExtraUtils = {
+      package = null;
+      suggestedPrograms = [
+        "backblaze-b2"
+        "duplicity"
+        "sqlite"  # to debug sqlite3 databases
+      ];
+    };
+
     # TODO: split these into smaller groups.
     # - moby doesn't want a lot of these.
     # - categories like
@@ -69,37 +116,29 @@
         "zsh"
       ];
     };
-    desktopGuiApps = {
+
+    consoleMediaUtils = {
       package = null;
       suggestedPrograms = [
-        "audacity"
+        "ffmpeg"
-        "blanket"  # ambient noise generator
+        "imagemagick"
-        "brave"  # for the integrated wallet -- as a backup
+        "sox"
-        "chromium"
+        "yt-dlp"
-        "dino"
-        "electrum"
-        "element-desktop"
-        # "font-manager"  #< depends on webkitgtk4_0 (expensive to build)
-        "gajim"  # XMPP client
-        "gimp"  # broken on phosh
-        "gnome.dconf-editor"
-        "gnome.gnome-disk-utility"
-        # "gnome.totem"  # video player, supposedly supports UPnP
-        "handbrake"
-        "hase"
-        "inkscape"
-        "jellyfin-media-player"
-        "kdenlive"
-        "kid3"  # audio tagging
-        "krita"
-        "libreoffice-fresh"
-        "mumble"
-        "obsidian"
-        "slic3r"
-        "steam"
-        "wireshark"  # could maybe ship the cli as sysadmin pkg
       ];
     };
+
+    tuiApps = {
+      package = null;
+      suggestedPrograms = [
+        "aerc"  # email client
+        "msmtp"  # sendmail
+        "offlineimap"  # email mailox sync
+        "sfeed"  # RSS fetcher
+        "visidata"  # TUI spreadsheet viewer/editor
+        "w3m"  # web browser
+      ];
+    };
+
     guiApps = {
       package = null;
       suggestedPrograms = [
@@ -155,80 +194,39 @@
         "xterm"  # broken on phosh
       ];
     };
-    iphoneUtils = {
+
+    desktopGuiApps = {
       package = null;
       suggestedPrograms = [
-        "ifuse"
+        "audacity"
-        "ipfs"
+        "blanket"  # ambient noise generator
-        "libimobiledevice"
+        "brave"  # for the integrated wallet -- as a backup
-      ];
+        "chromium"
-    };
+        "dino"
-    sysadminUtils = {
+        "electrum"
-      package = null;
+        "element-desktop"
-      suggestedPrograms = [
+        # "font-manager"  #< depends on webkitgtk4_0 (expensive to build)
-        "btrfs-progs"
+        "gajim"  # XMPP client
-        "cacert.unbundled"  # some services require unbundled /etc/ssl/certs
+        "gimp"  # broken on phosh
-        "cryptsetup"
+        "gnome.dconf-editor"
-        "dig"
+        "gnome.gnome-disk-utility"
-        "efibootmgr"
+        # "gnome.totem"  # video player, supposedly supports UPnP
-        "fatresize"
+        "handbrake"
-        "fd"
+        "hase"
-        "file"
+        "inkscape"
-        "gawk"
+        "jellyfin-media-player"
-        "git"
+        "kdenlive"
-        "gptfdisk"
+        "kid3"  # audio tagging
-        "hdparm"
+        "krita"
-        "htop"
+        "libreoffice-fresh"
-        "iftop"
+        "mumble"
-        "inetutils"  # for telnet
+        "obsidian"
-        "iotop"
+        "slic3r"
-        "iptables"
+        "steam"
-        "jq"
+        "wireshark"  # could maybe ship the cli as sysadmin pkg
-        "killall"
-        "lsof"
-        "miniupnpc"
-        "nano"
-        "neovim"
-        "netcat"
-        "nethogs"
-        "nmap"
-        "openssl"
-        "parted"
-        "pciutils"
-        "powertop"
-        "pstree"
-        "ripgrep"
-        "screen"
-        "smartmontools"
-        "socat"
-        "strace"
-        "subversion"
-        "tcpdump"
-        "tree"
-        "usbutils"
-        "wget"
-        "wirelesstools"  # iwlist
-      ];
-    };
-    sysadminExtraUtils = {
-      package = null;
-      suggestedPrograms = [
-        "backblaze-b2"
-        "duplicity"
-        "sqlite"  # to debug sqlite3 databases
-      ];
-    };
-    tuiApps = {
-      package = null;
-      suggestedPrograms = [
-        "aerc"  # email client
-        "msmtp"  # sendmail
-        "offlineimap"  # email mailox sync
-        "sfeed"  # RSS fetcher
-        "visidata"  # TUI spreadsheet viewer/editor
-        "w3m"  # web browser
       ];
     };
+
     x86GuiApps = {
       package = null;
       suggestedPrograms = [
@@ -249,6 +247,15 @@
       ];
     };
 
+    iphoneUtils = {
+      package = null;
+      suggestedPrograms = [
+        "ifuse"
+        "ipfs"
+        "libimobiledevice"
+      ];
+    };
+
 
     # INDIVIDUAL PACKAGE DEFINITIONS