From 79f2dc99e2219a1f979fffd3ddfc6116adc48aca Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Wed, 10 Jul 2024 00:28:12 +0200
Subject: [PATCH] feat: lock some thunderbird options in system config

---
 home/rofi/default.nix            | 12 ++++++++----
 home/thunderbird/default.nix     |  6 ------
 modules/programs/thunderbird.nix |  1 +
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/home/rofi/default.nix b/home/rofi/default.nix
index 15e800c..7a98b52 100644
--- a/home/rofi/default.nix
+++ b/home/rofi/default.nix
@@ -1,4 +1,9 @@
-{ pkgs, config, ... }:
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
 {
   programs.rofi =
     let
@@ -19,9 +24,8 @@
           "run"
           # WARNING: ABI version mismatch
           # "calc"
-          # TODO: Update to use nixpkgs version of cliphist
-          "clipboard:cliphist-rofi-img"
-          "obsidian:${pkgs.rofi-obsidian}/bin/rofi-obsidian"
+          "clipboard:${lib.my.checkPath pkgs.cliphist "cliphist-rofi-img"}"
+          "obsidian:${lib.my.checkPath pkgs.rofi-obsidian "rofi-obsidian"}"
         ];
         matching = "fuzzy";
         sort = true;
diff --git a/home/thunderbird/default.nix b/home/thunderbird/default.nix
index 5bc9c0b..c646a95 100644
--- a/home/thunderbird/default.nix
+++ b/home/thunderbird/default.nix
@@ -5,12 +5,6 @@
     settings = {
       # https://superuser.com/a/13551
       "mailnews.wraplength" = 80;
-      "mail.pane_config.dynamic" = 2;
-      "mail.biff.play_sound" = false;
-      "mail.chat.play_sound" = false;
-      # Never allow cookies
-      "network.cookie.cookieBehavior" = 2;
-      "mailnews.start_page.enabled" = false;
       # 1 = Ascending
       # 2 = Descending
       "mailnews.default_sort_order" = 2;
diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index 2606f5a..73d31ed 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -5,6 +5,7 @@ lib.mkIf config.programs.thunderbird.enable {
     preferences = {
       "mail.biff.play_sound" = false;
       "mail.chat.play_sound" = false;
+      "mail.pane_config.dynamic" = 2;
     };
   };
 }