From 69b35fe1e2e683f61170b6296650665a06961492 Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Thu, 22 Feb 2024 19:01:16 +0100 Subject: [PATCH] Fixed firefox home-manager module --- home/default.nix | 17 +++++++++-------- home/modules/firefox.nix | 31 +++++++++++++++++++++++++------ modules/home-manager.nix | 2 +- 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/home/default.nix b/home/default.nix index d7d9580..da4bb34 100644 --- a/home/default.nix +++ b/home/default.nix @@ -2,6 +2,7 @@ { imports = [ ./modules/nixvim.nix + ./modules/firefox.nix ]; home.username = "xqtc"; home.homeDirectory = "/home/xqtc"; @@ -103,14 +104,14 @@ $character''; home.file."~/.local/share/fonts/AppleColorEmoji.ttf".source = ./config-files/AppleColorEmoji.ttf; - programs.firefox = { - enable = true; - package = pkgs.firefox.override { - cfg = { - enableGnomeExtensions = true; - }; - }; - }; + #programs.firefox = { + # enable = true; + # package = pkgs.firefox.override { + # cfg = { + # enableGnomeExtensions = true; + # }; + # }; + #}; wayland.windowManager.hyprland = { enable = true; package = pkgs.hyprland; diff --git a/home/modules/firefox.nix b/home/modules/firefox.nix index f58324c..c516262 100644 --- a/home/modules/firefox.nix +++ b/home/modules/firefox.nix @@ -1,4 +1,6 @@ -{ inputs, outputs, config, pkgs, ... }: { +{ inputs, outputs, config, pkgs, ... }: +with inputs; +{ home.sessionVariables.DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox"; @@ -19,9 +21,17 @@ noscript ]; search = { - default = "DuckDuckGo"; + default = "SearX"; force = true; engines = { + "SearX" = { + urls = [{ + template = "https://searx.org/search"; + params = [ + { name = "q"; value = "{searchTerms}"; } + ]; + }]; + }; "Nix Packages" = { urls = [{ template = "https://search.nixos.org/packages"; @@ -34,6 +44,18 @@ 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 = "type"; value = "options"; } + { name = "query"; value = "{searchTerms}"; } + ]; + }]; + + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@no" ]; + }; "NixOS Wiki" = { urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }]; @@ -51,7 +73,7 @@ "app.normandy.first_run" = false; "app.shield.optoutstudies.enabled" = false; "privacy.donotttrackheader.enabled" = true; - "browser.startup.homepage" = "https://start.duckduckgo.com"; + "browser.startup.homepage" = "https://xqtc161.github.io"; "browser.search.region" = "DE"; "browser.search.isUS" = false; "browser.theme.content-theme" = "0"; @@ -67,9 +89,6 @@ "toolkit.legacyUserProfileCustomizations.stylesheets" = true; # Needed to allow userChrome.css }; userChrome = '' - #TabsToolbar { - display: none; !important - } #sidebar-header { display: none; } diff --git a/modules/home-manager.nix b/modules/home-manager.nix index f1aafa5..c8369bb 100644 --- a/modules/home-manager.nix +++ b/modules/home-manager.nix @@ -4,7 +4,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = inputs; + home-manager.extraSpecialArgs = {inherit inputs;}; home-manager.users.xqtc = {...}: {imports = [ ../home inputs.nixvim.homeManagerModules.nixvim ]; }; }; }