diff --git a/common/firefox.nix b/common/firefox.nix
index 3ed36345..bbeaa762 100644
--- a/common/firefox.nix
+++ b/common/firefox.nix
@@ -11,23 +11,23 @@
         css
         */
         ''
-          /* @import url(${pkgs.csshacks}/chrome/toolbars_below_content.css); */
-          /* @import url(${pkgs.csshacks}/chrome/scrollable_menupopups.css); */
-          /* @import url(${pkgs.csshacks}/chrome/linux_gtk_window_control_patch.css); */
+          @import url(${pkgs.csshacks}/chrome/toolbars_below_content.css);
+          @import url(${pkgs.csshacks}/chrome/scrollable_menupopups.css);
+          @import url(${pkgs.csshacks}/chrome/linux_gtk_window_control_patch.css);
         '';
       extensions = with pkgs.nur.repos.rycee.firefox-addons; [
         privacy-badger
         tridactyl
+        clearurls
+        onepassword-password-manager
+        ublock-origin
+        i-dont-care-about-cookies
+        keepa
+        sponsorblock
       ];
     };
     nativeMessagingHosts = [pkgs.tridactyl-native];
     policies = {
-      ExtensionSettings = {
-        "uBlock0@raymondhill.net" = {
-          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
-          installation_mode = "force_installed";
-        };
-      };
       DisableFirefoxStudies = true;
       DisablePocket = true;
       DisableTelemetry = true;
diff --git a/flake.lock b/flake.lock
index 3b6a98e0..57bef057 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1554,7 +1554,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-DX3q8nvddvoz+RCvQ1EgbqCSguq1BaJi7Af0Zbl5xo0=",
+        "narHash": "sha256-De9Z+8u1DusdNczSDkRINldxAgjLy/l+e8KzC53WJ8o=",
         "path": "./neovim",
         "type": "path"
       },
diff --git a/neovim/nvim.nix b/neovim/nvim.nix
index eec6ba8a..f1882c03 100644
--- a/neovim/nvim.nix
+++ b/neovim/nvim.nix
@@ -398,9 +398,15 @@ in rec {
         else null;
       apikey =
         pkgs.writeShellScriptBin
-        "openapikey" ''
-          ${pkgs._1password}/bin/op item get 'OpenAI API Token' --fields label=credential
-        '';
+        "openapikey" (
+          if pkgs.stdenv.isDarwin
+          then ''
+            ${pkgs._1password}/bin/op item get 'OpenAI API Token' --fields label=credential
+          ''
+          else ''
+            /run/wrappers/bin/op item get 'OpenAI API Token' --fields label=credential
+          ''
+        );
     in
       /*
       lua