summaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-09-18 11:12:19 +0200
committerAlex Auvolat <alex@adnab.me>2023-09-18 11:12:19 +0200
commitc6278da5728f88cd2f254992f7555d05df8382eb (patch)
tree6d745b14fb5e556f3d268d01bb547cdfcc6ca7af /nixos
parent6d998c3f8c7960338621bd5317522249ca234d70 (diff)
downloaduser-config-c6278da5728f88cd2f254992f7555d05df8382eb.tar.gz
user-config-c6278da5728f88cd2f254992f7555d05df8382eb.zip
fix xkb; fix qutebrowser config
Diffstat (limited to 'nixos')
-rw-r--r--nixos/common.nix20
1 files changed, 16 insertions, 4 deletions
diff --git a/nixos/common.nix b/nixos/common.nix
index bcecd32..1917f1a 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -82,9 +82,6 @@ in
description = "French (LX custom azerty)";
languages = ["fre"];
symbolsFile = ../xkb/symbols/fr-custom-lx;
- compatFile = ../xkb/compat/fr-custom-lx;
- typesFile = ../xkb/types/fr-custom-lx;
- keycodesFile = ../xkb/keycodes/fr-custom-lx;
};
# Enable CUPS to print documents.
@@ -136,12 +133,27 @@ in
keep-derivations = true
'';
+ nixpkgs.overlays = [
+ # fix jellyfin media player to not try to use wayland-egl backend
+ (self: super: {
+ jellyfin-media-player = pkgs.symlinkJoin {
+ name = "jellyfin-media-player";
+ paths = [ super.jellyfin-media-player ];
+ buildInputs = [ pkgs.makeWrapper ];
+ postBuild = ''
+ wrapProgram $out/bin/jellyfinmediaplayer --set QT_QPA_PLATFORM xcb
+ '';
+ };
+ })
+ ];
+
fonts.fonts = with pkgs; [
profont
symbola
ipafont
hanazono
takao
+ font-awesome
];
environment.systemPackages = with pkgs; [
@@ -208,7 +220,7 @@ in
alacritty
firefox
qutebrowser
- (tor-browser-bundle-bin.override { useHardenedMalloc = false; })
+ tor-browser-bundle-bin
lagrange
thunderbird
qbittorrent