Move from firefox to librewolf for dialy browsing

Fix wrong hostname set
This commit is contained in:
Pim Kunis 2024-05-19 13:01:27 +02:00
parent db7238afe3
commit b6b5d8344c
7 changed files with 41 additions and 78 deletions

View file

@ -79,6 +79,8 @@
imports = [ nixos-hardware.nixosModules.lenovo-thinkpad-x260 ]; imports = [ nixos-hardware.nixosModules.lenovo-thinkpad-x260 ];
config = { config = {
networking.hostName = "x260";
fprintd = { fprintd = {
enable = true; enable = true;
@ -98,6 +100,7 @@
imports = [ nixos-hardware.nixosModules.dell-xps-13-9310 ]; imports = [ nixos-hardware.nixosModules.dell-xps-13-9310 ];
config = { config = {
networking.hostName = "xps-9315";
swapDevices = [{ device = "/dev/disk/by-uuid/96a43c35-0174-4e92-81f0-168a5f601f0b"; }]; swapDevices = [{ device = "/dev/disk/by-uuid/96a43c35-0174-4e92-81f0-168a5f601f0b"; }];
fileSystems = { fileSystems = {
"/" = "/" =

View file

@ -41,7 +41,6 @@
exfat exfat
unstable.qFlipper unstable.qFlipper
f3 f3
unstable.vmware-horizon-client
unstable.insomnia unstable.insomnia
unstable.vorta unstable.vorta
jellyfin-media-player jellyfin-media-player
@ -96,6 +95,31 @@
}; };
}; };
}; };
# Currently, it is not possible to have Home Manager manage Liberwolf extensions.
# There is a draft PR which addresses this:
# https://github.com/nix-community/home-manager/pull/3339
# The extensions I currently use are:
# - ublock-origin (already installed by librewolf)
# - cookie-autodelete
# - clearurls
# - istilldontcareaboutcookies
# - keepassxc-browser
# - redirector
# - violentmonkey
# - boring-rss
# - kagi-search
# - refined-github
librewolf = {
enable = true;
settings = {
"identity.fxaccounts.enabled" = true;
"privacy.clearOnShutdown.history" = false;
"privacy.clearOnShutdown.downloads" = false;
"browser.translations.automaticallyPopup" = false;
"browser.aboutConfig.showWarning" = false;
};
};
}; };
# Let home-manager manage the X session # Let home-manager manage the X session
@ -147,5 +171,9 @@
"org/gnome/desktop/sound" = { "org/gnome/desktop/sound" = {
allow-volume-above-100-percent = true; allow-volume-above-100-percent = true;
}; };
"org.gnome.desktop.wm.preferences" = {
auto-raise = true;
};
}; };
} }

View file

@ -3,29 +3,9 @@ let
rycee-addons = pkgs.nur.repos.rycee.firefox-addons; rycee-addons = pkgs.nur.repos.rycee.firefox-addons;
custom-addons = import ./custom-addons.nix pkgs lib; custom-addons = import ./custom-addons.nix pkgs lib;
in in
{ with rycee-addons; [
default = lib.concatLists [ ublock-origin
(with rycee-addons; [ istilldontcareaboutcookies
ublock-origin keepassxc-browser
clearurls custom-addons.simple-style-fox-2
cookie-autodelete ]
istilldontcareaboutcookies
keepassxc-browser
redirector
ublacklist
umatrix
violentmonkey
boring-rss
kagi-search
refined-github
# rycee.bypass-paywalls-clean
])
(with custom-addons; [ http-version-indicator indicatetls sixindicator ])
];
sue = with rycee-addons; [
ublock-origin
istilldontcareaboutcookies
keepassxc-browser
custom-addons.simple-style-fox-2
];
}

View file

@ -24,52 +24,9 @@ in
id = 0; id = 0;
isDefault = true; isDefault = true;
settings = firefoxSettings; settings = firefoxSettings;
extensions = firefoxAddons.default; extensions = firefoxAddons;
};
sue = {
id = 1;
settings = firefoxSettings;
extensions = firefoxAddons.sue;
}; };
}; };
}; };
xdg.desktopEntries.firefox-sue = {
categories = [ "Network" "WebBrowser" ];
exec = "firefox -P sue --name firefox %U";
genericName = "Web Browser";
icon = "firefox";
mimeType = [
"text/html"
"text/xml"
"application/xhtml+xml"
"application/vnd.mozilla.xul+xml"
"x-scheme-handler/http"
"x-scheme-handler/https"
];
name = "Firefox | Sue";
startupNotify = true;
terminal = false;
type = "Application";
};
xdg.desktopEntries.firefox = lib.mkForce {
categories = [ "Network" "WebBrowser" ];
exec = "firefox --new-window --name firefox %U";
genericName = "Web Browser";
icon = "firefox";
mimeType = [
"text/html"
"text/xml"
"application/xhtml+xml"
"application/vnd.mozilla.xul+xml"
"x-scheme-handler/http"
"x-scheme-handler/https"
];
name = "Firefox";
startupNotify = true;
terminal = false;
type = "Application";
};
}; };
} }

View file

@ -1,6 +1,6 @@
{ pkgs, config, ... }: { { pkgs, config, ... }: {
config = { config = {
home.packages = [ pkgs.keepassxc ]; home.packages = [ pkgs.unstable.keepassxc ];
homeage.file."keepassxc.ini" = { homeage.file."keepassxc.ini" = {
source = ../../secrets/keepassxc.ini.age; source = ../../secrets/keepassxc.ini.age;
symlinks = [ "${config.xdg.configHome}/keepassxc/keepassxc.ini" ]; symlinks = [ "${config.xdg.configHome}/keepassxc/keepassxc.ini" ];

View file

@ -93,8 +93,6 @@
}; };
networking = { networking = {
hostName = "x260";
wg-quick.interfaces = { wg-quick.interfaces = {
home = { home = {
privateKeyFile = config.age.secrets.wg-quick-home-privkey.path; privateKeyFile = config.age.secrets.wg-quick-home-privkey.path;
@ -136,6 +134,6 @@
nixpkgs.config = { nixpkgs.config = {
permittedInsecurePackages = [ "electron-25.9.0" ]; permittedInsecurePackages = [ "electron-25.9.0" ];
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "vmware-horizon-client" "libfprint-2-tod1-goodix" ]; allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "vmware-horizon-client" "libfprint-2-tod1-goodix" "vmware-workstation" ];
}; };
} }

3
switch
View file

@ -1,3 +0,0 @@
#!/usr/bin/env bash
sudo nixos-rebuild switch --flake ./#pim