diff --git a/configuration.nix b/configuration.nix index 1af83ff..5ebad2b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -34,29 +34,6 @@ services.resolved.enable = true; - services.searx = { - enable = true; - openFirewall = false; - settings = { - use_default_settings.engines.keep_only = [ "google" ]; - general.instance_name = "Local Google"; - search = { - autocomplete = ""; - formats = [ "html" ]; - }; - server = { - bind_address = "127.0.0.1"; - port = 8888; - base_url = "http://127.0.0.1:8888/"; - limiter = false; - public_instance = false; - image_proxy = true; - method = "GET"; - secret_key = "local-only-google-searxng"; - }; - }; - }; - networking.firewall.enable = true; # Required for Tailscale networking.firewall.checkReversePath = "loose"; diff --git a/home-modules/browser.nix b/home-modules/browser.nix index 15415d4..5c60737 100644 --- a/home-modules/browser.nix +++ b/home-modules/browser.nix @@ -174,21 +174,22 @@ in ''; extensions.packages = zenQolExtensions; search = { - default = "Local Google"; - privateDefault = "Local Google"; + default = "Google Web"; + privateDefault = "Google Web"; force = true; engines = { - "Local Google" = { - urls = [ { template = "http://127.0.0.1:8888/search?q={searchTerms}"; } ]; - definedAliases = [ "@lg" ]; - }; "Google Web" = { - urls = [ { template = "https://www.google.com/search?q={searchTerms}&pws=0&udm=14"; } ]; - definedAliases = [ "@g" ]; + urls = [ { template = "https://www.google.com/search?q={searchTerms}&udm=14&pws=0&filter=0&nfpr=1&hl=en&gl=US&safe=active"; } ]; + definedAliases = [ + "@g" + ]; }; - "SearXNG" = { - urls = [ { template = "https://search.extremist.software/search?q={searchTerms}"; } ]; - definedAliases = [ "@s" ]; + "Google Basic" = { + urls = [ { template = "https://www.google.com/search?gbv=1&q={searchTerms}&udm=14&pws=0&filter=0&nfpr=1&hl=en&gl=US&safe=active"; } ]; + definedAliases = [ + "@gb" + "@gnj" + ]; }; }; }; diff --git a/home-modules/git.nix b/home-modules/git.nix index 44b98c9..763724a 100644 --- a/home-modules/git.nix +++ b/home-modules/git.nix @@ -49,7 +49,9 @@ ui = { default-command = "log"; editor = "hx"; - pager = "bat --style=plain"; + # Avoid bat's automatic terminal background query leaking into shell input + # when jj runs it as a pager with stdin connected to jj output. + pager = "bat --style=plain --theme=TwoDark"; }; diff.tool = [ "difft"