Merge branch 'trunk' into upgrade-25.11

This commit is contained in:
Primrose 2025-11-27 12:44:09 +08:00
commit fa15081f38
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
3 changed files with 1 additions and 20 deletions

View file

@ -56,7 +56,6 @@ in
../overlays/eepy.nix ../overlays/eepy.nix
../overlays/calibre-no-mime.nix ../overlays/calibre-no-mime.nix
../overlays/fcitx5-table-extra-taiwanese.nix ../overlays/fcitx5-table-extra-taiwanese.nix
../overlays/zen-browser.nix
../overlays/iosevka.nix ../overlays/iosevka.nix
../packages/overlay.nix ../packages/overlay.nix

View file

@ -66,6 +66,7 @@ in
"browser.ctrlTab.sortByRecentlyUsed" = false; "browser.ctrlTab.sortByRecentlyUsed" = false;
"layout.css.devPixelsPerPx" = 1.1; "layout.css.devPixelsPerPx" = 1.1;
"browser.startup.page" = 1; "browser.startup.page" = 1;
"browser.translations.automaticallyPopup" = false;
# open links in new window # open links in new window
# this works a lot better with xmonad where I have a bunch of windows # this works a lot better with xmonad where I have a bunch of windows

View file

@ -1,19 +0,0 @@
let
sources = import ../../npins;
in
final: _:
let
zenpkgs = sources.zen-browser.asFlake.packages.${final.system};
in
{
# TODO: upstream default is broken? They default to zen-twilight
"zen-beta-unwrapped" = zenpkgs."beta-unwrapped";
"zen-twilight-unwrapped" = zenpkgs."twilight-unwrapped";
"zen-twilight-official-unwrapped" = zenpkgs."twilight-official-unwrapped";
# default
"zen-beta" = zenpkgs."beta";
"zen-twilight" = zenpkgs."twilight";
"zen-twilight-official" = zenpkgs."twilight-official";
}