From 14032df955ab027f692321f2f718cf72892a4443 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Wed, 4 Mar 2026 05:53:07 +0800 Subject: [PATCH] feat: Remove firefox module --- flake.lock | 105 +------ flake.nix | 8 - .../configurations/Tytonidae/default.nix | 1 - home/david/modules/programs/firefox.nix | 264 ------------------ home/modules/default.nix | 1 - nixos/modules/gui/default.nix | 4 - 6 files changed, 15 insertions(+), 368 deletions(-) delete mode 100644 home/david/modules/programs/firefox.nix diff --git a/flake.lock b/flake.lock index bb459a4..9162783 100644 --- a/flake.lock +++ b/flake.lock @@ -68,29 +68,6 @@ "type": "github" } }, - "betterfox-nix": { - "inputs": { - "flake-parts": "flake-parts", - "import-tree": "import-tree", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1765765778, - "narHash": "sha256-w7nVSCFHEcTcrbQEzVdx5MaE+7iTaAtLHjV2jfOTSCI=", - "owner": "HeitorAugustoLN", - "repo": "betterfox-nix", - "rev": "b3dae410c6f9e632955c67d77791ae231a7dd3c3", - "type": "github" - }, - "original": { - "owner": "HeitorAugustoLN", - "repo": "betterfox-nix", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1765145449, @@ -271,27 +248,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "betterfox-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -311,7 +267,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "neovim-nightly", @@ -332,7 +288,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -350,7 +306,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -371,7 +327,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nur", @@ -394,7 +350,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -552,21 +508,6 @@ "type": "github" } }, - "import-tree": { - "locked": { - "lastModified": 1763762820, - "narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=", - "owner": "vic", - "repo": "import-tree", - "rev": "3c23749d8013ec6daa1d7255057590e9ca726646", - "type": "github" - }, - "original": { - "owner": "vic", - "repo": "import-tree", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -591,7 +532,7 @@ }, "neovim-nightly": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "neovim-src": "neovim-src", "nixpkgs": "nixpkgs_4" }, @@ -690,7 +631,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1772442198, @@ -708,7 +649,7 @@ }, "nix-gaming": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "nixpkgs": "nixpkgs_5" }, @@ -1015,9 +956,9 @@ }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_4", "nixpkgs": "nixpkgs_7", - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1772402258, @@ -1077,7 +1018,7 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_5", "nixpkgs": "nixpkgs_8" }, "locked": { @@ -1160,11 +1101,10 @@ }, "root": { "inputs": { - "betterfox-nix": "betterfox-nix", "deploy-rs": "deploy-rs", "disko": "disko", "emacs-overlay": "emacs-overlay", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "helix": "helix", "home-manager": "home-manager", "lanzaboote": "lanzaboote", @@ -1271,7 +1211,7 @@ "spicetify-nix": { "inputs": { "nixpkgs": "nixpkgs_9", - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1772494187, @@ -1302,7 +1242,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_7", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1413,21 +1353,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1529,7 +1454,7 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index 5313ff1..a95a5e6 100644 --- a/flake.nix +++ b/flake.nix @@ -84,14 +84,6 @@ }; }; - betterfox-nix = { - type = "github"; - owner = "HeitorAugustoLN"; - repo = "betterfox-nix"; - inputs = { - nixpkgs.follows = "nixpkgs"; - }; - }; zen-browser = { type = "github"; owner = "0xc000022070"; diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index b1d8c6c..93eac6b 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -51,7 +51,6 @@ ghostty.enable = true; alacritty.enable = true; zed-editor.enable = true; - firefox.enable = true; zen-browser.enable = true; openssh.enable = true; helix.enable = true; diff --git a/home/david/modules/programs/firefox.nix b/home/david/modules/programs/firefox.nix deleted file mode 100644 index 0ee8757..0000000 --- a/home/david/modules/programs/firefox.nix +++ /dev/null @@ -1,264 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: let - cfg = config.david.programs.firefox; -in { - options = { - david.programs.firefox = { - enable = lib.mkEnableOption "firefox"; - }; - }; - config = lib.mkIf cfg.enable { - stylix.targets.firefox.profileNames = [ - "default" - ]; - programs.firefox = { - enable = true; - package = pkgs.firefox-beta; - betterfox = { - enable = true; - profiles.default = { - enableAllSections = true; - }; - }; - languagePacks = [ - "zh-CN" - "en-US" - ]; - profiles.default = { - name = "default"; - isDefault = true; - extensions = { - # settings = { - # "redirector@einaregilsson.com" = { - # settings = { - # redirects = [ - # { - # description = "NixOS Wiki"; - # exampleUrl = "http://nixos.wiki/wiki/Main_Page"; - # exampleResult = "http://wiki.nixos.org/wiki/Main_Page"; - # error = null; - # includePattern = "http(s?)://nixos.wiki/wiki/(.*)"; - # excludePattern = ""; - # patternDesc = ""; - # redirectUrl = "http$1://wiki.nixos.org/wiki/$2"; - # patternType = "R"; - # processMatches = "noProcessing"; - # disabled = false; - # grouped = false; - # appliesTo = [ - # "main_frame" - # ]; - # } - # ]; - # }; - # }; - # }; - packages = with pkgs.nur.repos.rycee.firefox-addons; [ - immersive-translate - tridactyl - redirector - ]; - }; - settings = { - "sidebar.verticalTabs" = true; - "sidebar.visibility" = "expand-on-hover"; - "sidebar.main.tools" = "syncedtabs,history,bookmarks,aichat"; - "sidebar.animation.expand-on-hover.duration-ms" = 150; - "sidebar.revamp" = true; - "browser.tabs.closeTabByDblclick" = true; - }; - search = { - force = true; - default = "ddg"; - engines = { - "Guix Packages" = { - urls = [ - { - template = "https://packages.guix.gnu.org/search/"; - params = [ - { - name = "query"; - value = "{searchTerms}"; - } - ]; - } - ]; - definedAliases = ["@gp"]; - }; - "Nix Packages" = { - urls = [ - { - template = "https://search.nixos.org/packages"; - params = [ - { - name = "type"; - value = "packages"; - } - { - name = "query"; - value = "{searchTerms}"; - } - ]; - } - ]; - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = ["@np"]; - }; - "Nix Options" = { - urls = [ - { - template = "https://search.nixos.org/options"; - params = [ - { - name = "channel"; - value = "unstable"; - } - { - name = "query"; - value = "{searchTerms}"; - } - ]; - } - ]; - definedAliases = ["@no"]; - }; - "Home Manager Options" = { - urls = [ - { - template = "https://home-manager-options.extranix.com"; - params = [ - { - name = "query"; - value = "{searchTerms}"; - } - { - name = "release"; - value = "master"; - } - ]; - } - ]; - definedAliases = ["@hm"]; - }; - "Nix Flakes" = { - urls = [ - { - template = "https://search.nixos.org/flakes"; - params = [ - { - name = "channel"; - value = "unstable"; - } - { - name = "query"; - value = "{searchTerms}"; - } - ]; - } - ]; - definedAliases = ["@nf"]; - }; - "NixOS Wiki" = { - urls = [ - { - template = "https://wiki.nixos.org/w/index.php"; - params = [ - { - name = "search"; - value = "{searchTerms}"; - } - ]; - } - ]; - definedAliases = ["@nw"]; - }; - "Rust Stdandard Lib" = { - urls = [ - { - template = "https://doc.rust-lang.org/nightly/std/index.html"; - params = [ - { - name = "search"; - value = "{searchTerms}"; - } - ]; - } - ]; - definedAliases = ["@rs"]; - }; - "GitHub" = { - urls = [ - { - template = "https://github.com/search"; - params = [ - { - name = "q"; - value = "{searchTerms}"; - } - { - name = "type"; - value = "repositories"; - } - ]; - } - ]; - definedAliases = ["@gh"]; - }; - "Rust Reference" = { - urls = [ - { - template = "https://doc.rust-lang.org/nightly/reference"; - params = [ - { - name = "search"; - value = "{searchTerms}"; - } - ]; - } - ]; - definedAliases = ["@rr"]; - }; - "Rust Crates" = { - urls = [ - { - template = "https://crates.io/search"; - params = [ - { - name = "q"; - value = "{searchTerms}"; - } - ]; - } - ]; - definedAliases = ["@rc"]; - }; - "C++ Reference" = { - urls = [ - { - template = "https://duckduckgo.com/"; - params = [ - { - name = "q"; - value = "{searchTerms}"; - } - { - name = "sites"; - value = "cppreference.com"; - } - ]; - } - ]; - definedAliases = ["@cr"]; - }; - "bing".metaData.hidden = true; - "google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias - }; - }; - }; - }; - }; -} diff --git a/home/modules/default.nix b/home/modules/default.nix index c6aff89..454df38 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -6,7 +6,6 @@ imports = (with inputs; [ sops-nix.homeManagerModules.sops - betterfox-nix.homeModules.betterfox nix4nvchad.homeManagerModule noctalia.homeModules.default zen-browser.homeModules.twilight diff --git a/nixos/modules/gui/default.nix b/nixos/modules/gui/default.nix index 270b3d1..2b38749 100644 --- a/nixos/modules/gui/default.nix +++ b/nixos/modules/gui/default.nix @@ -27,10 +27,6 @@ in { environment.systemPackages = with pkgs; [ fontconfig ]; - programs.firefox = { - enable = true; - package = pkgs.firefox-beta; - }; sops.secrets = with lib; with builtins;