Changes to firefox configHEADmain

1 files changed, 46 insertions, 30 deletions

diff --git a/modules/firefox.home/default.nix b/modules/firefox.home/default.nix
index 0d53fe9..91e0fb5 100644
--- a/modules/firefox.home/default.nix
+++ b/modules/firefox.home/default.nix
@@ -1,20 +1,26 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
-  unwrappedFirefoxPackage = pkgs.firefox-unwrapped;
-  firefoxBinName = "firefox";
-  configDir = ".mozilla/firefox";
-  # unwrappedFirefoxPackage = pkgs.librewolf-unwrapped;
-  # firefoxBinName = "librewolf";
-  # configDir = ".config/librewolf/librewolf";
+  enabled = true;
+  # unwrappedFirefoxPackage = pkgs.firefox-unwrapped;
+  # configDir = ".mozilla/firefox";
+  unwrappedFirefoxPackage = pkgs.librewolf-unwrapped;
+  configDir = ".config/librewolf/librewolf";
+
+  firefoxBinName = unwrappedFirefoxPackage.meta.mainProgram;
 
   extensions = [
-    "https://addons.mozilla.org/firefox/downloads/file/3792127/firefox_dracula-1.0.xpi"
+    "https://addons.mozilla.org/firefox/downloads/file/3954735/black21-3.0.2.xpi"
+    # "https://addons.mozilla.org/firefox/downloads/file/3792127/firefox_dracula-1.0.xpi"
     # "https://addons.mozilla.org/firefox/downloads/file/4261352/tridactyl_vim-1.24.1.xpi"
     # "https://addons.mozilla.org/firefox/downloads/file/4240798/sidetabs-0.66.xpi"
     "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"
 
     # dev
-    "https://addons.mozilla.org/firefox/downloads/file/4218479/font_inspect-0.5.8.xpi"
     "https://addons.mozilla.org/firefox/downloads/file/4314064/react_devtools-5.3.1.xpi"
     "https://addons.mozilla.org/firefox/downloads/file/3970625/screen_recorder-0.1.8.xpi"
 
@@ -27,7 +33,10 @@ let
 
   policies = lib.recursiveUpdate (import ./policies.nix { inherit config; }).policies {
     Extensions.Install = extensions;
-    Preferences = lib.mapAttrs (_key: val: { Status = "locked"; Value = val; }) preferences;
+    Preferences = lib.mapAttrs (_key: val: {
+      Status = "locked";
+      Value = val;
+    }) preferences;
   };
 
   firefox = pkgs.wrapFirefox unwrappedFirefoxPackage {
@@ -35,31 +44,38 @@ let
   };
 
   profilePath = "default";
-in {
+in
+{
   programs.firefox = {
-    enable = true;
+    enable = enabled;
     package = firefox;
     policies = policies;
   };
 
-  home.packages = if config.programs.firefox.enable then [
-    (pkgs.writeShellScriptBin "firefox" ''exec ${firefox}/bin/${firefoxBinName}'')
-  ] else [];
+  home.packages =
+    if config.programs.firefox.enable then
+      [ (pkgs.writeShellScriptBin "firefox" ''exec ${firefox}/bin/${firefoxBinName} "$@"'') ]
+    else
+      [ ];
 
-  home.file = if config.programs.firefox.enable then {
-    "${configDir}/${profilePath}/chrome".source = ./chrome;
+  home.file =
+    if config.programs.firefox.enable then
+      {
+        # "${configDir}/${profilePath}/chrome".source = ./chrome;
 
-    "${configDir}/profiles.ini".text = lib.generators.toINI {} {
-      Profile0 = {
-        Name = "default";
-        Default = 1;
-        IsRelative = 1;
-        Path = profilePath;
-      };
-      General = {
-        StartWithLastProfile = 1;
-        Version = 2;
-      };
-    };
-  } else {};
+        "${configDir}/profiles.ini".text = lib.generators.toINI { } {
+          Profile0 = {
+            Name = "default";
+            Default = 1;
+            IsRelative = 1;
+            Path = profilePath;
+          };
+          General = {
+            StartWithLastProfile = 1;
+            Version = 2;
+          };
+        };
+      }
+    else
+      { };
 }