From 75d88d5a28594b8629eab8a9bb4ab326b91ee8f0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 4 Oct 2024 16:57:31 +0200 Subject: [PATCH] Let's try and replace firefox with floorp --- home-manager/desktop/default.nix | 2 - .../desktop/package-configs/firefox.nix | 341 +----------------- .../package-configs/firefox/default.nix | 29 +- 3 files changed, 17 insertions(+), 355 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 0f2d8fe..172248b 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -144,8 +144,6 @@ enable = true; package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ - catppuccin.catppuccin-vsc - catppuccin.catppuccin-vsc-icons catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc-icons charliermarsh.ruff diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 0da278d..43f4854 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -6,7 +6,7 @@ programs.firefox = { enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; - package = pkgs.firefox; + package = pkgs.floorp; profiles.lillian = { isDefault = true; settings = { @@ -28,345 +28,6 @@ "toolkit.legacyUserProfileCustomizations.stylesheets" = true; "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "DuckDuckGo"; }; - userChrome = '' - /* - Title: Drannex42's FirefoxSidebar / Vertical Tabs - Description: Vertical tab design for Firefox with dynamic indentation:: - Sideberry and TreeStyleTabs (Legacy) themes available! - Repository URL: https://github.com/drannex42/FirefoxSidebar - Version: 12022.04.17 - */ - - :root { - --sidebar-width: 50px; - --toolbar-height: 10px; - --menubar-height: 100px; - --sidebar-padding: calc(var(--sidebar-width) + 5px); - --toolbar-start-end-padding: 5px !important; - - /* Custom Sidebar/Header Backround :: - This sets the background for the other sidebar options (bookmarks, history, in case it is transparent from a theme that is not set up properly - */ - /* --custom-sidebar-bg: Field; /* Default: Field (Disabled) */ - /* --custom-sidebar-header-bg: #000; */ - - /* ====== Extension Settings ====== */ - - /* Window Control / Client Side Display Settings === - If you are putting this on the left or right side uncomment the side - preferences below and comment the other - ========================================================================= - */ - --csd-width: 100px; - --csd-top: 8px; - - /* - CSD - Left Side === - Default: --csd-left: 50px; --csd-margin-left: 92px; - */ - - /* - --csd-left: 50px; - --csd-margin-left: 92px; - */ - - /* - CSD - Right Side === - Defaults: --csd-right: 0px; --csd-margin-right: 95px; - */ - - --csd-right: 36px; - --csd-margin-right: 130px; - - /* === END: Window Control / Client Side Display Settings === */ - - /* === END: Extension Settings === */ - - } - - - /* ========================================================================= */ - - /* - Extension (Core): Sidebar - Description: This is the core implementation of the sidebar used in drannex42's FirefoxSidebar. - Repository URL: https://github.com/drannex42/FirefoxSidebar - Version: v12024.05.15 (YYYYY.MM.DD) - */ - - #main-window #TabsToolbar { - visibility: collapse; - } - - /* As of v12024.05.15 we updated to using this one by MrOtherGuy, with modifications */ - /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/autohide_sidebar.css made available under Mozilla Public License v. 2.0 */ - - /* Show sidebar only when the cursor is over it */ - /* The border controlling sidebar width will be removed so you'll need to modify these values to change width */ - - #sidebar-box { - --uc-sidebar-width: 50px; - --uc-sidebar-hover-width: 260px; - --uc-autohide-sidebar-delay: 10ms; - /* Wait 0.6s before hiding sidebar */ - --uc-autohide-transition-duration: 115ms; - --uc-autohide-transition-type: linear; - position: relative; - min-width: var(--uc-sidebar-width) !important; - width: var(--uc-sidebar-width) !important; - max-width: var(--uc-sidebar-width) !important; - z-index: 1; - margin-top: -40px; - } - - - #sidebar-box[positionend] { - direction: rtl - } - - #sidebar-box[positionend]>* { - direction: ltr - } - - #sidebar-box[positionend]:-moz-locale-dir(rtl) { - direction: ltr - } - - #sidebar-box[positionend]:-moz-locale-dir(rtl)>* { - direction: rtl - } - - #main-window[sizemode="fullscreen"] #sidebar-box { - --uc-sidebar-width: 1px; - } - - #sidebar-splitter { - display: none - } - - #sidebar-header { - overflow: hidden; - color: var(--chrome-color, inherit) !important; - padding-inline: 0 !important; - background: var(--custom-sidebar-header-bg, inherit) !important; - padding: 8px 12px !important; - padding-top: 9px !important; - border-bottom: none !Important; - } - - #sidebar-header::before, - #sidebar-header::after { - content: ""; - display: flex; - padding-left: 0px; - } - - #sidebar-header, - #sidebar { - transition: min-width var(--uc-autohide-transition-duration) var(--uc-autohide-transition-type) var(--uc-autohide-sidebar-delay) !important; - min-width: var(--uc-sidebar-width) !important; - will-change: min-width; - } - - #sidebar-box:hover>#sidebar-header, - #sidebar-box:hover>#sidebar { - min-width: var(--uc-sidebar-hover-width) !important; - width: var(--uc-sidebar-hover-width) !important; - transition-delay: 0ms !important; - } - - #sidebar-box>#sidebar-header #sidebar-title { - opacity: 0; - } - - #sidebar-box:hover>#sidebar-header #sidebar-title { - opacity: 1; - } - - .sidebar-panel { - background-color: transparent !important; - color: var(--newtab-text-primary-color) !important; - } - - .sidebar-panel #search-box { - -moz-appearance: none !important; - background-color: rgba(249, 249, 250, 0.1) !important; - color: inherit !important; - } - - /* Add sidebar divider and give it background */ - - #sidebar, - #sidebar-header { - background-color: inherit !important; - border-right: 1px solid var(--sidebar-border-color); - border-inline-width: 0px 1px; - } - - #sidebar-box:not([positionend])> :-moz-locale-dir(rtl), - #sidebar-box[positionend]>* { - border-inline-width: 1px 0px; - } - - - /* Move statuspanel to the other side when sidebar is hovered so it doesn't get covered by sidebar */ - - #sidebar-box:not([positionend]):hover~#appcontent #statuspanel { - inset-inline: auto 0px !important; - } - - #sidebar-box:not([positionend]):hover~#appcontent #statuspanel-label { - margin-inline: 0px !important; - border-left-style: solid !important; - } - - - .browser-toolbar { - padding-left: var(--sidebar-width) !important; - position: relative !important; - } - - #PersonalToolbar { - padding: 2px 5px !important; - padding-top: 0px !important; - margin-top: 0px !important; - padding-left: calc(var(--sidebar-width) + 6px) !important; - } - - - /* - Extensions :: - To enable/disable specific extensions just comment/uncomment the line below. - ========================================================================= - */ - - /* - Extension: Window Controls / Client Side Decorations (CSD) - Description: This brings the window controls into the main bar (where the address bar exists). Please see the prefs.css folder for switching the sides from left to right. - Repository URL: https://github.com/drannex42/FirefoxSidebar - Contributors: Mr-nUUb, Xanaxus, Drannex42 - Issue URL: https://github.com/drannex42/FirefoxSidebar/issues/14 - */ - - /* allow the buttons to appear */ - .browser-toolbar { - position: unset !important; - } - - /* reserve space for buttons */ - #nav-bar { - padding-right: var(--csd-margin-right) !important; - margin-left: var(--csd-margin-left) !important; - } - - /* move buttons next to menu button */ - .titlebar-buttonbox-container { - visibility: visible !important; - position: fixed !important; - display: block; - z-index: 999999999; - top: var(--csd-top, inherit); - right: var(--csd-right, inherit); - left: var(--csd-left, inherit); - max-width: var(--csd-width); - } - - /* hide buttons in fullscreen mode (video player and F11) */ - #main-window[inFullscreen="true"] .titlebar-buttonbox-container, - #main-window[inDOMFullscreen="true"] .titlebar-buttonbox-container { - visibility: hidden !important; - } - - /* remove empty space when in fullscreen mode (F11) */ - #main-window[inFullscreen="true"] #nav-bar { - padding-right: 0px !important; - margin-left: 0px !important; - } - - /* END Client Side Decorations / Window Controls */ - - - - /* - Extension: Superbox Removal (and compaction) - Description: This removes the superbox and fixes some padding around the urlbar. - Repository URL: https://github.com/drannex42/FirefoxSidebar - */ - - /* --- Prevent enlargement */ - #urlbar[breakout-extend] { - /* top: calc( */ - /* (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 */ - /* ) !important; */ - /* Fix due to deprecation https://www.reddit.com/r/firefox/comments/1cs3g49/address_bar_suggestions_going_up_instead_of_down/ */ - top: calc((var(--urlbar-container-height, --urlbar-toolbar-height) - var(--urlbar-height)) / 2) !important; - left: 0 !important; - width: 100% !important; - } - - #urlbar[breakout-extend] #urlbar-input-container { - height: var(--urlbar-height) !important; - /* padding: 0px !important; */ - padding-block: 0px !important; - padding-inline: 0px !important; - } - - .urlbarView-row { - padding: 0px 2px 0px 2px; - } - - /* END Prevent enlargement --- */ - - /*/* --- Reduce row paddings to make them more compact */ - .urlbarView-row { - padding: 2px 0px !important; - line-height: 1.2em !important; - margin: -1px; - margin-bottom: 0px; - } - - .urlbarView-row-inner { - padding-bottom: 6px !important; - } - - .urlbarView { - margin: 0px !important; - width: 100% !important; - } - - /* END Reduce row paddings to make them more compact --- */ - - /* Disable Urlbar Animation */ - #urlbar[breakout][breakout-extend][breakout-extend-animate]>#urlbar-background { - animation-name: none !important; - animation: none !important; - } - - /* END Disable Urlbar Animation */ - - /* --- More compact "Search with Google" rows */ - .urlbarView-row[dynamicType="onboardTabToSearch"]>.urlbarView-row-inner { - min-height: auto !important; - width: auto !important; - } - - .urlbarView-row[dynamicType="onboardTabToSearch"]>.urlbarView-row-inner>.urlbarView-no-wrap>.urlbarView-favicon { - margin-bottom: -1px; - } - - /* END More compact "Search with Google" rows --- */ - - /* Remove active border on the addressbar when in focus */ - #nav-bar { - --toolbar-field-focus-border-color: #ccc; - } - - /* Remove box shadow on address bar */ - #urlbar-background, - #searchbar { - box-shadow: none !important; - } - ''; bookmarks = [ { name = "estrogen production"; diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 394788b..432111e 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -5,7 +5,7 @@ }: { programs.firefox = { enable = true; - package = pkgs.firefox; + package = pkgs.floorp; policies = { DisableTelemetry = true; DisableFirefoxStudies = true; @@ -28,16 +28,16 @@ }; ExtensionSettings = { # "*".installation_mode = "blocked"; # blocks all addons except the ones specified below - # Catppuccin Macchiato - Lavender theme: - "{6396519b-0923-41a4-948a-3cb54a3918b3}" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-macchiato-lavender/latest.xpi"; + # Catppuccin Macchiato - Mauve theme: + "{55750c61-e5f3-4d9a-898d-0643b3093678}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-macchiato-mauve/latest.xpi"; installation_mode = "force_installed"; }; # Sideberry: - "{3c078156-979c-498b-8990-85f7987dd929}" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi"; - installation_mode = "force_installed"; - }; + #"{3c078156-979c-498b-8990-85f7987dd929}" = { + # install_url = "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi"; + # installation_mode = "force_installed"; + #}; # Privacy Badger: "jid1-MnnxcxisBPnSXQ@jetpack" = { install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi"; @@ -118,10 +118,6 @@ install_url = "https://addons.mozilla.org/firefox/downloads/file/4047136/wayback_machine_new-3.2.xpi"; installation_mode = "force_installed"; }; - "frankerfacez@frankerfacez.com" = { - install_url = "https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi"; - installation_mode = "force_installed"; - }; }; FirefoxHome = { Search = true; @@ -141,11 +137,18 @@ "browser.compactmode.show" = true; "browser.uidensity" = 0; # "browser.newtabpage.activity-stream.feeds.topsites" = false; - # "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.newtabpage.activity-stream.showSponsored" = false; + "browser.newtabpage.activity-stream.system.showSponsored" = false; "font.name.serif.x-western" = "Crimson"; "font.name.sans-serif.x-western" = "Atkinson Hyperlegible"; "font.name.monospace.x-western" = "FiraCode Nerd Font"; "font.size.variable.x-western" = 14; + "floorp.browser.sidebar.useIconProvider" = "duckduckgo"; + "floorp.browser.tabbar.settings" = 2; + "floorp.browser.tabs.verticaltab" = true; + "floorp.tabbar.style" = 2; + "floorp.browser.user.interface" = 8; "signon.rememberSignons" = true; }; # TODO: switch to ManagedBookmarks as this will be dropped at some point https://mozilla.github.io/policy-templates/#managedbookmarks