mirror of
https://github.com/alyraffauf/nixcfg.git
synced 2024-11-22 01:33:55 -05:00
flatpak: integrate workarounds with stylix themes
Some checks are pending
git-mirror / gitlab-sync (push) Waiting to run
nix-build / default-build (push) Waiting to run
nix-build / fallarbor-build (push) Waiting to run
nix-build / lavaridge-build (push) Waiting to run
nix-build / mauville-build (push) Waiting to run
nix-build / petalburg-build (push) Waiting to run
nix-build / rustboro-build (push) Waiting to run
nix-build / slateport-build (push) Waiting to run
nix-check / fmt-check (push) Waiting to run
nix-check / eval-check (push) Waiting to run
Some checks are pending
git-mirror / gitlab-sync (push) Waiting to run
nix-build / default-build (push) Waiting to run
nix-build / fallarbor-build (push) Waiting to run
nix-build / lavaridge-build (push) Waiting to run
nix-build / mauville-build (push) Waiting to run
nix-build / petalburg-build (push) Waiting to run
nix-build / rustboro-build (push) Waiting to run
nix-build / slateport-build (push) Waiting to run
nix-check / fmt-check (push) Waiting to run
nix-check / eval-check (push) Waiting to run
This commit is contained in:
parent
d761532a9b
commit
21b9653225
|
@ -13,18 +13,44 @@
|
||||||
fsType = "fuse.bindfs";
|
fsType = "fuse.bindfs";
|
||||||
options = ["ro" "resolve-symlinks" "x-gvfs-hide"];
|
options = ["ro" "resolve-symlinks" "x-gvfs-hide"];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
aggregatedIcons = pkgs.buildEnv {
|
||||||
|
name = "system-icons";
|
||||||
|
paths =
|
||||||
|
(with pkgs; [
|
||||||
|
gnome.adwaita-icon-theme
|
||||||
|
gnome.gnome-themes-extra
|
||||||
|
])
|
||||||
|
++ lib.optional (config.stylix.enable) config.stylix.cursor.package;
|
||||||
|
|
||||||
|
pathsToLink = ["/share/icons"];
|
||||||
|
};
|
||||||
|
|
||||||
aggregatedFonts = pkgs.buildEnv {
|
aggregatedFonts = pkgs.buildEnv {
|
||||||
name = "system-fonts";
|
name = "system-fonts";
|
||||||
paths = config.fonts.packages;
|
paths = config.fonts.packages;
|
||||||
pathsToLink = ["/share/fonts"];
|
pathsToLink = ["/share/fonts"];
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
# Create an FHS mount to support flatpak host icons/fonts
|
"/usr/share/icons" = mkRoSymBind "${aggregatedIcons}/share/icons";
|
||||||
"/usr/share/icons" = mkRoSymBind (config.system.path + "/share/icons");
|
"/usr/local/share/fonts" = mkRoSymBind "${aggregatedFonts}/share/fonts";
|
||||||
"/usr/share/fonts" = mkRoSymBind (aggregatedFonts + "/share/fonts");
|
};
|
||||||
|
|
||||||
|
fonts = {
|
||||||
|
fontDir.enable = true;
|
||||||
|
packages =
|
||||||
|
(with pkgs; [
|
||||||
|
noto-fonts
|
||||||
|
noto-fonts-emoji
|
||||||
|
noto-fonts-cjk
|
||||||
|
])
|
||||||
|
++ lib.optionals (config.stylix.enable) [
|
||||||
|
config.stylix.fonts.sansSerif.package
|
||||||
|
config.stylix.fonts.monospace.package
|
||||||
|
config.stylix.fonts.serif.package
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
fonts.fontDir.enable = true;
|
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
system.fsPackages = [pkgs.bindfs];
|
system.fsPackages = [pkgs.bindfs];
|
||||||
xdg.portal.enable = true;
|
xdg.portal.enable = true;
|
||||||
|
|
Loading…
Reference in a new issue