flatpak font workarounds
This commit is contained in:
parent
d7c234db82
commit
0fdd9efff2
@ -24,33 +24,9 @@
|
|||||||
|
|
||||||
boot.loader.timeout = 3;
|
boot.loader.timeout = 3;
|
||||||
boot.loader.systemd-boot.configurationLimit = 5;
|
boot.loader.systemd-boot.configurationLimit = 5;
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
|
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
|
||||||
# boot.kernelPackages = pkgs.linuxPackages_6_8;
|
|
||||||
# boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_6;
|
|
||||||
# boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
|
|
||||||
# nix-prefetch-git --url https://github.com/zen-kernel/zen-kernel.git --rev v6.8.9-zen1 --fetch-submodules
|
|
||||||
# boot.kernelPackages = let
|
|
||||||
# version = "6.8.9";
|
|
||||||
# suffix = "zen1"; # use "lqx1" for linux_lqx
|
|
||||||
# in pkgs.linuxKernel.packagesFor (pkgs.linux_zen.override {
|
|
||||||
# inherit version suffix;
|
|
||||||
# modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
|
|
||||||
# src = pkgs.fetchFromGitHub {
|
|
||||||
# owner = "zen-kernel";
|
|
||||||
# repo = "zen-kernel";
|
|
||||||
# rev = "v${version}-${suffix}";
|
|
||||||
# sha256 = "1wva92wk0pxii4f6hn27kssgrz8yy38kk38w2wm5hh1qyz3ij1vj";
|
|
||||||
# };
|
|
||||||
# });
|
|
||||||
|
|
||||||
boot.extraModulePackages = with config.boot.kernelPackages; [ zfs ];
|
boot.extraModulePackages = with config.boot.kernelPackages; [ zfs ];
|
||||||
|
|
||||||
# https://discourse.nixos.org/t/dev-zfs-has-the-wrong-permissions-after-rebooting/48737
|
|
||||||
# environment.etc."tmpfiles.d/zfs.conf".text = ''
|
|
||||||
# z /dev/zfs 0666 - - -
|
|
||||||
# '';
|
|
||||||
|
|
||||||
# https://nixos.wiki/wiki/Accelerated_Video_Playback
|
# https://nixos.wiki/wiki/Accelerated_Video_Playback
|
||||||
hardware.graphics = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -58,7 +34,6 @@
|
|||||||
intel-media-driver # LIBVA_DRIVER_NAME=iHD
|
intel-media-driver # LIBVA_DRIVER_NAME=iHD
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
# environment.sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; }; # Force intel-media-driver
|
|
||||||
|
|
||||||
environment.etc.hosts.mode = "0644";
|
environment.etc.hosts.mode = "0644";
|
||||||
|
|
||||||
@ -110,7 +85,7 @@
|
|||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
|
|
||||||
# Enable sound with pipewire.
|
# Enable sound with pipewire.
|
||||||
hardware.pulseaudio.enable = false;
|
services.pulseaudio.enable = false;
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -183,7 +158,6 @@
|
|||||||
group = "cazzzer";
|
group = "cazzzer";
|
||||||
extraGroups = [ "networkmanager" "wheel" "docker" "wireshark" "geoclue" ];
|
extraGroups = [ "networkmanager" "wheel" "docker" "wireshark" "geoclue" ];
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
# python312Packages.torch
|
|
||||||
|
|
||||||
kdePackages.kate
|
kdePackages.kate
|
||||||
kdePackages.yakuake
|
kdePackages.yakuake
|
||||||
@ -198,14 +172,6 @@
|
|||||||
nodejs_22
|
nodejs_22
|
||||||
pnpm
|
pnpm
|
||||||
bun
|
bun
|
||||||
|
|
||||||
# yin_yang deps, f*** this packaging s***
|
|
||||||
# python312Packages.systemd
|
|
||||||
# python312Packages.pyside6
|
|
||||||
# python312Packages.dateutils
|
|
||||||
# python312Packages.psutil
|
|
||||||
# libnotify
|
|
||||||
# thunderbird
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -286,23 +252,25 @@
|
|||||||
zlib
|
zlib
|
||||||
];
|
];
|
||||||
|
|
||||||
# attempt to fix flatpak firefox cjk fonts
|
# attempt to fix flatpak firefox cjk fonts
|
||||||
# fonts.fontconfig.defaultFonts.serif = [
|
# fonts.fontconfig.defaultFonts.serif = [
|
||||||
# "Noto Serif"
|
# "Noto Serif"
|
||||||
# "DejaVu Serif"
|
# "DejaVu Serif"
|
||||||
# ];
|
# ];
|
||||||
|
# fonts.fontconfig.defaultFonts.sansSerif = [
|
||||||
|
# "Noto Sans"
|
||||||
|
# "DejaVu Sans"
|
||||||
|
# ];
|
||||||
|
|
||||||
|
workarounds.flatpak.enable = true;
|
||||||
|
fonts.packages = with pkgs; [ nerd-fonts.fantasque-sans-mono ];
|
||||||
|
# fonts.fontDir.enable = true;
|
||||||
|
# fonts.fontconfig.allowBitmaps = false;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# level-zero
|
|
||||||
# oneDNN
|
|
||||||
# python312Packages.torch
|
|
||||||
# zfs
|
|
||||||
# fish
|
|
||||||
|
|
||||||
bat
|
bat
|
||||||
# bluez
|
# bluez
|
||||||
# docker_27
|
darkman
|
||||||
# docker-compose
|
|
||||||
dust
|
dust
|
||||||
efibootmgr
|
efibootmgr
|
||||||
eza
|
eza
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
Yura-PC = nixpkgs.lib.nixosSystem {
|
Yura-PC = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
|
./modules
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
5
modules/default.nix
Normal file
5
modules/default.nix
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{...}: {
|
||||||
|
imports = [
|
||||||
|
./workarounds
|
||||||
|
];
|
||||||
|
}
|
5
modules/workarounds/default.nix
Normal file
5
modules/workarounds/default.nix
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./flatpak.nix
|
||||||
|
];
|
||||||
|
}
|
44
modules/workarounds/flatpak.nix
Normal file
44
modules/workarounds/flatpak.nix
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
# https://github.com/knightpp/nixos-cfg/blob/main/modules/workarounds/flatpak.nix
|
||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.workarounds.flatpak;
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
workarounds.flatpak = {
|
||||||
|
enable = lib.mkEnableOption "flatpak workaround";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
system.fsPackages = [pkgs.bindfs];
|
||||||
|
fileSystems = let
|
||||||
|
mkRoSymBind = path: {
|
||||||
|
device = path;
|
||||||
|
fsType = "fuse.bindfs";
|
||||||
|
options = ["ro" "resolve-symlinks" "x-gvfs-hide"];
|
||||||
|
};
|
||||||
|
aggregated = pkgs.buildEnv {
|
||||||
|
name = "system-fonts-and-icons";
|
||||||
|
paths = builtins.attrValues {
|
||||||
|
inherit (pkgs.libsForQt5) breeze-qt5;
|
||||||
|
inherit
|
||||||
|
(pkgs)
|
||||||
|
noto-fonts
|
||||||
|
noto-fonts-emoji
|
||||||
|
noto-fonts-cjk-sans
|
||||||
|
noto-fonts-cjk-serif
|
||||||
|
;
|
||||||
|
};
|
||||||
|
pathsToLink = ["/share/fonts" "/share/icons"];
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
# Create an FHS mount to support flatpak host icons/fonts
|
||||||
|
"/usr/share/icons" = mkRoSymBind "${aggregated}/share/icons";
|
||||||
|
"/usr/share/fonts" = mkRoSymBind "${aggregated}/share/fonts";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user