diff --git a/flake.lock b/flake.lock index c0ea2ab..cb0de46 100644 --- a/flake.lock +++ b/flake.lock @@ -1040,11 +1040,11 @@ ] }, "locked": { - "lastModified": 1733477263, - "narHash": "sha256-7bIjM15TyfZU+/EjTaA2XlBD6XE75/7H2ffJZPd7agQ=", + "lastModified": 1733621215, + "narHash": "sha256-7fKqaPkD9E0Niu6/Y6zj1aBvr5KUQzV4zw2JYb7abpY=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "e2ab636ee8ba1ca8455e5fc37b9ed0148a66be3a", + "rev": "b6d3347c4d38e7e1900a5b4dedac1061806dc592", "type": "github" }, "original": { diff --git a/overlays/default.nix b/overlays/default.nix index 6033907..6126118 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -14,6 +14,7 @@ in (import ../pkgs { inherit pkgs; }) (self: super: { zen-browser = inputs.zen-browser.packages.${system}.default; + zen-browser-unwrapped = inputs.zen-browser.packages.${system}.zen-browser-unwrapped; }) ]; } diff --git a/users/youwen/linux/packages/common-packages.nix b/users/youwen/linux/packages/common-packages.nix index e816652..9cbf84c 100644 --- a/users/youwen/linux/packages/common-packages.nix +++ b/users/youwen/linux/packages/common-packages.nix @@ -39,6 +39,4 @@ pkgs: with pkgs; [ gcc hledger - - zen-browser ] diff --git a/users/youwen/linux/programs/default.nix b/users/youwen/linux/programs/default.nix index 395ffc2..1002fd0 100644 --- a/users/youwen/linux/programs/default.nix +++ b/users/youwen/linux/programs/default.nix @@ -1,5 +1,30 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: +let + # mkFirefoxModule = inputs.home-manager.mkFirefoxModule; + mkFirefoxModule = import "${inputs.home-manager}/modules/programs/firefox/mkFirefoxModule.nix"; +in { + + imports = [ + (mkFirefoxModule { + modulePath = [ + "programs" + "zen" + ]; + name = "Zen"; + wrappedPackageName = "zen-browser"; + unwrappedPackageName = "zen-browser-unwrapped"; + visible = true; + + platforms.linux = { + configPath = ".zen"; + vendorPath = ".zen"; + }; + # platforms.darwin = { + # configPath = "Library/Application Support/Floorp"; + # }; + }) + ]; programs.kitty = { enable = true; # themeFile = "rose-pine"; @@ -45,79 +70,7 @@ }; }; - # programs.firefox = { - # enable = true; - # # package = pkgs.librewolf; - # profiles = { - # Personal = { - # name = "Youwen Wu"; - # settings = { - # webgl.disabled = false; - # privacy.resistFingerprinting = false; - # privacy.clearOnShutdown.history = false; - # privacy.clearOnShutdown.cookies = false; - # network.cookie.lifetimePolicy = 0; - # search.default = "Google"; - # search.force = true; - # search.engines = { - # "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"]; - # }; - # - # "NixOS Wiki" = { - # urls = [{template = "https://wiki.nixos.org/index.php?search={searchTerms}";}]; - # iconUpdateURL = "https://wiki.nixos.org/favicon.png"; - # updateInterval = 24 * 60 * 60 * 1000; # every day - # definedAliases = ["@nw"]; - # }; - # - # "Google" = { - # urls = [ - # { - # template = "https://www.google.com/search"; - # params = [ - # { - # name = "q"; - # value = "{searchTerms}"; - # } - # { - # name = "udm"; - # value = "14"; - # } - # ]; - # } - # ]; - # definedAliases = ["@g"]; - # }; - # }; - # }; - # extensions = with inputs.firefox-addons.packages.${pkgs.system}; [ - # ublock-origin - # bitwarden - # vimium - # tabliss - # privacy-badger - # reddit-enhancement-suite - # catppuccin - # ]; - # }; - # }; - # }; + programs.zen = { + enable = true; + }; }