hosts/modules/gui: refactor package sets

hosts/modules/gui/default.nix

@@ -1,4 +1,10 @@
 { config, lib, pkgs, ... }:
+let
+  declPackageSet = pkgs: {
+    package = null;
+    suggestedPrograms = pkgs;
+  };
+in
 {
   imports = [
     ./gnome.nix
@@ -10,18 +16,13 @@
     ./theme
   ];
 
-  sane.programs.gameApps = {
-    package = null;
-    suggestedPrograms = [
+  sane.programs.gameApps = declPackageSet [
     "animatch"
     "gnome-2048"
     "superTux"  # keyboard-only controls
     "superTuxKart"  # poor FPS on pinephone
   ];
-  };
-  sane.programs.desktopGameApps = {
-    package = null;
-    suggestedPrograms = [
+  sane.programs.desktopGameApps = declPackageSet [
     # "andyetitmoves" # TODO: fix build!
     # "armagetronad"  # tron/lightcycles; WAN and LAN multiplayer
     # "cutemaze"      # meh: trivial maze game; qt6 and keyboard-only
@@ -43,11 +44,9 @@
     "tumiki-fighters" # keyboard-only
     "vvvvvv"  # keyboard-only controls
   ];
-  };
 
-  sane.programs.guiApps = {
-    package = null;
-    suggestedPrograms = lib.optionals (pkgs.system == "x86_64-linux") [
+  sane.programs.guiApps = declPackageSet (
+    lib.optionals (pkgs.system == "x86_64-linux") [
       "x86GuiApps"
     ] ++ [
       # package sets
@@ -109,12 +108,11 @@
       "wike"  # Wikipedia Reader
       "xdg-terminal-exec"
       "xterm"  # broken on phosh
-    ];
-  };
+    ]
+  );
 
-  sane.programs.desktopGuiApps = {
-    package = null;
-    suggestedPrograms = [
+  sane.programs.desktopGuiApps = declPackageSet (
+    [
       # package sets
       "desktopGameApps"
     ] ++ [
@@ -149,21 +147,16 @@
       "steam"
       "vlc"
       "wireshark"  # could maybe ship the cli as sysadmin pkg
-    ];
-  };
+    ]
+  );
 
-  sane.programs.handheldGuiApps = {
-    package = null;
-    suggestedPrograms = [
+  sane.programs.handheldGuiApps = declPackageSet [
     "megapixels"  # camera app
     "portfolio-filemanager"
     "xarchiver"
   ];
-  };
 
-  sane.programs.x86GuiApps = {
-    package = null;
-    suggestedPrograms = [
+  sane.programs.x86GuiApps = declPackageSet [
     "discord"
     # "gnome.zenity" # for kaiteki (it will use qarma, kdialog, or zenity)
     # "gpt2tc"  # XXX: unreliable mirror
@@ -177,7 +170,7 @@
     "tor-browser-bundle-bin"
     "zecwallet-lite"
   ];
-  };
+
 
   sane.persist.sys.byStore.plaintext = lib.mkIf config.sane.programs.guiApps.enabled [
     "/var/lib/alsa"                # preserve output levels, default devices