Config sync

4 files changed, 32 insertions, 11 deletions

diff --git a/modules/firefox.home/chrome/customNewTab.uc.js b/modules/firefox.home/chrome/customNewTab.uc.js
index 3a3a47e..4c8faca 100644
--- a/modules/firefox.home/chrome/customNewTab.uc.js
+++ b/modules/firefox.home/chrome/customNewTab.uc.js
@@ -10,6 +10,10 @@
   // Managed in about:config
   const NEWTAB_URL_PREF = 'browser.newtab.url'
 
+  console.log('-------------------------------------------');
+  console.log('-------------------------------------------');
+  console.log('-------------------------------------------');
+
   if (!AboutNewTab) {
     globalThis.AboutNewTab = ChromeUtils.import('resource:///modules/AboutNewTab.jsm').AboutNewTab;
   }
@@ -24,6 +28,10 @@
     },
 
     init() {
+      console.log('-------------------------------------------');
+      console.log('init new tab');
+      console.log('-------------------------------------------');
+
       module.updateNewTabURL();
       Services.obs.addObserver(module.updateNewTabURL, 'newtab-url-changed');
     },
diff --git a/modules/firefox.home/chrome/globalKeybindings.uc.js b/modules/firefox.home/chrome/globalKeybindings.uc.js
index 204a510..d8c0f51 100644
--- a/modules/firefox.home/chrome/globalKeybindings.uc.js
+++ b/modules/firefox.home/chrome/globalKeybindings.uc.js
@@ -139,6 +139,10 @@
     },
 
     init(win) {
+      console.log('-------------------------------------------');
+      console.log('init keys');
+      console.log('-------------------------------------------');
+
       const observe = () => {
         Services.obs.removeObserver(observe, 'browser-window-before-show');
         module.onWindowReady(win)
diff --git a/modules/firefox.home/default.nix b/modules/firefox.home/default.nix
index 6a84205..208d2e7 100644
--- a/modules/firefox.home/default.nix
+++ b/modules/firefox.home/default.nix
@@ -1,12 +1,16 @@
 { config, pkgs, lib, ... }:
 let
-  unwrapped-firefox-package = pkgs.firefox-devedition-unwrapped;
+  unwrappedFirefoxPackage = pkgs.firefox-devedition-unwrapped;
+
+  firefoxBinName = "firefox-devedition";
+
+  configDir = ".mozilla/firefox";
 
   extensions = [
     "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/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"
+    "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"
@@ -25,26 +29,30 @@ let
     Preferences = lib.mapAttrs (_key: val: { Status = "locked"; Value = val; }) preferences;
   };
 
-  firefox = pkgs.wrapFirefox unwrapped-firefox-package {
+  firefox = pkgs.wrapFirefox unwrappedFirefoxPackage {
     extraPrefs = builtins.readFile ./autoconfig.js;
   };
 
   profilePath = "default";
 in {
   programs.firefox = {
-    enable = true;
+    enable = false;
     package = firefox;
 
-    nativeMessagingHosts = [ pkgs.tridactyl-native ];
+    # nativeMessagingHosts = [ pkgs.tridactyl-native ];
     policies = policies;
   };
 
-  home.file = {
-    ".config/tridactyl".source = ./tridactyl;
+  home.packages = if config.programs.firefox.enable then [
+    (pkgs.writeShellScriptBin "firefox" ''exec ${firefox}/bin/${firefoxBinName}'')
+  ] else [];
 
-    ".mozilla/firefox/${profilePath}/chrome".source = ./chrome;
+  home.file = if config.programs.firefox.enable then {
+    # ".config/tridactyl".source = ./tridactyl;
 
-    ".mozilla/firefox/profiles.ini".text = lib.generators.toINI {} {
+    "${configDir}/${profilePath}/chrome".source = ./chrome;
+
+    "${configDir}/profiles.ini".text = lib.generators.toINI {} {
       Profile1 = {
         Name = "default";
         IsRelative = 1;
@@ -61,5 +69,5 @@ in {
         Version = 2;
       };
     };
-  };
+  } else {};
 }
diff --git a/modules/firefox.home/preferences.nix b/modules/firefox.home/preferences.nix
index 762a960..accaa05 100644
--- a/modules/firefox.home/preferences.nix
+++ b/modules/firefox.home/preferences.nix
@@ -6,6 +6,7 @@ in {
     "browser.newtabpage.enabled" = false;
     "browser.startup.homepage" = homepage-url;
     "browser.newtab.url" = homepage-url;
+    "browser.ml.chat.enabled" = false;
 
     "sidebar.verticalTabs" = true;
     "sidebar.main.tools" = "";