home: prefer modules for some packages

home/home.nix

@@ -10,17 +10,21 @@ in {
 
     ./programs/aria2.nix
     ./programs/atuin.nix
+    ./programs/beets.nix
     ./programs/comma.nix
     ./programs/direnv
     ./programs/gdb.nix
     ./programs/gh.nix
+    ./programs/gh-dash.nix
     ./programs/git
     ./programs/gpg
+    ./programs/jq.nix
     ./programs/less.nix
     ./programs/neovim
     ./programs/nix-index
     ./programs/ssh
     ./programs/tealdeer
+    ./programs/thunderbird.nix
     ./programs/tmux.nix
     ./programs/zsh
 

home/packages.nix

@@ -1,7 +1,6 @@
 { pkgs, config, machineVars, ... }:
 {
   home.packages = with pkgs; [
-    beets
     binutils
     cloc
     cyme
@@ -12,7 +11,6 @@
     duff
     ffmpeg
     file
-    gh-dash
     glances
     gpg-tui
     gping
@@ -20,7 +18,6 @@
     hexyl
     httpie
     imagemagick
-    jq
     kepubify
     # keybase
     keymapviz
@@ -35,7 +32,6 @@
     mtr
     neofetch
     nix-diff
-    nix-index
     nix-output-monitor
     nix-tree
     nix-update
@@ -85,7 +81,6 @@
       alsa-utils
       anki
       ark
-      birdtray
       calibre
       cool-retro-term
       darktable
@@ -128,7 +123,6 @@
       tagainijisho
 
       tenacity
-      thunderbird
       # transcribe
       wireshark
       xcalib

home/programs/beets.nix

@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.beets.enable = true;
+}

home/programs/gh-dash.nix

@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.gh-dash.enable = true;
+}

home/programs/jq.nix

@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.jq.enable = true;
+}

home/programs/thunderbird.nix

@@ -0,0 +1,18 @@
+{ config, pkgs, lib, machineVars, ... }:
+let
+  cfg = config.programs.thunderbird;
+in
+{
+  programs.thunderbird = {
+    enable = !machineVars.headless;
+    profiles.h7x4 = {
+      isDefault = true;
+      withExternalGnupg = true;
+    };
+  };
+
+
+  home.packages = lib.mkIf cfg.enable (with pkgs; [
+    birdtray
+  ]);
+}