programs: split consoleUtils into separate normal/desktop sets

hosts/by-name/desko/default.nix

@@ -25,7 +25,7 @@
   sane.programs.steam.enableFor.user.colin = true;
 
   sane.programs.guiApps.suggestedPrograms = [ "desktopGuiApps" ];
-  sane.programs.consoleUtils.suggestedPrograms = [ "consoleMediaUtils" ];
+  sane.programs.consoleUtils.suggestedPrograms = [ "consoleMediaUtils" "desktopConsoleUtils" ];
   # sane.programs.devPkgs.enableFor.user.colin = true;
 
   boot.loader.efi.canTouchEfiVariables = false;

hosts/by-name/lappy/default.nix

@@ -19,7 +19,7 @@
     "desktopGuiApps"
     "stepmania"
   ];
-  sane.programs.consoleUtils.suggestedPrograms = [ "consoleMediaUtils" ];
+  sane.programs.consoleUtils.suggestedPrograms = [ "consoleMediaUtils" "desktopConsoleUtils" ];
 
   sops.secrets.colin-passwd.neededForUsers = true;
 

hosts/by-name/servo/default.nix

@@ -18,6 +18,7 @@
   sane.roles.build-machine.enable = true;
   sane.roles.build-machine.emulation = false;
   sane.zsh.showDeadlines = false;  # ~/knowledge doesn't always exist
+  sane.programs.consoleUtils.suggestedPrograms = [ "desktopConsoleUtils" ];
   sane.services.dyn-dns.enable = true;
   sane.services.wg-home.enable = true;
   sane.services.wg-home.enableWan = true;

hosts/common/programs/assorted.nix

@@ -75,7 +75,6 @@
         "efivar"
         # "flashrom"
         "fwupd"
-        "gh"  # MS GitHub cli
         "git"  # needed as a user package, for config.
         # "gnupg"
         # "gocryptfs"
@@ -90,8 +89,6 @@
         "neovim"  # needed as a user package, for swap persistence
         # "nettools"
         # "networkmanager"
-        "nix-index"
-        "nixpkgs-review"
         # "nixos-generators"
         "nmon"
         # "node2nix"
@@ -102,8 +99,7 @@
         # "python3Packages.eyeD3"  # music tagging
         "ripgrep"  # needed as a user package so that its user-level config file can be installed
         "rsync"
-        "sane-scripts"
-        "sequoia"
+        "sane-scripts"  # TODO: split; moby doesn't need the duplicity related ones
         "snapper"
         "sops"
         "speedtest-cli"
@@ -119,6 +115,16 @@
       ];
     };
 
+    desktopConsoleUtils = {
+      package = null;
+      suggestedPrograms = [
+        "gh"  # MS GitHub cli
+        "nix-index"
+        "nixpkgs-review"
+        "sequoia"
+      ];
+    };
+
     consoleMediaUtils = {
       package = null;
       suggestedPrograms = [
@@ -134,7 +140,7 @@
       suggestedPrograms = [
         "aerc"  # email client
         "msmtp"  # sendmail
-        "offlineimap"  # email mailox sync
+        "offlineimap"  # email mailbox sync
         "sfeed"  # RSS fetcher
         "visidata"  # TUI spreadsheet viewer/editor
         "w3m"  # web browser