Update to nixfox for primary mail domain

This commit is contained in:
Jimbo 2025-01-28 14:32:43 -05:00
parent c6526ac635
commit b404b62564
9 changed files with 20 additions and 27 deletions

View file

@ -34,9 +34,10 @@ menupopup > #context-sep-navigation { display: none !important; }
#stop-button { display: none; } #stop-button { display: none; }
#home-button { display: none; } #home-button { display: none; }
#library-button { display: none; } #library-button { display: none; }
#fxa-toolbar-menu-button { display: none; } /* #fxa-toolbar-menu-button { display: none; } */
/* empty space before and after the url bar */ /* empty space before and after the url bar */
#customizableui-special-spring1, #customizableui-special-spring2 { display: none; } #customizableui-special-spring1, #customizableui-special-spring2 { display: none; }
.private-browsing-indicator-with-label { display: none; }
/* --- STYLE NAVBAR ------------------------------------ */ /* --- STYLE NAVBAR ------------------------------------ */
@ -71,7 +72,7 @@ toolbar .toolbarbutton-1 { padding: 0 0 !important; }
} }
#urlbar-input { #urlbar-input {
margin-left: 0.8em !important; margin-left: 0.4em !important;
margin-right: 0.4em !important; margin-right: 0.4em !important;
} }
@ -125,14 +126,15 @@ toolbar .toolbarbutton-1 { padding: 0 0 !important; }
/* --- DEBLOAT URLBAR ----------------------------------- */ /* --- DEBLOAT URLBAR ----------------------------------- */
#identity-box { display: none; }
#pageActionButton { display: none; } #pageActionButton { display: none; }
#pocket-button { display: none; } #pocket-button { display: none; }
#urlbar-zoom-button { display: none; } #urlbar-zoom-button { display: none; }
#tracking-protection-icon-container { display: none !important; } #tracking-protection-icon-container { display: none !important; }
#reader-mode-button{ display: none !important; } /* #reader-mode-button{ display: none !important; } */
#star-button { display: none; } /* #star-button { display: none; } */
#star-button-box:hover { background: inherit !important; } /* #star-button-box:hover { background: inherit !important; } */
#identity-box { margin-inline-end: 0 !important; }
/* Go to arrow button at the end of the urlbar when searching */ /* Go to arrow button at the end of the urlbar when searching */
#urlbar-go-button { display: none; } #urlbar-go-button { display: none; }
@ -214,7 +216,7 @@ tab {
/* disable tab shadow */ /* disable tab shadow */
#tabbrowser-tabs:not([noshadowfortests]) .tab-background:is([selected], [multiselected]) { #tabbrowser-tabs:not([noshadowfortests]) .tab-background:is([selected], [multiselected]) {
box-shadow: none !important; box-shadow: none !important;
} }
/* remove dark space between pinned tab and first non-pinned tab */ /* remove dark space between pinned tab and first non-pinned tab */
@ -282,16 +284,7 @@ tab {
opacity: 1; opacity: 1;
} }
/* --- Hide tab bar on single tab ------------------- */ /* --- P/EVENT TAB FOLDING -------------------------- */
#tabbrowser-tabs .tabbrowser-tab:only-of-type,
#tabbrowser-tabs .tabbrowser-tab:only-of-type + #tabbrowser-arrowscrollbox-periphery{
display:none !important;
}
#tabbrowser-tabs, #tabbrowser-arrowscrollbox {min-height:0!important;}
#alltabs-button {display:none !important;}
/* --- Prevent tab folding -------------------------- */
.tabbrowser-tab { .tabbrowser-tab {
min-width: initial !important; min-width: initial !important;

View file

@ -19,8 +19,8 @@
trusted_proxies = [ "127.0.0.1" ]; trusted_proxies = [ "127.0.0.1" ];
trusted_domains = [ "cloud.${config.domains.p2}" ]; trusted_domains = [ "cloud.${config.domains.p2}" ];
overwriteprotocol = "https"; overwriteprotocol = "https";
mail_smtphost = "mx.${config.domains.p1}"; mail_smtphost = "mx.${config.domains.p2}";
mail_domain = "${config.domains.p1}"; mail_domain = "${config.domains.p2}";
mail_from_address = "noreply"; mail_from_address = "noreply";
mail_smtpauth = "true"; mail_smtpauth = "true";
mail_smtpname = "noreply@${config.domains.p2}"; mail_smtpname = "noreply@${config.domains.p2}";

View file

@ -15,7 +15,7 @@
}; };
mailer = { mailer = {
ENABLED = true; ENABLED = true;
SMTP_ADDR = "mx.${config.domains.p1}"; SMTP_ADDR = "mx.${config.domains.p2}";
FROM = "NixFox Git <noreply@${config.domains.p2}>"; FROM = "NixFox Git <noreply@${config.domains.p2}>";
USER = "noreply@${config.domains.p2}"; USER = "noreply@${config.domains.p2}";
PASSWD = config.secrets.noreplyPassword; PASSWD = config.secrets.noreplyPassword;

View file

@ -4,7 +4,7 @@
enable = config.system.mailserver.enable; enable = config.system.mailserver.enable;
hostName = "mail.${config.domains.p2}"; hostName = "mail.${config.domains.p2}";
extraConfig = '' extraConfig = ''
$config['smtp_server'] = "tls://mx.${config.domains.p1}"; $config['smtp_server'] = "tls://mx.${config.domains.p2}";
$config['smtp_user'] = "%u"; $config['smtp_user'] = "%u";
$config['smtp_pass'] = "%p"; $config['smtp_pass'] = "%p";
''; '';

View file

@ -13,7 +13,7 @@
"${config.domains.luna}" "${config.domains.luna}"
"${config.domains.corn}" "${config.domains.corn}"
]; ];
fqdn = "mx.${config.domains.p1}"; fqdn = "mx.${config.domains.p2}";
certificateScheme = "acme-nginx"; certificateScheme = "acme-nginx";
localDnsResolver = false; localDnsResolver = false;
redis.port = 1515; redis.port = 1515;

