Skip to content

Commit

Permalink
flatpak: fonts binding is not needed anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
LostAttractor committed Feb 28, 2024
1 parent 235a426 commit 11fcfa0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 36 deletions.
29 changes: 1 addition & 28 deletions platform/modules/features/flatpak.nix
Original file line number Diff line number Diff line change
@@ -1,31 +1,4 @@
{ pkgs, config, ... }:
_:
{
services.flatpak.enable = true;

# Using bindfs to create FHS font & icon directory
system.fsPackages = [ pkgs.bindfs ];
fileSystems = let
mkRoSymBind = path: {
device = path;
fsType = "fuse.bindfs";
options = [ "ro" "resolve-symlinks" "x-gvfs-hide" ];
};
aggregatedIcons = pkgs.buildEnv {
name = "system-icons";
paths = with pkgs; [
breeze-qt5
papirus-icon-theme
];
pathsToLink = [ "/share/icons" ];
};
aggregatedFonts = pkgs.buildEnv {
name = "system-fonts";
paths = config.fonts.packages;
pathsToLink = [ "/share/fonts" ];
};
in {
# Create an FHS mount to support flatpak host icons/fonts
"/usr/share/icons" = mkRoSymBind "${aggregatedIcons}/share/icons";
"/usr/share/fonts" = mkRoSymBind "${aggregatedFonts}/share/fonts";
};
}
1 change: 0 additions & 1 deletion user/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
./desktop
./settings/shell.nix
./settings/i18n.nix
./settings/flatpak.nix
./settings/dconf/gnome.nix
./settings/dconf/fonts.nix
./settings/dconf/blackbox.nix
Expand Down
7 changes: 0 additions & 7 deletions user/settings/flatpak.nix

This file was deleted.

0 comments on commit 11fcfa0

Please sign in to comment.