diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix index 7a17e98..47efebb 100644 --- a/home-manager/firefox.nix +++ b/home-manager/firefox.nix @@ -1,86 +1,12 @@ -{ - inputs, - pkgs, - ... -}: { +{inputs, ...}: { home.file.".mozilla/firefox/quadradical/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme; home.file.".mozilla/firefox/quadradical/chrome/nord.css".source = ./firefox-nord.css; programs.firefox = { enable = true; + profiles.quadradical = { isDefault = true; - - search = { - force = true; - default = "LibreY"; - engines = { - "Nix Package Search" = { - urls = [ - { - template = "https://search.nixos.org/packages"; - params = [ - { - name = "channel"; - value = "unstable"; - } - { - name = "query"; - value = "{searchTerms}"; - } - ]; - } - ]; - - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = ["@np"]; - }; - - "NixOS Option Search" = { - urls = [ - { - template = "https://search.nixos.org/options"; - params = [ - { - name = "channel"; - value = "unstable"; - } - { - 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}";}]; - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = ["@nw"]; - }; - - "Home Manager Option Search" = { - urls = [{template = "https://mipmip.github.io/home-manager-option-search/?query={searchTerms}";}]; - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = ["@hm"]; - }; - - "LibreY" = { - urls = [{template = "https://search.winscloud.net/search.php?q={searchTerms}";}]; - iconUpdateURL = "https://search.winscloud.net/favicon.ico"; - }; - - "Bing".metaData.hidden = true; - "Google".metaData.hidden = true; - "Amazon.ca".metaData.hidden = true; - "eBay".metaData.hidden = true; - }; - }; - userChrome = '' @import "firefox-gnome-theme/userChrome.css"; @import "nord.css" diff --git a/modules/common-desktop/dns.nix b/modules/common-desktop/dns.nix index e053f1e..1e150a7 100644 --- a/modules/common-desktop/dns.nix +++ b/modules/common-desktop/dns.nix @@ -1,11 +1,11 @@ { services.dnsproxy = { enable = true; - settings = { - upstream = ["https://base.dns.mullvad.net/dns-query"]; - bootstrap = ["1.1.1.1"]; - }; + settings.upstream = ["https://base.dns.mullvad.net/dns-query"]; }; - environment.etc."resolv.conf".text = "nameserver 0.0.0.0"; + environment.etc."resolv.conf".text = '' + nameserver 0.0.0.0 + nameserver 1.1.1.1 # Backup Nameserver + ''; } diff --git a/modules/common-desktop/firefox.nix b/modules/common-desktop/firefox.nix index 099c40e..540535e 100644 --- a/modules/common-desktop/firefox.nix +++ b/modules/common-desktop/firefox.nix @@ -1,4 +1,29 @@ {lib, ...}: { + # From https://hedgedoc.grimmauld.de/s/rVnTq0-Rs + nixpkgs.overlays = lib.singleton (final: prev: { + firefox = prev.firefox.overrideAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or []) ++ (with prev; [zip unzip gnused]); + buildCommand = + '' + export buildRoot="$(pwd)" + '' + + old.buildCommand + + '' + pushd $buildRoot + unzip $out/lib/firefox/browser/omni.ja -d patched_omni || ret=$? + if [[ $ret && $ret -ne 2 ]]; then + echo "unzip exited with unexpected error" + exit $ret + fi + rm $out/lib/firefox/browser/omni.ja + cd patched_omni + sed -i 's/"enterprise_only"\s*:\s*true,//' modules/policies/schema.sys.mjs + zip -0DXqr $out/lib/firefox/browser/omni.ja * # potentially qr9XD + popd + ''; + }); + }); + programs.firefox = { enable = true; @@ -65,41 +90,40 @@ "enhancerforyoutube@maximerf.addons.mozilla.org" ])); - # Have to disable search engines for now because mozilla stupidly only supports it on ESR... - - # SearchEngines = { - # Default = "DuckDuckGo"; - # Remove = ["Bing" "Google" "Amazon.ca" "eBay"]; - # Add = [ - # { - # Name = "Nix Package Search"; - # URLTemplate = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}"; - # IconURL = "https://github.com/NixOS/nixos-artwork/raw/refs/heads/master/logo/nix-snowflake-white.svg"; - # Alias = "np"; - # } - # { - # Name = "NixOS Option Search"; - # URLTemplate = "https://search.nixos.org/options?channel=unstable&query={searchTerms}"; - # IconURL = "https://github.com/NixOS/nixos-artwork/raw/refs/heads/master/logo/nix-snowflake-white.svg"; - # Alias = "no"; - # } - # { - # Name = "NixOS Wiki"; - # URLTemplate = "https://nixos.wiki/index.php?search={searchTerms}"; - # IconURL = "https://github.com/NixOS/nixos-artwork/raw/refs/heads/master/logo/nix-snowflake-white.svg"; - # Alias = "nw"; - # } - # { - # Name = "Home Manager Option Search"; - # URLTemplate = "https://mipmip.github.io/home-manager-option-search?query={searchTerms}"; - # IconURL = "https://github.com/NixOS/nixos-artwork/raw/refs/heads/master/logo/nix-snowflake-white.svg"; - # Alias = "hm"; - # } - # ]; - # }; + SearchEngines = { + Default = "DuckDuckGo"; + Remove = ["Bing" "Google" "Amazon.ca" "eBay"]; + Add = [ + { + Name = "Nix Package Search"; + URLTemplate = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}"; + IconURL = "https://github.com/NixOS/nixos-artwork/raw/refs/heads/master/logo/nix-snowflake-white.svg"; + Alias = "np"; + } + { + Name = "NixOS Option Search"; + URLTemplate = "https://search.nixos.org/options?channel=unstable&query={searchTerms}"; + IconURL = "https://github.com/NixOS/nixos-artwork/raw/refs/heads/master/logo/nix-snowflake-white.svg"; + Alias = "no"; + } + { + Name = "NixOS Wiki"; + URLTemplate = "https://nixos.wiki/index.php?search={searchTerms}"; + IconURL = "https://github.com/NixOS/nixos-artwork/raw/refs/heads/master/logo/nix-snowflake-white.svg"; + Alias = "nw"; + } + { + Name = "Home Manager Option Search"; + URLTemplate = "https://mipmip.github.io/home-manager-option-search?query={searchTerms}"; + IconURL = "https://github.com/NixOS/nixos-artwork/raw/refs/heads/master/logo/nix-snowflake-white.svg"; + Alias = "hm"; + } + ]; + }; Preferences = { "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "browser.uiCustomization.state" = "{\"placements\":{\"widget-overflow-fixed-list\":[],\"unified-extensions-area\":[],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"PersonalToolbar\":[\"personal-bookmarks\"]},\"seen\":[\"save-to-pocket-button\",\"developer-button\"],\"dirtyAreaCache\":[\"nav-bar\",\"PersonalToolbar\",\"toolbar-menubar\",\"TabsToolbar\"],\"currentVersion\":19}"; }; }; }; diff --git a/modules/common/fish.nix b/modules/common/fish.nix index 7e4b3ab..0ccbf41 100644 --- a/modules/common/fish.nix +++ b/modules/common/fish.nix @@ -28,9 +28,9 @@ commit = "git commit -am"; # NixOS - dev = "nix develop"; garbage = "run0 nix-collect-garbage -d && nix-collect-garbage -d"; rebuild = "run0 nixos-rebuild switch --flake ~/.config/nixos/#"; + update = "pushd ~/.config/nixos && nix flake update && rebuild && popd"; }; }; users.defaultUserShell = pkgs.fish; diff --git a/modules/common/git.nix b/modules/common/git.nix index 31d0d75..8734224 100644 --- a/modules/common/git.nix +++ b/modules/common/git.nix @@ -7,5 +7,5 @@ }; }; - environment.systemPackages = [pkgs.gh]; + environment.systemPackages = [pkgs.git-credential-manager]; }