From 11fcfa02c891a6df60506ee83c79cecf4ca16761 Mon Sep 17 00:00:00 2001
From: ChaosAttractor <lostattractor@gmail.com>
Date: Thu, 29 Feb 2024 03:55:33 +0800
Subject: [PATCH] flatpak: fonts binding is not needed anymore

https://github.com/NixOS/nixpkgs/pull/262462
---
 platform/modules/features/flatpak.nix | 29 +--------------------------
 user/home.nix                         |  1 -
 user/settings/flatpak.nix             |  7 -------
 3 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 user/settings/flatpak.nix

diff --git a/platform/modules/features/flatpak.nix b/platform/modules/features/flatpak.nix
index 0a2e5e2b0d..8a219b33c7 100644
--- a/platform/modules/features/flatpak.nix
+++ b/platform/modules/features/flatpak.nix
@@ -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";
-  };
 }
\ No newline at end of file
diff --git a/user/home.nix b/user/home.nix
index 006d33e4ed..e9cfe6319e 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -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
diff --git a/user/settings/flatpak.nix b/user/settings/flatpak.nix
deleted file mode 100644
index fd9508f6a2..0000000000
--- a/user/settings/flatpak.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-_:
-{
-  xdg.dataFile."flatpak/overrides/global".text = ''
-    [Context]
-    filesystems=/usr/share/fonts:ro;/usr/share/icons:ro
-  '';
-}
\ No newline at end of file