From 3c99fff8903b5305a568a898c9a8594c949f7d96 Mon Sep 17 00:00:00 2001 From: installer Date: Mon, 17 Feb 2025 23:23:53 +0100 Subject: [PATCH] =?UTF-8?q?Dodanie=20obs=C5=82ugi=20dodatk=C3=B3w=20do=20F?= =?UTF-8?q?irefoksa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Dodano nowy input `firefox-addons` w `flake.nix` - Zaktualizowano `flake.lock` o nową zależność oraz nowsze wersje istniejących pakietów - Zmieniono konfigurację `programs.librewolf.nix`: - Dodano obsługę systemu `x86_64-linux` - Zmieniono ustawienia prywatności i sesji przeglądarki - Dodano obsługę DNS-over-HTTPS z Mullvad - Rozszerzono listę wyszukiwarek o YouTube, Wikipedia (PL), StackOverflow i Nix Wiki - Dodano listę preinstalowanych rozszerzeń (np. Bitwarden, uBlock Origin, SponsorBlock) - Dodano alias `os-up-fa` do aktualizacji `firefox-addons` --- flake.lock | 65 +++++++++--- flake.nix | 9 +- .../garand-laptop/home/programs.librewolf.nix | 98 +++++++++++++++++-- hosts/garand-laptop/home/programs.nix | 1 + 4 files changed, 151 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 5254736..8c9d806 100644 --- a/flake.lock +++ b/flake.lock @@ -87,14 +87,37 @@ "type": "github" } }, + "firefox-addons": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "pkgs/firefox-addons", + "lastModified": 1739824024, + "narHash": "sha256-ighPW5qCUhBWzDc5NYS9WxKs4e/iqK8SQe1w4yLKO9I=", + "owner": "rycee", + "repo": "nur-expressions", + "rev": "1a885a7122e8bce576ec16de9d305defecd649b9", + "type": "gitlab" + }, + "original": { + "dir": "pkgs/firefox-addons", + "owner": "rycee", + "repo": "nur-expressions", + "type": "gitlab" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1736899990, - "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=", + "lastModified": 1739223196, + "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d", + "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21", "type": "github" }, "original": { @@ -120,6 +143,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1629284811, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": [ "stylix", @@ -228,11 +266,11 @@ ] }, "locked": { - "lastModified": 1739470101, - "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=", + "lastModified": 1739823458, + "narHash": "sha256-uHjpcdlWKrZEJxsGdlMRTe4jlMYAnNsjRxPSTrNMFvo=", "owner": "nix-community", "repo": "home-manager", - "rev": "5031c6d2978109336637977c165f82aa49fa16a7", + "rev": "6c93eea85daddd0dc8d4a3a687473461f3122961", "type": "github" }, "original": { @@ -244,11 +282,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1739736696, + "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", "type": "github" }, "original": { @@ -261,6 +299,7 @@ "root": { "inputs": { "auto-cpufreq": "auto-cpufreq", + "firefox-addons": "firefox-addons", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "stylix": "stylix" @@ -274,7 +313,7 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": [ @@ -291,11 +330,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1739375014, - "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=", + "lastModified": 1739826051, + "narHash": "sha256-q1E9/4Hyahz/+Bd6HEKZq+Wi9HpI4XmAZG3P8CALT1E=", "owner": "danth", "repo": "stylix", - "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777", + "rev": "7feb1c29bf39ebe6b2984b2f77f9ad38f486e311", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 413cdfd..ddfb5a8 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,10 @@ url = "github:AdnanHodzic/auto-cpufreq"; inputs.nixpkgs.follows = "nixpkgs"; }; + firefox-addons = { + url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { @@ -25,7 +29,7 @@ home-manager, ... } @ inputs: let - system = "aarch64-linux"; + system = "x86_64-linux"; host = "garand-laptop"; username = "garand_plg"; in { @@ -44,8 +48,9 @@ home-manager.nixosModules.home-manager { home-manager.extraSpecialArgs = { - inherit username; + inherit system; inherit inputs; + inherit username; inherit host; }; home-manager.useGlobalPkgs = true; diff --git a/hosts/garand-laptop/home/programs.librewolf.nix b/hosts/garand-laptop/home/programs.librewolf.nix index cbd217b..b20bb44 100644 --- a/hosts/garand-laptop/home/programs.librewolf.nix +++ b/hosts/garand-laptop/home/programs.librewolf.nix @@ -1,5 +1,7 @@ { pkgs, + inputs, + system, host, ... }: { @@ -15,16 +17,29 @@ settings = { # Preferences (about:config) "general.useragent.locale" = "pl"; - "browser.sessionstore.resume_from_crash" = true; - "browser.tabs.insertRelatedAfterCurrent" = false; - "layout.css.prefers-color-scheme.content-override" = 0; - "layout.css.font-visibility" = 1; + "intl.locale.requested" = "pl,en-US"; + "intl.accept_languages" = "pl,en-US"; + "font.default.x-western" = "FiraCode Nerd Font"; "font.name.monospace.x-western" = "FiraCode Nerd Font Mono"; "font.name.sans-serif.x-western" = "FiraCode Nerd Font Propo"; "font.name.serif.x-western" = "FiraCode Nerd Font"; - "intl.locale.requested" = "pl,en-US"; - "intl.accept_languages" = "pl,en-US"; + + "layout.css.prefers-color-scheme.content-override" = 0; + "layout.css.font-visibility" = 1; + + "browser.tabs.insertRelatedAfterCurrent" = false; + "browser.sessionstore.resume_from_crash" = true; + "browser.sessionstore.resume_session_once" = true; + + "browser.eme.ui.enabled" = true; + "media.eme.enabled" = true; + + "privacy.donottrackheader.enabled" = true; + "privacy.clearOnShutdown.history" = true; + + "network.trr.mode" = 3; + "network.trr.uri" = "https://dns.mullvad.net/dns-query"; }; search = { default = "Garand's Search"; @@ -32,9 +47,51 @@ force = true; engines = { "Garand's Search" = { - definedAliases = ["@garand"]; + definedAliases = ["@g"]; urls = [{template = "https://search.garandplg.com/search?q={searchTerms}";}]; }; + "YouTube" = { + definedAliases = ["@yt"]; + urls = [ + { + template = "https://www.youtube.com/results"; + params = [ + { + name = "search_query"; + value = "{searchTerms}"; + } + ]; + } + ]; + }; + "Wikipedia (pl)" = { + definedAliases = ["@w"]; + urls = [ + { + template = "https://pl.wikipedia.org/w/index.php"; + params = [ + { + name = "search"; + value = "{searchTerms}"; + } + ]; + } + ]; + }; + "StackOverflow" = { + definedAliases = ["@so"]; + urls = [ + { + template = "https://stackoverflow.com/search"; + params = [ + { + name = "q"; + value = "{searchTerms}"; + } + ]; + } + ]; + }; "Nix Packages" = { definedAliases = ["@np"]; icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; @@ -65,11 +122,38 @@ } ]; }; + "Nix Wiki" = { + definedAliases = ["@nw"]; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + urls = [ + { + template = "https://wiki.nixos.org/w/index.php"; + params = [ + { + name = "search"; + value = "{searchTerms}"; + } + ]; + } + ]; + }; "Google".metaData.hidden = true; "Bing".metaData.hidden = true; "Wikipedia (en)".metaData.hidden = true; }; }; + extensions = with inputs.firefox-addons.packages.${system}; [ + bitwarden + ublock-origin + sponsorblock + darkreader + # flagfox + hoppscotch + mtab + return-youtube-dislikes + sponsorblock + pwas-for-firefox + ]; }; }; settings = { diff --git a/hosts/garand-laptop/home/programs.nix b/hosts/garand-laptop/home/programs.nix index 1e66de8..0518f0e 100644 --- a/hosts/garand-laptop/home/programs.nix +++ b/hosts/garand-laptop/home/programs.nix @@ -72,6 +72,7 @@ in { os-up-hm = "sudo nix flake update --update-input home-manager"; os-up-sx = "sudo nix flake update --update-input stylix"; os-up-af = "sudo nix flake update --update-input auto-cpufreq"; + os-up-fa = "sudo nix flake update --update-input firefox-addons"; fr = "nh os switch --hostname ${host} /home/${username}/zaneyos"; fu = "nh os switch --hostname ${host} --update /home/${username}/zaneyos"; hypr-cli = "hyprctl clients";