feat: firefox ca root

This commit is contained in:
DACHXY 2025-05-03 23:49:00 +08:00
parent 62c1eb4b1d
commit e2c5206369
8 changed files with 25 additions and 9 deletions

View file

@ -1,6 +1,6 @@
let let
configDir = ../config; configDir = ../config;
browser = "firefox-nightly.desktop"; browser = "firefox.desktop";
in in
{ {
home.file = { home.file = {

View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
browser = "firefox-nightly"; browser = "firefox";
iconPrefix = ".local/share/icons/hicolor/scalable/apps"; iconPrefix = ".local/share/icons/hicolor/scalable/apps";
newWindow = "${browser} --new-window"; newWindow = "${browser} --new-window";
mkIconPkg = pkgs.callPackage ../../utils/make-icon.nix { }; mkIconPkg = pkgs.callPackage ../../utils/make-icon.nix { };

View file

@ -1,6 +1,6 @@
{ {
home.sessionVariables = { home.sessionVariables = {
BROWSER = "firefox-nightly"; BROWSER = "firefox";
EDITOR = "nvim"; EDITOR = "nvim";
TERMINAL = "ghostty"; TERMINAL = "ghostty";
ELECTRON_OZONE_PLATFORM_HINT = "auto"; ELECTRON_OZONE_PLATFORM_HINT = "auto";

View file

@ -1,6 +1,4 @@
{ {
inputs,
system,
... ...
}: }:
let let
@ -20,13 +18,14 @@ let
"font.name.monospace.zh-TW" = "Noto Sans Mono CJK TC"; "font.name.monospace.zh-TW" = "Noto Sans Mono CJK TC";
# Disable Ctrl+Q # Disable Ctrl+Q
"browser.quitShortcut.disabled" = true; "browser.quitShortcut.disabled" = true;
"security.enterprise_roots.enabled" = true;
}; };
in in
{ {
programs = { programs = {
firefox = { firefox = {
enable = true; enable = true;
package = inputs.firefox.packages.${system}.firefox-nightly-bin; # package = inputs.firefox.packages.${system}.firefox-nightly-bin;
languagePacks = [ languagePacks = [
"en-US" "en-US"
"zh-TW" "zh-TW"
@ -36,6 +35,11 @@ in
policies = { policies = {
DontCheckDefaultBrowser = true; DontCheckDefaultBrowser = true;
DisplayBookmarksToolbar = "never"; DisplayBookmarksToolbar = "never";
Certificates = {
Install = [
"~/.mozilla/certificates/step-ca.net.dn.crt"
];
};
}; };
profiles.default = { profiles.default = {
@ -44,7 +48,6 @@ in
isDefault = true; isDefault = true;
userChrome = userChrome; userChrome = userChrome;
settings = profileSettings; settings = profileSettings;
}; };
@ -58,4 +61,10 @@ in
}; };
}; };
}; };
home.file = {
".mozilla/certificates/step-ca.net.dn.crt" = {
source = ../../system/extra/ca.crt;
};
};
} }

View file

@ -4,7 +4,7 @@
pkgs, pkgs,
}: }:
let let
firefox = "firefox-nightly"; firefox = "firefox";
prefix = if nvidia-offload-enabled then "nvidia-offload" else ""; prefix = if nvidia-offload-enabled then "nvidia-offload" else "";
browser = "${prefix} ${firefox}"; browser = "${prefix} ${firefox}";
terminal = "ghostty"; terminal = "ghostty";

View file

@ -21,9 +21,9 @@
../../modules/virtualization.nix ../../modules/virtualization.nix
../../modules/wine.nix ../../modules/wine.nix
../../modules/wireguard.nix ../../modules/wireguard.nix
../../modules/certbot.nix
(import ../../modules/nextcloud.nix { (import ../../modules/nextcloud.nix {
hostname = "pre-nextcloud.net.dn"; hostname = "pre-nextcloud.net.dn";
datadir = "/mnt/nextcloud";
}) })
]; ];

View file

@ -1,5 +1,10 @@
{ config, ... }: { config, ... }:
{ {
networking.firewall.allowedTCPPorts = [
80
443
];
services.nginx = { services.nginx = {
enable = true; enable = true;
enableReload = true; enableReload = true;

View file

@ -1,5 +1,6 @@
{ {
hostname, hostname,
datadir ? null,
dataBackupPath ? null, dataBackupPath ? null,
dbBackupPath ? null, dbBackupPath ? null,
}: }:
@ -42,6 +43,7 @@
configureRedis = true; configureRedis = true;
hostName = hostname; hostName = hostname;
https = true; https = true;
datadir = lib.mkIf (datadir != null) datadir;
phpExtraExtensions = phpExtraExtensions =
all: with all; [ all: with all; [
imagick imagick