Improve qutebrowser setup for different setups

This commit is contained in:
Daniel Siepmann 2023-07-11 09:02:11 +02:00
parent 5c074b36ef
commit 2e54bd8cc0
Signed by: Daniel Siepmann
GPG Key ID: 33D6629915560EF4
4 changed files with 24 additions and 6 deletions

View File

@ -40,7 +40,7 @@ in {
file = import ./home/files.nix { };
} // import ./home/home.nix {
inherit config pkgs;
inherit config pkgs ownLib;
};
targets.genericLinux.enable = true;

View File

@ -1,4 +1,8 @@
{ config, pkgs }:
{
config
,pkgs
,ownLib
}:
let
enLocale = "en_US.utf8";
@ -79,7 +83,12 @@ in {
TYPO3_CONTEXT = "Development/dsiepmann";
TYPO3_ADDITIONAL_CONFIGURATION = "${config.xdg.dataHome}/typo3-configuration/AdditionalConfiguration.inc.php";
};
} // (if ownLib.onHikari {} then {
} else {
# Fix for qutebrowser
# https://github.com/NixOS/nixpkgs/issues/82959#issuecomment-657306112
QT_XCB_GL_INTEGRATION = "none";
});
shellAliases = {
ll = "ls -laphv --color=auto";

View File

@ -51,6 +51,7 @@ in {
};
qutebrowser = import ./programs/qutebrowser.nix {
inherit ownLib;
};
firefox = import ./programs/firefox.nix {

View File

@ -1,6 +1,14 @@
{}:
{
ownLib
}:
# Does not work on ubuntu right now, this helps: https://github.com/NixOS/nixpkgs/issues/82959#issuecomment-657306112
# Need to add the env variable on my hikari2
let
zoom_default = if ownLib.onHikari {} then "133" else "200";
in {
enable = true;
settings = {
@ -10,7 +18,7 @@
};
zoom = {
default = "133%";
default = "${zoom_default}%";
};
url = {