View file

@ -1,6 +1,6 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
{ {
services.nginx.virtualHosts."mx.${config.domains.p1}" = lib.mkIf config.mailserver.enable { services.nginx.virtualHosts."mx.${config.domains.p2}" = lib.mkIf config.mailserver.enable {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations."/" = { locations."/" = {

View file

@ -8,7 +8,7 @@
configureNginx = true; configureNginx = true;
smtp = { smtp = {
createLocally = false; createLocally = false;
host = "mx.${config.domains.p1}"; host = "mx.${config.domains.p2}";
port = 587; port = 587;
authenticate = true; authenticate = true;
fromAddress = "NixFox Mastodon <noreply@${config.domains.p2}>"; fromAddress = "NixFox Mastodon <noreply@${config.domains.p2}>";

View file

@ -31,7 +31,7 @@
email = { email = {
notif_from = "NixFox Matrix <noreply@${config.domains.p2}>"; notif_from = "NixFox Matrix <noreply@${config.domains.p2}>";
smtp_host = "mx.${config.domains.p1}"; smtp_host = "mx.${config.domains.p2}";
smtp_user = "noreply@${config.domains.p2}"; smtp_user = "noreply@${config.domains.p2}";
smtp_pass = config.secrets.noreplyPassword; smtp_pass = config.secrets.noreplyPassword;
enable_tls = true; enable_tls = true;

View file

@ -13,7 +13,7 @@
ROCKET_LOG = "critical"; ROCKET_LOG = "critical";
# Smtp email # Smtp email
SMTP_HOST = "mx.${config.domains.p1}"; SMTP_HOST = "mx.${config.domains.p2}";
SMTP_FROM = "noreply@${config.domains.p2}"; SMTP_FROM = "noreply@${config.domains.p2}";
SMTP_FROM_NAME = "Vaultwarden"; SMTP_FROM_NAME = "Vaultwarden";
SMTP_USERNAME = "noreply@${config.domains.p2}"; SMTP_USERNAME = "noreply@${config.domains.p2}";