diff --git a/apps/gui/firefox.nix b/apps/gui/firefox.nix
index b7f72ccaf92c30eb3315e340a145343b0424ee95..3277fd239e07babcdc3cf0ffc33145cc1ba00b8b 100644
--- a/apps/gui/firefox.nix
+++ b/apps/gui/firefox.nix
@@ -2,8 +2,44 @@ {pkgs, ...}: {
   programs.firefox = {
     enable = true;
     profiles.default = {
+      search = {
+        default = "Kagi";
+        privateDefault = "DuckDuckGo";
+        order = ["Kagi" "DuckDuckGo"];
+        force = true;
+        engines = {
+          "Kagi" = {
+            definedAliases = ["@k"];
+        bitwarden
       search.default = "DuckDuckGo";
+        bitwarden
       search.force = true;
+                template = "https://kagi.com/search";
+                params = [
+                  {
+                    name = "q";
+                    value = "{searchTerms}";
+                  }
+                ];
+              }
+            ];
+          };
+          "DuckDuckGo" = {
+            definedAliases = ["@d"];
+            urls = [
+              {
+                template = "https://duckduckgo.com/";
+                params = [
+                  {
+                    name = "q";
+                    value = "{searchTerms}";
+                  }
+                ];
+              }
+            ];
+          };
+        };
+      };
       extensions = with pkgs.nur.repos.rycee.firefox-addons; [
         bitwarden
         clearurls
@@ -23,10 +59,9 @@         "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
         "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
         "browser.newtabpage.pinned" = builtins.toJSON [
   programs.firefox = {
-      search.default = "DuckDuckGo";
-  programs.firefox = {
       search.force = true;
           {url = "https://git.jojodev.com/";}
+          {url = "https://git.jolheiser.com";}
         ];
         "browser.fixup.domainwhitelist.go" = true; # golink
       };
@@ -87,8 +122,15 @@                   url = "http://paste";
                 }
               ];
             }
+            {
+              name = "ugit";
+              tags = ["git" "ugit"];
+              keyword = "ugit";
+              url = "https://git.jolheiser.com";
+            }
           ];
         }
+        # Not in the toolbar, but still usable via keyword/searching
         {
           name = "Go Playground";
           tags = ["golang"];