Revert "flatpak temp font and icon fix"
This reverts commit f1b5f0fde9.
This commit is contained in:
parent
f1b5f0fde9
commit
4caf2312e7
2 changed files with 0 additions and 28 deletions
|
|
@ -3,7 +3,6 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./boot.nix
|
./boot.nix
|
||||||
./flatpakfix.nix
|
|
||||||
./hardware.nix
|
./hardware.nix
|
||||||
./home-manager.nix
|
./home-manager.nix
|
||||||
./impermanence.nix
|
./impermanence.nix
|
||||||
|
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
{ pkgs, config, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
# 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";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue