Revert to Librewolf, simplifications to other files
This commit is contained in:
parent
1b3acb1258
commit
32234744f0
11 changed files with 18 additions and 40 deletions
|
@ -1,9 +1,9 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./firefox
|
|
||||||
./foot
|
./foot
|
||||||
./imv
|
./imv
|
||||||
|
./librewolf
|
||||||
./looking-glass
|
./looking-glass
|
||||||
./mangohud
|
./mangohud
|
||||||
./mpv
|
./mpv
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
config = lib.mkIf config.home.desktop.enable {
|
config = lib.mkIf config.home.desktop.enable {
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs.librewolf;
|
||||||
profiles = let
|
profiles = let
|
||||||
# FireFox css, based on https://github.com/Dook97/firefox-qutebrowser-userchrome
|
# FireFox css, based on https://github.com/Dook97/firefox-qutebrowser-userchrome
|
||||||
themeFont = ''
|
themeFont = ''
|
||||||
|
@ -189,7 +190,6 @@
|
||||||
|
|
||||||
"privacy.resistFingerprinting" = true;
|
"privacy.resistFingerprinting" = true;
|
||||||
"privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" = true;
|
"privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" = true;
|
||||||
"privacy.firstparty.isolate" = true;
|
|
||||||
"privacy.fingerprintingProtection" = true;
|
"privacy.fingerprintingProtection" = true;
|
||||||
"privacy.donottrackheader.enabled" = true;
|
"privacy.donottrackheader.enabled" = true;
|
||||||
"privacy.globalprivacycontrol.enabled" = true;
|
"privacy.globalprivacycontrol.enabled" = true;
|
||||||
|
@ -208,13 +208,6 @@
|
||||||
"network.http.referer.XOriginTrimmingPolicy" = 2;
|
"network.http.referer.XOriginTrimmingPolicy" = 2;
|
||||||
"network.http.referer.trimmingPolicy" = 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.private-attribution.submission.enabled" = false;
|
||||||
"dom.battery.enabled" = false;
|
"dom.battery.enabled" = false;
|
||||||
"dom.security.https_only_mode" = true;
|
"dom.security.https_only_mode" = true;
|
||||||
|
@ -226,8 +219,6 @@
|
||||||
"middlemouse.paste" = false;
|
"middlemouse.paste" = false;
|
||||||
|
|
||||||
"identity.fxaccounts.enabled" = false;
|
"identity.fxaccounts.enabled" = false;
|
||||||
"gfx.webrender.all" = true;
|
|
||||||
"sidebar.position_start" = false;
|
|
||||||
"datareporting.healthreport.uploadEnabled" = false;
|
"datareporting.healthreport.uploadEnabled" = false;
|
||||||
"svg.context-properties.content.enabled" = true;
|
"svg.context-properties.content.enabled" = true;
|
||||||
"services.sync.engine.addresses.available" = false;
|
"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";
|
||||||
};
|
};
|
||||||
}
|
}
|
|
@ -9,8 +9,8 @@
|
||||||
//// Launchers
|
//// Launchers
|
||||||
|
|
||||||
// Browser
|
// Browser
|
||||||
${primeMod}+F1 { spawn "sh" "-c" "firefox -p Main --name MainBrowser | notify-send \"Main Browser\""; }
|
${primeMod}+F1 { spawn "sh" "-c" "librewolf -p Main --name MainBrowser | notify-send \"Main Browser\""; }
|
||||||
${primeMod}+F2 { spawn "sh" "-c" "firefox -p Alt --name AltBrowser | notify-send \"Alternate Browser\""; }
|
${primeMod}+F2 { spawn "sh" "-c" "librewolf -p Alt --name AltBrowser | notify-send \"Alternate Browser\""; }
|
||||||
|
|
||||||
// Virtual machines
|
// Virtual machines
|
||||||
${primeMod}+F4 { spawn "sh" "-c" "virt-manager | notify-send \"Virtual Machines\""; }
|
${primeMod}+F4 { spawn "sh" "-c" "virt-manager | notify-send \"Virtual Machines\""; }
|
||||||
|
|
|
@ -15,9 +15,9 @@
|
||||||
all-outputs = true;
|
all-outputs = true;
|
||||||
tooltip = false;
|
tooltip = false;
|
||||||
rewrite = {
|
rewrite = {
|
||||||
"(.*) — Mozilla Firefox" = " $1";
|
"(.*) — LibreWolf" = " $1";
|
||||||
"Mozilla Firefox" = " Firefox";
|
"LibreWolf" = " Firefox";
|
||||||
"(.*) - Mozilla Firefox — Firefox" = " $1";
|
"(.*) - LibreWolf — Firefox" = " $1";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,8 @@
|
||||||
## Launchers
|
## Launchers
|
||||||
|
|
||||||
# Browser profiles
|
# Browser profiles
|
||||||
"${primeMod}+F1" = ''exec firefox -p Main --name MainBrowser | notify-send "Main Browser"'';
|
"${primeMod}+F1" = ''exec librewolf -p Main --name MainBrowser | notify-send "Main Browser"'';
|
||||||
"${primeMod}+F2" = ''exec firefox -p Alt --name AltBrowser | notify-send "Alternate Browser"'';
|
"${primeMod}+F2" = ''exec librewolf -p Alt --name AltBrowser | notify-send "Alternate Browser"'';
|
||||||
"${primeMod}+F3" = ''exec firefox -p Misc --name MiscBrowser | notify-send "Miscellaneous Browser"'';
|
|
||||||
|
|
||||||
# Virtual machines
|
# Virtual machines
|
||||||
"${primeMod}+F4" = ''exec virt-manager | notify-send "Virtual Machines"'';
|
"${primeMod}+F4" = ''exec virt-manager | notify-send "Virtual Machines"'';
|
||||||
|
|
|
@ -9,8 +9,6 @@
|
||||||
username = "token";
|
username = "token";
|
||||||
passwordFile = "${pkgs.writeText "cloudflareapikey" config.secrets.flareApiKey}";
|
passwordFile = "${pkgs.writeText "cloudflareapikey" config.secrets.flareApiKey}";
|
||||||
};
|
};
|
||||||
environment.persistence."/persist".directories = [
|
environment.persistence."/persist".directories = [ "/var/lib/private/ddclient" ];
|
||||||
"/var/lib/private/ddclient"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,8 +6,6 @@
|
||||||
|
|
||||||
config = lib.mkIf config.system.fileserver.enable {
|
config = lib.mkIf config.system.fileserver.enable {
|
||||||
services.jellyfin.enable = true;
|
services.jellyfin.enable = true;
|
||||||
environment.persistence."/persist".directories = [
|
environment.persistence."/persist".directories = [ "/var/lib/jellyfin" ];
|
||||||
"/var/lib/jellyfin"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
{ config, lib, ... }:
|
{ config, lib, ... }:
|
||||||
{
|
{
|
||||||
services.collabora-online = lib.mkIf config.services.nextcloud.enable {
|
services.collabora-online.enable = config.services.nextcloud.enable;
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,8 +29,6 @@
|
||||||
mail_smtpport = 587;
|
mail_smtpport = 587;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
environment.persistence."/persist".directories = [
|
environment.persistence."/persist".directories = [ "/var/lib/nextcloud" ];
|
||||||
"/var/lib/nextcloud"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,15 +38,9 @@
|
||||||
"contact@${config.domains.p2}"
|
"contact@${config.domains.p2}"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
"luna@${config.domains.luna}" = {
|
"luna@${config.domains.luna}".hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash;
|
||||||
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;
|
||||||
"corn@${config.domains.corn}" = {
|
|
||||||
hashedPasswordFile = pkgs.writeText "corn" config.secrets.cornMailHash;
|
|
||||||
};
|
|
||||||
"tiny@${config.domains.corn}" = {
|
|
||||||
hashedPasswordFile = pkgs.writeText "tiny" config.secrets.tinyMailHash;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue