aboutsummaryrefslogtreecommitdiffstats
path: root/modules/by-name/qu/qutebrowser
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--modules/by-name/qu/qutebrowser/include/redirects.py2
-rw-r--r--modules/by-name/qu/qutebrowser/module.hm.nix4
-rw-r--r--modules/by-name/qu/qutebrowser/module.nix6
-rw-r--r--modules/by-name/qu/qutebrowser/settings/default.nix4
4 files changed, 8 insertions, 8 deletions
diff --git a/modules/by-name/qu/qutebrowser/include/redirects.py b/modules/by-name/qu/qutebrowser/include/redirects.py
index 63a44ecf..2588b9e0 100644
--- a/modules/by-name/qu/qutebrowser/include/redirects.py
+++ b/modules/by-name/qu/qutebrowser/include/redirects.py
@@ -34,7 +34,7 @@ def farside_redir(target: str, url: QUrl) -> bool:
# Any return value other than a literal 'False' means we redirect
REDIRECT_MAP: typing.Dict[str, typing.Callable[..., typing.Optional[bool]]] = {
- "reddit.com": operator.methodcaller("setHost", "redlib.vhack.eu"),
+ "reddit.com": partial(farside_redir, "redlib"),
# Source: https://libredirect.github.io/
"medium.com": partial(farside_redir, "scribe"),
"stackoverflow.com": partial(farside_redir, "anonymousoverflow"),
diff --git a/modules/by-name/qu/qutebrowser/module.hm.nix b/modules/by-name/qu/qutebrowser/module.hm.nix
index 3f0f0d52..41e8952d 100644
--- a/modules/by-name/qu/qutebrowser/module.hm.nix
+++ b/modules/by-name/qu/qutebrowser/module.hm.nix
@@ -280,7 +280,7 @@ in {
options.programs.qutebrowser = {
enable = lib.mkEnableOption "qutebrowser";
- package = lib.mkPackageOption pkgs "qutebrowser" {};
+ package = lib.mkPackageOption pkgs "qutebrowser" {nullable = true;};
loadAutoconfig = lib.mkOption {
type = lib.types.bool;
@@ -429,7 +429,7 @@ in {
in
lib.mkIf cfg.enable {
home = {
- packages = [cfg.package];
+ packages = lib.mkIf (cfg.package != null) [cfg.package];
file = {
".qutebrowser/config.py" = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {
diff --git a/modules/by-name/qu/qutebrowser/module.nix b/modules/by-name/qu/qutebrowser/module.nix
index dab06237..51c1b239 100644
--- a/modules/by-name/qu/qutebrowser/module.nix
+++ b/modules/by-name/qu/qutebrowser/module.nix
@@ -2,7 +2,7 @@
config,
lib,
pkgs,
- self,
+ sources,
...
}: let
cfg = config.soispha.programs.qutebrowser;
@@ -80,7 +80,7 @@ in {
config = lib.mkIf cfg.enable {
home-manager.users.soispha = {
disabledModules = [
- "${self.inputs.home-manager}/modules/programs/qutebrowser.nix"
+ "${sources.sources.home-manager}/modules/programs/qutebrowser.nix"
];
imports = [
./module.hm.nix
@@ -90,7 +90,7 @@ in {
programs.qutebrowser = {
enable = true;
- package = pkgs.hello; # TODO: Set to null, once supported <2025-06-06>
+ package = null;
settings = import ./settings {
inherit lib pkgs;
diff --git a/modules/by-name/qu/qutebrowser/settings/default.nix b/modules/by-name/qu/qutebrowser/settings/default.nix
index 282c5816..b0259c22 100644
--- a/modules/by-name/qu/qutebrowser/settings/default.nix
+++ b/modules/by-name/qu/qutebrowser/settings/default.nix
@@ -502,11 +502,11 @@ in {
"@du" = duckduckgo;
# NIX
- "@np" = "https://search.nixos.org/packages?type=packages&query={}"; # Nix packages
+ "@np" = "https://search.nixos.org/packages?channel=unstable&type=packages&query={}"; # Nix packages
"@ng" = "https://noogle.dev/q?term={}"; # Nix functions
- "@no" = "https://search.nixos.org/options?type=options&query={}"; # NixOS options
+ "@no" = "https://search.nixos.org/options?channel=unstable&type=options&query={}"; # NixOS options
"@nh" = "https://home-manager-options.extranix.com/?query={}&release=master"; # Home-Manager options
"@ni" = "https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+{}"; # Nixpkgs issues