diff --git a/apps/gui/firefox.nix b/apps/gui/firefox.nix index 6f2869d1b4a699e7df0d3c530a1d98a7744c55d9..07d160cba757ddff293c6863076b35de627153d0 100644 --- a/apps/gui/firefox.nix +++ b/apps/gui/firefox.nix @@ -1,22 +1,4 @@ { pkgs, ... }: -let - tailnet = [ - "go" - "paste" - "git" - "cfg" - "jellyfin" - "sonarr" - "radarr" - "bazarr" - "prowlarr" - "files" - "privserve" - "pubserve" - "img" - "monit" - ]; -in { programs.firefox = { enable = true; @@ -68,36 +50,37 @@ multi-account-containers refined-github ublock-origin ]; - settings = - { - "app.update.auto" = false; - "signon.rememberSignons" = false; - "browser.formfill.enable" = false; - "browser.tabs.firefox-view" = false; - "browser.aboutConfig.showWarning" = false; - "browser.bookmarks.addedImportButton" = false; - "extensions.pocket.enabled" = false; - "browser.newtabpage.activity-stream.feeds.section.topstories" = false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; - "browser.newtabpage.pinned" = builtins.toJSON [ - { - url = "https://github.com/"; - label = "github"; - } - { - url = "https://git.jolheiser.com"; - label = "ugit"; - } - ]; - } - // - # Tailscale apps - (builtins.listToAttrs ( - builtins.map (app: { - name = "browser.fixup.domainwhitelist.${app}"; - value = true; - }) tailnet - )); + settings = { + "app.update.auto" = false; + "signon.rememberSignons" = false; + "browser.formfill.enable" = false; + "browser.tabs.firefox-view" = false; + "browser.aboutConfig.showWarning" = false; + "browser.bookmarks.addedImportButton" = false; + "extensions.pocket.enabled" = false; + "browser.newtabpage.activity-stream.feeds.section.topstories" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.newtabpage.pinned" = builtins.toJSON [ + { + url = "https://github.com/"; + label = "github"; + } + { + url = "https://git.jolheiser.com"; + label = "ugit"; + } + ]; + # tailscale apps + "browser.fixup.domainwhitelist.go" = true; + "browser.fixup.domainwhitelist.git" = true; + "browser.fixup.domainwhitelist.paste" = true; + "browser.fixup.domainwhitelist.radarr" = true; + "browser.fixup.domainwhitelist.sonarr" = true; + "browser.fixup.domainwhitelist.jellyfin" = true; + "browser.fixup.domainwhitelist.files" = true; + "browser.fixup.domainwhitelist.pubserve" = true; + "browser.fixup.domainwhitelist.privserve" = true; + }; bookmarks = { force = true; settings = [ @@ -163,26 +146,6 @@ "tailscale" ]; keyword = "cfg"; url = "https://cfg"; - } - { - name = "beszel"; - tags = [ - "beszel" - "monit" - "tailscale" - ]; - keyword = "monit"; - url = "https://monit"; - } - { - name = "MAZANOKE"; - tags = [ - "mazanoke" - "img" - "tailscale" - ]; - keyword = "img"; - url = "http://img"; } { name = "media";