8 files changed, 35 insertions, 12 deletions
diff --git a/pkgs/barista/default.nix b/pkgs/barista/default.nix
index 4c38e46..5d7e943 100644
--- a/pkgs/barista/default.nix
+++ b/pkgs/barista/default.nix
@@ -8,8 +8,8 @@ in buildGoModule {
   src = fetchFromGitHub {
     owner = "soumya92";
     repo = "barista";
-    rev = "c8725f1d8765e36869eb54272f29c770ce1f2f67";
-    sha256 = "19nvwrr8baf8k0pp7ph07hmjcrxm7kv5j4f2rsfa8m7hgcyarjp4";
+    rev = "7ba8592f52325a15fe4971cd7800b9faf8638d17";
+    sha256 = "Qd57ya/RBmkk8iMzYFCLVGIU0uTF4kP0JbQ5VZSwWH4=";
   };
 
   patchPhase = ''
@@ -21,16 +21,16 @@ in buildGoModule {
   ''
     cp ${i3statusGo} main/i3status.go
     substituteInPlace main/i3status.go \
-                      --replace 'fontawesome.Load()' 'fontawesome.Load("${fontawesomeMetadata}")'
-                      --replace 'mdi.Load()' 'mdi.Load("${materialDesignIconsMetadata})'
+                      --replace 'fontawesome.Load()' 'fontawesome.Load("${fontawesomeMetadata}")' \
+                      --replace 'mdi.Load()' 'mdi.Load("${materialDesignIconsMetadata}")'
   '') + # patch call to iwgetid
     ''
       substituteInPlace modules/wlan/wlan.go \
-                        --replace 'iwgetid' '${wirelesstools}/bin/iwgetid'
+                        --replace '/sbin/iwgetid' '${wirelesstools}/bin/iwgetid'
     '';
 
   subPackages = [ "main/i3status.go" ];
 
-  vendorSha256 = "1q8bmgv7aac29yvpvgh6hi4c33ydj7f54l7xn7jg2sjbac4f8kbk";
+  vendorSha256 = "uE8/z5fJbgr2BTswQknVpXH7wcFNVkFNxEcVgzecfZo=";
 }
 
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 83c485e..aec97a3 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,21 +1,25 @@
 pkgs:
 
 let
-  firefoxAddons = pkgs.callPackage ./firefox/addons { inherit (pkgs.nur.repos.rycee) buildFirefoxXpiAddon; };
+  mozillaAddons = pkgs.callPackage ./mozilla/addons {
+    inherit (pkgs.nur.repos.rycee.firefox-addons) buildFirefoxXpiAddon;
+  };
   gitignores = pkgs.callPackage ./gitignore { };
   icons = pkgs.callPackage ./icons { };
   personal =
     # lib
     {
-      lib.home-manager = import ./lib/home-manager { };
+      lib = import ./lib { inherit (pkgs) lib; };
     } //
     # css
     {
       line-awesome-css = pkgs.callPackage ./css/lineAwesome { };
     } //
-    # firefox packages
-    firefoxAddons // {
-      arkenfoxUserJs = pkgs.callPackage ./firefox/user-js/arkenfox.nix { };
+    # mozilla packages
+    mozillaAddons // {
+      arkenfoxUserJS = pkgs.callPackage ./mozilla/user-js/arkenfox.nix { };
+      thunderbirdUserJS =
+        pkgs.callPackage ./mozilla/user-js/thunderbird.nix { };
     } //
     # font metadata
     {
diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix
new file mode 100644
index 0000000..964d099
--- /dev/null
+++ b/pkgs/lib/default.nix
@@ -0,0 +1,10 @@
+{ lib }:
+
+{
+  homeManager = import ./home-manager { };
+  toUserJS = prefs: ''
+    ${lib.concatStrings (lib.mapAttrsToList (name: value: ''
+      user_pref("${name}", ${builtins.toJSON value});
+    '') prefs)}
+  '';
+}
diff --git a/pkgs/lib/home-manager/default.nix b/pkgs/lib/home-manager/default.nix
index 62db998..ad3878f 100644
--- a/pkgs/lib/home-manager/default.nix
+++ b/pkgs/lib/home-manager/default.nix
@@ -1,7 +1,8 @@
 { }:
 
 {
-  serviceWithTimer = name: { Unit, Service, Timer, Install, ... }@config: {
+  serviceWithTimer = name:
+    { Unit, Service, Timer, Install, ... }@config: {
       services.${name} = { inherit (config) Unit Install Service; };
       timers.${name} = {
         inherit (config) Unit Install;
diff --git a/pkgs/firefox/addons/addons.json b/pkgs/mozilla/addons/addons.json
index d39900d..d39900d 100644
--- a/pkgs/firefox/addons/addons.json
+++ b/pkgs/mozilla/addons/addons.json
diff --git a/pkgs/firefox/addons/default.nix b/pkgs/mozilla/addons/default.nix
index f87acb5..f87acb5 100644
--- a/pkgs/firefox/addons/default.nix
+++ b/pkgs/mozilla/addons/default.nix
diff --git a/pkgs/firefox/user-js/arkenfox.nix b/pkgs/mozilla/user-js/arkenfox.nix
index c464f34..c464f34 100644
--- a/pkgs/firefox/user-js/arkenfox.nix
+++ b/pkgs/mozilla/user-js/arkenfox.nix
diff --git a/pkgs/mozilla/user-js/thunderbird.nix b/pkgs/mozilla/user-js/thunderbird.nix
new file mode 100644
index 0000000..8899d38
--- /dev/null
+++ b/pkgs/mozilla/user-js/thunderbird.nix
@@ -0,0 +1,8 @@
+{ fetchurl }:
+
+let version = "102.1";
+in fetchurl {
+  url =
+    "https://raw.githubusercontent.com/HorlogeSkynet/thunderbird-user.js/v${version}/user.js";
+  sha256 = "1zid28fjz86a82pg21xn7icxgbv7qqwrhy7nam4cp6d9jj16nr4x";
+}