diff --git a/flake.lock b/flake.lock
index 9cdb409..95bf8cc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -59,11 +59,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705879479,
-        "narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=",
+        "lastModified": 1706134977,
+        "narHash": "sha256-KwNb1Li3K6vuVwZ77tFjZ89AWBo7AiCs9t0Cens4BsM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913",
+        "rev": "6359d40f6ec0b72a38e02b333f343c3d4929ec10",
         "type": "github"
       },
       "original": {
diff --git a/modules/home/core/default.nix b/modules/home/core/default.nix
index d7666c5..cad0d27 100644
--- a/modules/home/core/default.nix
+++ b/modules/home/core/default.nix
@@ -95,17 +95,17 @@ in
         clock24 = true;
         newSession = true;
         extraConfig = ''
-            bind - split-window -h -c "#{pane_current_path}"
-            bind | split-window -v -c "#{pane_current_path}"
-            unbind '"'
-            unbind %
+          bind - split-window -h -c "#{pane_current_path}"
+          bind | split-window -v -c "#{pane_current_path}"
+          unbind '"'
+          unbind %
 
-            bind -n M-Left select-pane -L
-            bind -n M-Right select-pane -R
-            bind -n M-Up select-pane -U
-            bind -n M-Down select-pane -D
+          bind -n M-Left select-pane -L
+          bind -n M-Right select-pane -R
+          bind -n M-Up select-pane -U
+          bind -n M-Down select-pane -D
 
-            set -sg escape-time 0
+          set -sg escape-time 0
         '';
       };
 
@@ -122,13 +122,97 @@ in
 
       services.syncthing.enable = lib.mkDefault cfg.private;
 
-      programs.browserpass.enable = lib.mkDefault (cfg.private && cfg.graphical);
-
       programs.firefox = {
         enable = cfg.graphical;
-        profiles.default.extensions = (with pkgs.nur.repos.rycee.firefox-addons;
-        [ browserpass adnauseam ]
-        );
+        nativeMessagingHosts = with pkgs; lib.optionals cfg.private [
+          browserpass
+        ];
+
+        policies = {
+          BlockAboutConfig = true;
+        };
+        profiles.default = {
+          extensions = (with pkgs.nur.repos.rycee.firefox-addons; [
+            browserpass adnauseam pay-by-privacy libredirect unpaywall
+          ]);
+          settings = {
+            "browser.fixup.domainsuffixwhitelist.lan" = true;
+          };
+          search = {
+            force = true;
+            default = "DuckDuckGo Start";
+            engines = {
+              "Nix Packages" = {
+                urls = [{
+                  template = "https://search.nixos.org/packages";
+                  params = [
+                    { name = "type"; value = "packages"; }
+                    { name = "channel"; value = "unstable"; }
+                    { name = "query"; value = "{searchTerms}"; }
+                  ];
+                }];
+
+                icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+                definedAliases = [ "@np" ];
+              };
+
+              "Nix Options" = {
+                urls = [{
+                  template = "https://search.nixos.org/options";
+                  params = [
+                    { name = "channel"; value = "unstable"; }
+                    { name = "query"; value = "{searchTerms}"; }
+                  ];
+                }];
+
+                icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+                definedAliases = [ "@np" ];
+              };
+
+              "NixOS Wiki" = {
+                urls = [{
+                  template = "https://nixos.wiki/index.php";
+                  params = [
+                    { name = "search"; value = "{searchTerms}"; }
+                  ];
+                }];
+                iconUpdateURL = "https://nixos.wiki/favicon.png";
+                updateInterval = 24 * 60 * 60 * 1000; # every day
+                definedAliases = [ "@nw" ];
+              };
+
+              "DuckDuckGo Start" = {
+                urls = [{
+                  template = "https://duckduckgo.com/";
+                  params = [
+                    { name = "start"; value = "1"; }
+                    { name = "q"; value = "{searchTerms}"; }
+                  ];
+                }];
+                iconUpdateURL = "https://duckduckgo.com/favicon.png";
+                definedAliases = [ "@ddg" ];
+              };
+
+              "GitHub" = {
+                urls = [{
+                  template = "https://github.com/search";
+                  params = [
+                    { name = "ref"; value = "opensearch"; }
+                    { name = "q"; value = "{searchTerms}"; }
+                  ];
+                }];
+                iconUpdateURL = "https://github.com/favicon.ico";
+                definedAliases = [ "@gh" ];
+              };
+
+              "Bing".metaData.hidden = true;
+              "Google".metaData.hidden = true;
+              "DuckDuckGo".metaData.hidden = true;
+              "Amazon.com".metaData.hidden = true;
+              "eBay".metaData.hidden = true;
+            };
+          };
+        };
       };
 
       programs.wezterm = {
@@ -234,18 +318,18 @@ in
         };
       };
 
-    programs.fzf.enable = true;
-    programs.zellij = {
-      enable = true;
-      settings = {
-        pane_frames = false;
-        default_mode = "locked";
-        default_layout = "compact";
+      programs.fzf.enable = true;
+      programs.zellij = {
+        enable = true;
+        settings = {
+          pane_frames = false;
+          default_mode = "locked";
+          default_layout = "compact";
+        };
       };
+
+      programs.home-manager.enable = true;
+
+      home.stateVersion = "22.11";
     };
-
-    programs.home-manager.enable = true;
-
-    home.stateVersion = "22.11";
-  };
-}
+  }