From b404b625643f997ecf0dfe0706f3177e8691fb2c Mon Sep 17 00:00:00 2001 From: Jimbo Date: Tue, 28 Jan 2025 14:32:43 -0500 Subject: [PATCH] Update to nixfox for primary mail domain --- .../home/programs/gui/librewolf/quteFox.css | 29 +++++++------------ .../server/fileserver/nextcloud/default.nix | 4 +-- .../services/server/forgejo/default.nix | 2 +- .../server/mailserver/roundcube/default.nix | 2 +- .../server/mailserver/simplenix/default.nix | 2 +- .../mailserver/simplenix/nginx/default.nix | 2 +- .../server/socialserver/mastodon/default.nix | 2 +- .../socialserver/matrix/synapse/default.nix | 2 +- .../services/server/vaultwarden/default.nix | 2 +- 9 files changed, 20 insertions(+), 27 deletions(-) diff --git a/modules/home/programs/gui/librewolf/quteFox.css b/modules/home/programs/gui/librewolf/quteFox.css index 45d7248..810c340 100644 --- a/modules/home/programs/gui/librewolf/quteFox.css +++ b/modules/home/programs/gui/librewolf/quteFox.css @@ -1,7 +1,7 @@ /* try increasing if you encounter problems */ --urlbar-height-setting: 24px; --tab-min-height: 20px !important; - + /* I don't recommend you touch this unless you know what you're doing */ --arrowpanel-menuitem-padding: 2px !important; --arrowpanel-border-radius: 0px !important; @@ -34,9 +34,10 @@ menupopup > #context-sep-navigation { display: none !important; } #stop-button { display: none; } #home-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 */ #customizableui-special-spring1, #customizableui-special-spring2 { display: none; } +.private-browsing-indicator-with-label { display: none; } /* --- STYLE NAVBAR ------------------------------------ */ @@ -71,7 +72,7 @@ toolbar .toolbarbutton-1 { padding: 0 0 !important; } } #urlbar-input { - margin-left: 0.8em !important; + margin-left: 0.4em !important; margin-right: 0.4em !important; } @@ -125,14 +126,15 @@ toolbar .toolbarbutton-1 { padding: 0 0 !important; } /* --- DEBLOAT URLBAR ----------------------------------- */ -#identity-box { display: none; } #pageActionButton { display: none; } #pocket-button { display: none; } #urlbar-zoom-button { display: none; } #tracking-protection-icon-container { display: none !important; } -#reader-mode-button{ display: none !important; } -#star-button { display: none; } -#star-button-box:hover { background: inherit !important; } +/* #reader-mode-button{ display: none !important; } */ +/* #star-button { display: none; } */ +/* #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 */ #urlbar-go-button { display: none; } @@ -214,7 +216,7 @@ tab { /* disable tab shadow */ #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 */ @@ -282,16 +284,7 @@ tab { opacity: 1; } -/* --- Hide tab bar on single tab ------------------- */ - -#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 -------------------------- */ +/* --- P/EVENT TAB FOLDING -------------------------- */ .tabbrowser-tab { min-width: initial !important; diff --git a/modules/system/services/server/fileserver/nextcloud/default.nix b/modules/system/services/server/fileserver/nextcloud/default.nix index e958721..6733d02 100644 --- a/modules/system/services/server/fileserver/nextcloud/default.nix +++ b/modules/system/services/server/fileserver/nextcloud/default.nix @@ -19,8 +19,8 @@ trusted_proxies = [ "127.0.0.1" ]; trusted_domains = [ "cloud.${config.domains.p2}" ]; overwriteprotocol = "https"; - mail_smtphost = "mx.${config.domains.p1}"; - mail_domain = "${config.domains.p1}"; + mail_smtphost = "mx.${config.domains.p2}"; + mail_domain = "${config.domains.p2}"; mail_from_address = "noreply"; mail_smtpauth = "true"; mail_smtpname = "noreply@${config.domains.p2}"; diff --git a/modules/system/services/server/forgejo/default.nix b/modules/system/services/server/forgejo/default.nix index c42de44..082f6cb 100644 --- a/modules/system/services/server/forgejo/default.nix +++ b/modules/system/services/server/forgejo/default.nix @@ -15,7 +15,7 @@ }; mailer = { ENABLED = true; - SMTP_ADDR = "mx.${config.domains.p1}"; + SMTP_ADDR = "mx.${config.domains.p2}"; FROM = "NixFox Git "; USER = "noreply@${config.domains.p2}"; PASSWD = config.secrets.noreplyPassword; diff --git a/modules/system/services/server/mailserver/roundcube/default.nix b/modules/system/services/server/mailserver/roundcube/default.nix index dbcc22b..3dfd83f 100644 --- a/modules/system/services/server/mailserver/roundcube/default.nix +++ b/modules/system/services/server/mailserver/roundcube/default.nix @@ -4,7 +4,7 @@ enable = config.system.mailserver.enable; hostName = "mail.${config.domains.p2}"; extraConfig = '' - $config['smtp_server'] = "tls://mx.${config.domains.p1}"; + $config['smtp_server'] = "tls://mx.${config.domains.p2}"; $config['smtp_user'] = "%u"; $config['smtp_pass'] = "%p"; ''; diff --git a/modules/system/services/server/mailserver/simplenix/default.nix b/modules/system/services/server/mailserver/simplenix/default.nix index a410b92..4bff796 100644 --- a/modules/system/services/server/mailserver/simplenix/default.nix +++ b/modules/system/services/server/mailserver/simplenix/default.nix @@ -13,7 +13,7 @@ "${config.domains.luna}" "${config.domains.corn}" ]; - fqdn = "mx.${config.domains.p1}"; + fqdn = "mx.${config.domains.p2}"; certificateScheme = "acme-nginx"; localDnsResolver = false; redis.port = 1515; diff --git a/modules/system/services/server/mailserver/simplenix/nginx/default.nix b/modules/system/services/server/mailserver/simplenix/nginx/default.nix index 99a3be3..4009f1e 100644 --- a/modules/system/services/server/mailserver/simplenix/nginx/default.nix +++ b/modules/system/services/server/mailserver/simplenix/nginx/default.nix @@ -1,6 +1,6 @@ { 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; forceSSL = true; locations."/" = { diff --git a/modules/system/services/server/socialserver/mastodon/default.nix b/modules/system/services/server/socialserver/mastodon/default.nix index 76e85f5..c79f93e 100644 --- a/modules/system/services/server/socialserver/mastodon/default.nix +++ b/modules/system/services/server/socialserver/mastodon/default.nix @@ -8,7 +8,7 @@ configureNginx = true; smtp = { createLocally = false; - host = "mx.${config.domains.p1}"; + host = "mx.${config.domains.p2}"; port = 587; authenticate = true; fromAddress = "NixFox Mastodon "; diff --git a/modules/system/services/server/socialserver/matrix/synapse/default.nix b/modules/system/services/server/socialserver/matrix/synapse/default.nix index adeb58a..20a3a39 100644 --- a/modules/system/services/server/socialserver/matrix/synapse/default.nix +++ b/modules/system/services/server/socialserver/matrix/synapse/default.nix @@ -31,7 +31,7 @@ email = { notif_from = "NixFox Matrix "; - smtp_host = "mx.${config.domains.p1}"; + smtp_host = "mx.${config.domains.p2}"; smtp_user = "noreply@${config.domains.p2}"; smtp_pass = config.secrets.noreplyPassword; enable_tls = true; diff --git a/modules/system/services/server/vaultwarden/default.nix b/modules/system/services/server/vaultwarden/default.nix index 078c634..e7df4a8 100644 --- a/modules/system/services/server/vaultwarden/default.nix +++ b/modules/system/services/server/vaultwarden/default.nix @@ -13,7 +13,7 @@ ROCKET_LOG = "critical"; # Smtp email - SMTP_HOST = "mx.${config.domains.p1}"; + SMTP_HOST = "mx.${config.domains.p2}"; SMTP_FROM = "noreply@${config.domains.p2}"; SMTP_FROM_NAME = "Vaultwarden"; SMTP_USERNAME = "noreply@${config.domains.p2}";