diff --git a/flake.lock b/flake.lock index 5a7170e..50e5f9a 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1668992358, - "narHash": "sha256-24iH+wIbE1bKCFmqslwOpfrDypJ40mk1uGIqRUxDXxY=", + "lastModified": 1670028550, + "narHash": "sha256-jrCEzbRfcNBSy0YHYPLpMSeoluryej3EuqdMZsR1bhQ=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "066d4fd658acd075b45405eda9e3bca6a71a47b1", + "rev": "8f3697c4ea0b138255a30b65510a25d393c4ce4c", "type": "github" }, "original": { diff --git a/modules/applications/firefox.nix b/modules/applications/firefox.nix index ce817b3..389b3a1 100644 --- a/modules/applications/firefox.nix +++ b/modules/applications/firefox.nix @@ -7,9 +7,10 @@ home-manager.users.${config.user} = { - programs.firefox = { + programs.firefox = rec { enable = true; - package = lib.mkIf pkgs.stdenv.isDarwin pkgs.firefox-bin; + package = + if pkgs.stdenv.isDarwin then pkgs.firefox-bin else pkgs.firefox; extensions = with pkgs.nur.repos.rycee.firefox-addons; [ ublock-origin vimium @@ -20,26 +21,33 @@ okta-browser-plugin sponsorblock reddit-enhancement-suite + return-youtube-dislikes bypass-paywalls-clean markdownload darkreader snowflake don-t-fuck-with-paste i-dont-care-about-cookies + wappalyzer ]; - profiles.Profile0 = { + profiles.default = { id = 0; name = "default"; isDefault = true; settings = { + "app.update.auto" = false; "browser.aboutConfig.showWarning" = false; "browser.warnOnQuit" = false; - "browser.quitShortcut.disabled" = lib.mkIf pkgs.stdenv.isLinux true; + "browser.quitShortcut.disabled" = + if pkgs.stdenv.isLinux then true else false; "browser.theme.dark-private-windows" = true; "browser.toolbars.bookmarks.visibility" = "newtab"; "browser.startup.page" = 3; # Restore previous session "browser.newtabpage.enabled" = false; # Make new tabs blank "dom.forms.autocomplete.formautofill" = false; # Disable autofill + "extensions.formautofill.creditCards.enabled" = + false; # Disable credit cards + "dom.payments.defaults.saveAddress" = false; # Disable address save "general.autoScroll" = true; # Drag middle-mouse to scroll "services.sync.prefs.sync.general.autoScroll" = false; # Prevent disabling autoscroll @@ -60,6 +68,22 @@ .toolbar-items { background-color: ${config.theme.colors.base00} !important; } + /* Extra tab bar sides on macOS */ + .titlebar-spacer { + background-color: ${config.theme.colors.base00} !important; + } + .titlebar-buttonbox-container { + background-color: ${config.theme.colors.base00} !important; + } + #tabbrowser-tabs { + border-inline-start: 0 !important; + } + /* Private Browsing indicator on macOS */ + #private-browsing-indicator-with-label { + background-color: ${config.theme.colors.base00} !important; + margin-inline: 0 !important; + padding-inline: 7px; + } /* Tabs themselves */ .tabbrowser-tab .tab-stack { border-radius: 5px 5px 0 0;