From 0dca966aa8022f3051fd59cb1908ecb29f78085b Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Sat, 21 Sep 2024 20:49:21 +0900
Subject: [PATCH] Update Kagi

---
 home-manager/common/software/gui/firefox.nix | 34 +++++++-------------
 nixos/users/albert/default.nix               |  5 ---
 secrets/users/albert.yaml                    |  5 ++-
 3 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/home-manager/common/software/gui/firefox.nix b/home-manager/common/software/gui/firefox.nix
index 7d5245fd..83a5fd67 100644
--- a/home-manager/common/software/gui/firefox.nix
+++ b/home-manager/common/software/gui/firefox.nix
@@ -23,14 +23,15 @@
       };
 
       # https://nur.nix-community.org/repos/rycee/
-      extensions =  with pkgs.nur.repos; [
-        rycee.firefox-addons.darkreader
-        rycee.firefox-addons.ublock-origin
-        rycee.firefox-addons.privacy-redirect
-        rycee.firefox-addons.link-cleaner
-        rycee.firefox-addons.adnauseam
-        rycee.firefox-addons.sponsorblock
-        rycee.firefox-addons.multi-account-containers
+      extensions =  with pkgs.nur.repos.rycee.firefox-addons; [
+        darkreader
+        ublock-origin
+        privacy-redirect
+        link-cleaner
+        adnauseam
+        sponsorblock
+        multi-account-containers
+        kagi-search
       ];
 
       containersForce = true;
@@ -68,31 +69,20 @@
       };
 
       search = { 
-        default = "Ecosia";
-        privateDefault = "Ecosia";
+        default = "Kagi";
+        privateDefault = "Kagi";
         force = true;
-        order = [ "Ecosia" ];
+        order = [ "Kagi" ];
         engines = {
           "Kagi" = {
             urls = [{
               template = "https://kagi.com/search";
               params = [
-                { name = "token"; value = builtins.readFile /var/run/secrets/kagi_key; }
                 { name = "q"; value = "{searchTerms}"; }
               ];
             }];
             definedAliases = [ "@k" ];
           };
-          "Ecosia" = {
-            urls = [{
-              template = "https://www.ecosia.org/search";
-              params = [
-                { name = "method"; value = "index"; }
-                { name = "q"; value = "{searchTerms}"; }
-              ];
-            }];
-            definedAliases = [ "@ec" ];
-          };
           "Nix Packages" = {
             urls = [{
               template = "https://search.nixos.org/packages";
diff --git a/nixos/users/albert/default.nix b/nixos/users/albert/default.nix
index 4355c1e3..bdc3c783 100644
--- a/nixos/users/albert/default.nix
+++ b/nixos/users/albert/default.nix
@@ -44,11 +44,6 @@ in {
     owner = "albert"; 
   };
 
-  sops.secrets."kagi_token" = {
-    sopsFile = ../../../secrets/users/albert.yaml;
-    owner = "albert";
-  };
-
   # Make this user trusted
   nix.settings.trusted-users = [ "albert" ];
 }
diff --git a/secrets/users/albert.yaml b/secrets/users/albert.yaml
index e6df3c81..7f886fe6 100644
--- a/secrets/users/albert.yaml
+++ b/secrets/users/albert.yaml
@@ -1,14 +1,13 @@
 email_password: ENC[AES256_GCM,data:8gSaWe8MVQzd2cm+bqWI0jKhHzWLBe16gXj7+Ymxxj7Yq6eGwYeR+/Pgr5MdYL/Bw8GHZiM6lFticfFBGZcu9ar7tnDjLoI10EuflyvJkxc6pH1cFm4lvI9Y39j3Fc7TOf9EpX5NS74wTyiqAt4jC+sx1p+Uq3mbv6QZzMsI4Qo=,iv:SCpuPI5pd+wnKLrqTwlJkJsnPuOF0l6M92YtsdrwzxA=,tag:kTfu+JfqVIRCzwQhP/7eng==,type:str]
 atuin_key: ENC[AES256_GCM,data:0qgmIwr+iTtsZC/XRmvqalz+dtF6QlfewCsWliiKLQnrYMDwQDtTi/x9a+mravCUfU/lMrW+uGP/S9+SaFqhivCR04+lhebVzudhSQ==,iv:noX6V2Cqm1yBL5IKIJkHW3sw9ztlOnxCGWoNIaUizEw=,tag:pb/kyV5KGUv8RjsnaZ5l8w==,type:str]
-kagi_token: ENC[AES256_GCM,data:h/89k36+WjblQPnx5zG+PjNo8XuggLhNiXeghXbWFTxuY/wExtutVJKsWNJFBKdVgimKAYwtgg==,iv:eMXIBVZndlbj9k8Hkqm5b/Y+oBJKXi5BCgkx2bE1TOs=,tag:2qFanmK6/S/YROuZCGeUYg==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2024-09-21T11:34:29Z"
-    mac: ENC[AES256_GCM,data:ZRNHH78+IXkQGZY93w20cxGNEyv2je4WFIkpNiXQG/bYDtRGLMcwFvW8Gttb2DqyUqncQXjQF0mpnlAG67Mvz/jS9WXaWKmC8PT0JyiOSkyn7mFRrDR/dkLnlf7zZvlqo7Sap/+vXrMvZAnJHwKaMzHGYAqH8MZvn0F8d8LUN3g=,iv:tD/yHbM2HT9uArWVPCHVhmZ7BopuMs58P+U6ciPB9FU=,tag:SeI4uninsijvRNBSzAH7ow==,type:str]
+    lastmodified: "2024-09-21T11:49:15Z"
+    mac: ENC[AES256_GCM,data:JebqGQG2NojvtYRO0ziWYP9qKz75ICgCzk+QMnNU+kIg3xDVpg4AUvF8vUJui2OvpbSde5kbN4SylOV2cPEPn2h8388TCAQnn0OkGmZj1x3TFWdU/DOvgJao0VYNlCiqwx5rqCJyWL+DnowoT3gOH5lkRljT2DfDx71bsaFO/co=,iv:tELF18Ss/6nQM4xLzSaJm1Lh+iYbTljkJuY2+kldYRg=,tag:BCTNYYyyFDV+OOk5lelYBw==,type:str]
     pgp:
         - created_at: "2024-07-27T04:10:19Z"
           enc: |-