From 32234744f070185052e12b32d816fc2f086c5278 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Sat, 22 Feb 2025 17:04:01 -0500 Subject: [PATCH] Revert to Librewolf, simplifications to other files --- modules/home/programs/gui/default.nix | 2 +- .../programs/gui/{firefox => librewolf}/default.nix | 13 +++---------- .../programs/gui/{firefox => librewolf}/quteFox.css | 0 modules/home/wms/niri/hotkeys/default.nix | 4 ++-- modules/home/wms/programs/waybar/default.nix | 6 +++--- modules/home/wms/sway/hotkeys/default.nix | 5 ++--- modules/system/services/server/ddclient/default.nix | 4 +--- .../services/server/fileserver/jellyfin/default.nix | 4 +--- .../fileserver/nextcloud/collabora/default.nix | 4 +--- .../server/fileserver/nextcloud/default.nix | 4 +--- .../server/mailserver/simplenix/default.nix | 12 +++--------- 11 files changed, 18 insertions(+), 40 deletions(-) rename modules/home/programs/gui/{firefox => librewolf}/default.nix (96%) rename modules/home/programs/gui/{firefox => librewolf}/quteFox.css (100%) diff --git a/modules/home/programs/gui/default.nix b/modules/home/programs/gui/default.nix index 4666bc9..c2d2498 100644 --- a/modules/home/programs/gui/default.nix +++ b/modules/home/programs/gui/default.nix @@ -1,9 +1,9 @@ { ... }: { imports = [ - ./firefox ./foot ./imv + ./librewolf ./looking-glass ./mangohud ./mpv diff --git a/modules/home/programs/gui/firefox/default.nix b/modules/home/programs/gui/librewolf/default.nix similarity index 96% rename from modules/home/programs/gui/firefox/default.nix rename to modules/home/programs/gui/librewolf/default.nix index cb06da0..89d07dd 100644 --- a/modules/home/programs/gui/firefox/default.nix +++ b/modules/home/programs/gui/librewolf/default.nix @@ -3,6 +3,7 @@ config = lib.mkIf config.home.desktop.enable { programs.firefox = { enable = true; + package = pkgs.librewolf; profiles = let # FireFox css, based on https://github.com/Dook97/firefox-qutebrowser-userchrome themeFont = '' @@ -189,7 +190,6 @@ "privacy.resistFingerprinting" = true; "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" = true; - "privacy.firstparty.isolate" = true; "privacy.fingerprintingProtection" = true; "privacy.donottrackheader.enabled" = true; "privacy.globalprivacycontrol.enabled" = true; @@ -208,13 +208,6 @@ "network.http.referer.XOriginTrimmingPolicy" = 2; "network.http.referer.trimmingPolicy" = 2; - "media.ffmpeg.vaapi.enabled" = true; - "media.rdd-ffmpeg.enabled" = true; - "media.hardware-video-decoding.force-enabled" = true; - - "signon.rememberSignons" = false; - "signon.management.page.breach-alerts.enabled" = false; - "dom.private-attribution.submission.enabled" = false; "dom.battery.enabled" = false; "dom.security.https_only_mode" = true; @@ -226,8 +219,6 @@ "middlemouse.paste" = false; "identity.fxaccounts.enabled" = false; - "gfx.webrender.all" = true; - "sidebar.position_start" = false; "datareporting.healthreport.uploadEnabled" = false; "svg.context-properties.content.enabled" = true; "services.sync.engine.addresses.available" = false; @@ -264,5 +255,7 @@ }; }; }; + # Symlinks to Librewolf + home.file.".librewolf".source = config.lib.file.mkOutOfStoreSymlink "/home/${config.home.username}/.mozilla/firefox"; }; } diff --git a/modules/home/programs/gui/firefox/quteFox.css b/modules/home/programs/gui/librewolf/quteFox.css similarity index 100% rename from modules/home/programs/gui/firefox/quteFox.css rename to modules/home/programs/gui/librewolf/quteFox.css diff --git a/modules/home/wms/niri/hotkeys/default.nix b/modules/home/wms/niri/hotkeys/default.nix index 33c795f..0285c44 100644 --- a/modules/home/wms/niri/hotkeys/default.nix +++ b/modules/home/wms/niri/hotkeys/default.nix @@ -9,8 +9,8 @@ //// Launchers // Browser - ${primeMod}+F1 { spawn "sh" "-c" "firefox -p Main --name MainBrowser | notify-send \"Main Browser\""; } - ${primeMod}+F2 { spawn "sh" "-c" "firefox -p Alt --name AltBrowser | notify-send \"Alternate Browser\""; } + ${primeMod}+F1 { spawn "sh" "-c" "librewolf -p Main --name MainBrowser | notify-send \"Main Browser\""; } + ${primeMod}+F2 { spawn "sh" "-c" "librewolf -p Alt --name AltBrowser | notify-send \"Alternate Browser\""; } // Virtual machines ${primeMod}+F4 { spawn "sh" "-c" "virt-manager | notify-send \"Virtual Machines\""; } diff --git a/modules/home/wms/programs/waybar/default.nix b/modules/home/wms/programs/waybar/default.nix index 6db48af..4697927 100644 --- a/modules/home/wms/programs/waybar/default.nix +++ b/modules/home/wms/programs/waybar/default.nix @@ -15,9 +15,9 @@ all-outputs = true; tooltip = false; rewrite = { - "(.*) — Mozilla Firefox" = " $1"; - "Mozilla Firefox" = " Firefox"; - "(.*) - Mozilla Firefox — Firefox" = "󰗃 $1"; + "(.*) — LibreWolf" = " $1"; + "LibreWolf" = " Firefox"; + "(.*) - LibreWolf — Firefox" = "󰗃 $1"; }; }; diff --git a/modules/home/wms/sway/hotkeys/default.nix b/modules/home/wms/sway/hotkeys/default.nix index b94eda7..230206b 100644 --- a/modules/home/wms/sway/hotkeys/default.nix +++ b/modules/home/wms/sway/hotkeys/default.nix @@ -12,9 +12,8 @@ ## Launchers # Browser profiles - "${primeMod}+F1" = ''exec firefox -p Main --name MainBrowser | notify-send "Main Browser"''; - "${primeMod}+F2" = ''exec firefox -p Alt --name AltBrowser | notify-send "Alternate Browser"''; - "${primeMod}+F3" = ''exec firefox -p Misc --name MiscBrowser | notify-send "Miscellaneous Browser"''; + "${primeMod}+F1" = ''exec librewolf -p Main --name MainBrowser | notify-send "Main Browser"''; + "${primeMod}+F2" = ''exec librewolf -p Alt --name AltBrowser | notify-send "Alternate Browser"''; # Virtual machines "${primeMod}+F4" = ''exec virt-manager | notify-send "Virtual Machines"''; diff --git a/modules/system/services/server/ddclient/default.nix b/modules/system/services/server/ddclient/default.nix index 0074ff8..1d9c0a4 100644 --- a/modules/system/services/server/ddclient/default.nix +++ b/modules/system/services/server/ddclient/default.nix @@ -9,8 +9,6 @@ username = "token"; passwordFile = "${pkgs.writeText "cloudflareapikey" config.secrets.flareApiKey}"; }; - environment.persistence."/persist".directories = [ - "/var/lib/private/ddclient" - ]; + environment.persistence."/persist".directories = [ "/var/lib/private/ddclient" ]; }; } diff --git a/modules/system/services/server/fileserver/jellyfin/default.nix b/modules/system/services/server/fileserver/jellyfin/default.nix index 3aa706a..4047385 100644 --- a/modules/system/services/server/fileserver/jellyfin/default.nix +++ b/modules/system/services/server/fileserver/jellyfin/default.nix @@ -6,8 +6,6 @@ config = lib.mkIf config.system.fileserver.enable { services.jellyfin.enable = true; - environment.persistence."/persist".directories = [ - "/var/lib/jellyfin" - ]; + environment.persistence."/persist".directories = [ "/var/lib/jellyfin" ]; }; } diff --git a/modules/system/services/server/fileserver/nextcloud/collabora/default.nix b/modules/system/services/server/fileserver/nextcloud/collabora/default.nix index 7220b25..f53c879 100644 --- a/modules/system/services/server/fileserver/nextcloud/collabora/default.nix +++ b/modules/system/services/server/fileserver/nextcloud/collabora/default.nix @@ -1,6 +1,4 @@ { config, lib, ... }: { - services.collabora-online = lib.mkIf config.services.nextcloud.enable { - enable = true; - }; + services.collabora-online.enable = config.services.nextcloud.enable; } diff --git a/modules/system/services/server/fileserver/nextcloud/default.nix b/modules/system/services/server/fileserver/nextcloud/default.nix index 6733d02..f445fd1 100644 --- a/modules/system/services/server/fileserver/nextcloud/default.nix +++ b/modules/system/services/server/fileserver/nextcloud/default.nix @@ -29,8 +29,6 @@ mail_smtpport = 587; }; }; - environment.persistence."/persist".directories = [ - "/var/lib/nextcloud" - ]; + environment.persistence."/persist".directories = [ "/var/lib/nextcloud" ]; }; } diff --git a/modules/system/services/server/mailserver/simplenix/default.nix b/modules/system/services/server/mailserver/simplenix/default.nix index 96a2859..b185548 100644 --- a/modules/system/services/server/mailserver/simplenix/default.nix +++ b/modules/system/services/server/mailserver/simplenix/default.nix @@ -38,15 +38,9 @@ "contact@${config.domains.p2}" ]; }; - "luna@${config.domains.luna}" = { - hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash; - }; - "corn@${config.domains.corn}" = { - hashedPasswordFile = pkgs.writeText "corn" config.secrets.cornMailHash; - }; - "tiny@${config.domains.corn}" = { - hashedPasswordFile = pkgs.writeText "tiny" config.secrets.tinyMailHash; - }; + "luna@${config.domains.luna}".hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash; + "corn@${config.domains.corn}".hashedPasswordFile = pkgs.writeText "corn" config.secrets.cornMailHash; + "tiny@${config.domains.corn}".hashedPasswordFile = pkgs.writeText "tiny" config.secrets.tinyMailHash; }; };