diff --git a/home-manager/browser.nix b/home-manager/browser.nix deleted file mode 100644 index 63d2303..0000000 --- a/home-manager/browser.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, pkgs, inputs, ...}: -{ - programs.chromium = { - enable = true; - package = pkgs.ungoogled-chromium; - extensions = [ - { id = "eimadpbcbfnmbkopoojfekhnkhdbieeh"; } # Dark-Reader - { id = "ldpochfccmkkmhdbclfhpagapcfdljkj"; } # Decentraleyes - { id = "bkdgflcldnnnapblkhphbgpggdiikppg"; } # DuckDuckGo - { - id = "dcpihecpambacapedldabdbpakmachpb"; - updateUrl = - "https://raw.githubusercontent.com/iamadamdev/bypass-paywalls-chrome/master/updates.xml"; - } - { id = "dbepggeogbaibhgnhhndojpepiihcmeb"; } # Vimium - { id = "mnjggcdmjocbbbhaepdhchncahnbgone"; } # Sponsorblock - ]; - }; -} diff --git a/home-manager/firefox/config/annoyances.nix b/home-manager/firefox/config/annoyances.nix index 18eaa39..d8e6afb 100644 --- a/home-manager/firefox/config/annoyances.nix +++ b/home-manager/firefox/config/annoyances.nix @@ -44,4 +44,8 @@ # some video sites. "media.autoplay.enabled" = true; "media.autoplay.default" = 0; + # Opens PDFs in the browser + "browser.download.open_pdf_attachments_inline" = true; + "browser.download.useDownloadDir" = false; + "browser.download.dir" = "/tmp"; } diff --git a/home-manager/firefox/default.nix b/home-manager/firefox/default.nix index 6211a11..ef793d2 100644 --- a/home-manager/firefox/default.nix +++ b/home-manager/firefox/default.nix @@ -1,5 +1,53 @@ { pkgs, lib, ... }: let merge = lib.foldr (a: b: a // b) { }; +search = { + default = "DuckDuckGo"; + force = true; + engines = { + # don't need these default ones + "Amazon.com".metaData.hidden = true; + "Bing".metaData.hidden = true; + "eBay".metaData.hidden = true; + + "DuckDuckGo" = { + urls = [{ + template = "https://duckduckgo.com"; + params = [ + { name = "q"; value = "{searchTerms}"; } + ]; + }]; + definedAliases = [ ",d" ]; + }; + "Nix Packages" = { + urls = [{ + template = "https://search.nixos.org/packages"; + params = [ + { name = "type"; value = "packages"; } + { name = "query"; value = "{searchTerms}"; } + ]; + }]; + definedAliases = [ ",n" ]; + }; + "Wikipedia" = { + urls = [{ + template = "https://en.wikipedia.org/wiki/Special:Search"; + params = [ + { name = "search"; value = "{searchTerms}"; } + ]; + }]; + definedAliases = [ ",w" ]; + }; + "GitHub" = { + urls = [{ + template = "https://github.com/search"; + params = [ + { name = "q"; value = "{searchTerms}"; } + ]; + }]; + definedAliases = [ ",gh" ]; + }; + }; +}; in { programs.firefox = { enable = true; @@ -17,17 +65,13 @@ in { extensions = with pkgs.nur.repos.rycee.firefox-addons; [ clearurls darkreader - #df-youtube - #facebook-container - #octotree - #okta-browser-plugin - #onepassword-password-manager - #plasma-integration - #return-youtube-dislikes sponsorblock ublock-origin - #vimium + keepassxc-browser + youtube-nonstop + vimium ]; + inherit search; }; # This does not have as strict privacy settings as the default profile. # It uses the default firefox settings. Useful when something is not @@ -39,17 +83,12 @@ in { extensions = with pkgs.nur.repos.rycee.firefox-addons; [ clearurls darkreader - #df-youtube - #facebook-container - #octotree - #okta-browser-plugin - #onepassword-password-manager - #plasma-integration - #return-youtube-dislikes sponsorblock ublock-origin - #vimium + youtube-nonstop + vimium ]; + inherit search; }; }; }; diff --git a/users/kopatz/home.nix b/users/kopatz/home.nix index e3711f5..fe0a2c2 100644 --- a/users/kopatz/home.nix +++ b/users/kopatz/home.nix @@ -15,7 +15,6 @@ imports = [ ../../home-manager/nvim.nix ../../home-manager/code.nix - #../../home-manager/browser.nix extensions dont work with ungoogled chromium sadly ../../home-manager/zsh.nix ../../home-manager/gtk-theme.nix ../../home-manager/direnv.nix @@ -24,7 +23,6 @@ ../../home-manager/rofi.nix ../../home-manager/kde-path.nix ../../home-manager/firefox - #../../home-manager/syncthing.nix inputs.nix-colors.homeManagerModule ];