From ea541f2f2b67951411e2e0db6ab5923b7aac7781 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Thu, 26 Sep 2024 09:56:38 +0200
Subject: [PATCH] home: prefer modules for some packages

---
 home/home.nix                 |  4 ++++
 home/packages.nix             |  6 ------
 home/programs/beets.nix       |  4 ++++
 home/programs/gh-dash.nix     |  4 ++++
 home/programs/jq.nix          |  4 ++++
 home/programs/thunderbird.nix | 18 ++++++++++++++++++
 6 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 home/programs/beets.nix
 create mode 100644 home/programs/gh-dash.nix
 create mode 100644 home/programs/jq.nix
 create mode 100644 home/programs/thunderbird.nix

diff --git a/home/home.nix b/home/home.nix
index 84fd2ab..59d3d98 100644
--- a/home/home.nix
+++ b/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
 
diff --git a/home/packages.nix b/home/packages.nix
index 07e00f9..b71e6f4 100644
--- a/home/packages.nix
+++ b/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
diff --git a/home/programs/beets.nix b/home/programs/beets.nix
new file mode 100644
index 0000000..fb6a83a
--- /dev/null
+++ b/home/programs/beets.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.beets.enable = true;
+}
diff --git a/home/programs/gh-dash.nix b/home/programs/gh-dash.nix
new file mode 100644
index 0000000..1bf6fbe
--- /dev/null
+++ b/home/programs/gh-dash.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.gh-dash.enable = true;
+}
diff --git a/home/programs/jq.nix b/home/programs/jq.nix
new file mode 100644
index 0000000..0cabcba
--- /dev/null
+++ b/home/programs/jq.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.jq.enable = true;
+}
diff --git a/home/programs/thunderbird.nix b/home/programs/thunderbird.nix
new file mode 100644
index 0000000..719fbb9
--- /dev/null
+++ b/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
+  ]);
+}