From dcdfdbaa47009b5342003234799cf0f5f01605c0 Mon Sep 17 00:00:00 2001 From: twoneis Date: Tue, 2 Jul 2024 03:07:38 +0200 Subject: [PATCH] firefox on same level --- modules/user/firefox.nix | 240 +++++++++++++++++++------------------- modules/user/programs.nix | 8 +- 2 files changed, 125 insertions(+), 123 deletions(-) diff --git a/modules/user/firefox.nix b/modules/user/firefox.nix index db53068..f5ce675 100644 --- a/modules/user/firefox.nix +++ b/modules/user/firefox.nix @@ -1,127 +1,129 @@ { pkgs, ... }: { - programs.firefox = { - enable = true; - profiles = { - "default" = { - id = 0; + home-manager.users.twnoneis = { + programs.firefox = { + enable = true; + profiles = { + "default" = { + id = 0; - search.default = "Startpage"; - search.privateDefault = "Startpage"; - search.engines = { - "DuckDuckGo".metaData.hidden = true; - "Google".metaData.hidden = true; - "Amazon.com".metaData.hidden = true; - "Bing".metaData.hidden = true; - "Wikipedia (en)".metaData.hidden = true; - "Startpage" = { - urls = [{ - template = "https://startpage.com/sp/search"; - params = [ - { name = "query"; value = "{searchTerms}"; } - ]; - }]; - definedAliases = [ "@sp" ]; + search.default = "Startpage"; + search.privateDefault = "Startpage"; + search.engines = { + "DuckDuckGo".metaData.hidden = true; + "Google".metaData.hidden = true; + "Amazon.com".metaData.hidden = true; + "Bing".metaData.hidden = true; + "Wikipedia (en)".metaData.hidden = true; + "Startpage" = { + urls = [{ + template = "https://startpage.com/sp/search"; + params = [ + { name = "query"; value = "{searchTerms}"; } + ]; + }]; + definedAliases = [ "@sp" ]; + }; + "DuckDuckGoo" = { + urls = [{ + template = "https://duckduckgo.com/"; + params = [ + { name = "q"; value = "{searchTerms}"; } + ]; + }]; + definedAliases = [ "@ddg" ]; + }; + "Googlee" = { + urls = [{ + template = "https://google.com/search"; + params = [ + { name = "q"; value = "{searchTerms}"; } + ]; + }]; + definedAliases = [ "@g" ]; + }; + "Wikipedia" = { + urls = [{ + template = "https://en.wikipedia.org/wiki/Special:Search"; + params = [ + { name = "search"; value = "{searchTerms}"; } + ]; + }]; + definedAliases = [ "@wiki" ]; + }; + "YouTube" = { + urls = [{ + template = "https://youtube.com/results"; + params = [ + { name = "search_query"; value = "{searchTerms}"; } + ]; + }]; + definedAliases = [ "@yt" ]; + }; + "Nix Packages" = { + urls = [{ + template = "https://search.nixos.org/packages"; + params = [ + { name = "type"; value = "packages"; } + { name = "query"; value = "{searchTerms}"; } + ]; + }]; + definedAliases = [ "@np" ]; + }; + "Github" = { + urls = [{ + template = "https://github.com/search"; + params = [ + { name = "q"; value = "{searchTerms}"; } + { name = "type"; value = "repositories"; } + ]; + }]; + definedAliases = [ "@gh" ]; + }; }; - "DuckDuckGoo" = { - urls = [{ - template = "https://duckduckgo.com/"; - params = [ - { name = "q"; value = "{searchTerms}"; } - ]; - }]; - definedAliases = [ "@ddg" ]; - }; - "Googlee" = { - urls = [{ - template = "https://google.com/search"; - params = [ - { name = "q"; value = "{searchTerms}"; } - ]; - }]; - definedAliases = [ "@g" ]; - }; - "Wikipedia" = { - urls = [{ - template = "https://en.wikipedia.org/wiki/Special:Search"; - params = [ - { name = "search"; value = "{searchTerms}"; } - ]; - }]; - definedAliases = [ "@wiki" ]; - }; - "YouTube" = { - urls = [{ - template = "https://youtube.com/results"; - params = [ - { name = "search_query"; value = "{searchTerms}"; } - ]; - }]; - definedAliases = [ "@yt" ]; - }; - "Nix Packages" = { - urls = [{ - template = "https://search.nixos.org/packages"; - params = [ - { name = "type"; value = "packages"; } - { name = "query"; value = "{searchTerms}"; } - ]; - }]; - definedAliases = [ "@np" ]; - }; - "Github" = { - urls = [{ - template = "https://github.com/search"; - params = [ - { name = "q"; value = "{searchTerms}"; } - { name = "type"; value = "repositories"; } - ]; - }]; - definedAliases = [ "@gh" ]; + search.force = true; + search.order = [ + "Startpage" + "DuckDuckGoo" + "Googlee" + "Wikipedia" + "YouTube" + "Nix Packages" + "Github" + ]; + + bookmarks = { }; + + settings = { + "browser.startup.blankWindow" = true; + "browser.startup.page" = 3; + "extensions.pocket.enabled" = false; + "identity.fxaccounts.enabled" = false; + "browser.tabs.closeWindowWithLastTab" = false; + "browser.bookmarks.addedImportButton" = false; + "dom.security.https_only_mode" = true; + "browser.newtabpage.enabled" = false; + "browser.shell.checkDefaultBrowser" = false; + "signon.rememberSignons" = false; + "browser.preferences.moreFromMozilla" = false; + "browser.toolbars.bookmarks.visibility" = "never"; + "media.videocontrols.picture-in-picture.enabled" = false; + "browser.translation.enable" = false; + "media.cache_readhead_limit" = 9999; + "media.cache_resume_threshold" = 9999; }; + + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + bitwarden + sponsorblock + ublock-origin + consent-o-matic + pronoundb + web-scrobbler + return-youtube-dislikes + youtube-nonstop + enhancer-for-youtube + ]; }; - search.force = true; - search.order = [ - "Startpage" - "DuckDuckGoo" - "Googlee" - "Wikipedia" - "YouTube" - "Nix Packages" - "Github" - ]; - - bookmarks = { }; - - settings = { - "browser.startup.blankWindow" = true; - "browser.startup.page" = 3; - "extensions.pocket.enabled" = false; - "identity.fxaccounts.enabled" = false; - "browser.tabs.closeWindowWithLastTab" = false; - "browser.bookmarks.addedImportButton" = false; - "dom.security.https_only_mode" = true; - "browser.newtabpage.enabled" = false; - "browser.shell.checkDefaultBrowser" = false; - "signon.rememberSignons" = false; - "browser.preferences.moreFromMozilla" = false; - "browser.toolbars.bookmarks.visibility" = "never"; - "media.videocontrols.picture-in-picture.enabled" = false; - "browser.translation.enable" = false; - "media.cache_readhead_limit" = 9999; - "media.cache_resume_threshold" = 9999; - }; - - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ - bitwarden - sponsorblock - ublock-origin - consent-o-matic - pronoundb - web-scrobbler - return-youtube-dislikes - youtube-nonstop - enhancer-for-youtube - ]; }; }; }; diff --git a/modules/user/programs.nix b/modules/user/programs.nix index f7c8e9e..07cda30 100644 --- a/modules/user/programs.nix +++ b/modules/user/programs.nix @@ -1,4 +1,8 @@ { config, pkgs, ... }: { + imports = [ + ./firefox.nix + ]; + networking.firewall.allowedTCPPorts = [ 57621 # spotifyd ]; @@ -9,10 +13,6 @@ }; home-manager.users.twoneis = { - imports = [ - ./firefox.nix - ]; - home.packages = with pkgs; [ signal-desktop vesktop