From 87c5a251239d5910979d461e24ccee16d58fda74 Mon Sep 17 00:00:00 2001
From: Yuri Tatishchev <itatishch@gmail.com>
Date: Tue, 29 Sep 2026 22:05:31 -0700
Subject: [PATCH] desktop: get rid of flatpak fonts workaround

a
---
 hosts/common-desktop.nix        |  1 -
 hosts/vm/default.nix            |  1 -
 modules/default.nix             |  1 -
 modules/workarounds/default.nix |  5 ----
 modules/workarounds/flatpak.nix | 44 ---------------------------------
 5 files changed, 52 deletions(-)
 delete mode 100644 modules/workarounds/default.nix
 delete mode 100644 modules/workarounds/flatpak.nix

diff --git a/hosts/common-desktop.nix b/hosts/common-desktop.nix
index ef7bf9c..6efaef9 100644
--- a/hosts/common-desktop.nix
+++ b/hosts/common-desktop.nix
@@ -82,7 +82,6 @@
   # https://github.com/flatpak/flatpak/issues/2861
   xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
 
-  workarounds.flatpak.enable = true;
   fonts.packages = with pkgs; [
     fantasque-sans-mono
     nerd-fonts.fantasque-sans-mono
diff --git a/hosts/vm/default.nix b/hosts/vm/default.nix
index 935708d..da94a03 100644
--- a/hosts/vm/default.nix
+++ b/hosts/vm/default.nix
@@ -70,7 +70,6 @@
   # https://github.com/flatpak/flatpak/issues/2861
   xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
 
-#  workarounds.flatpak.enable = true;
   fonts.packages = with pkgs; [
     noto-fonts-cjk-sans
     noto-fonts-cjk-serif
diff --git a/modules/default.nix b/modules/default.nix
index 0ece505..af05e65 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,6 +1,5 @@
 { ... }: {
   imports = [
     ./opts
-    ./workarounds
   ];
 }
diff --git a/modules/workarounds/default.nix b/modules/workarounds/default.nix
deleted file mode 100644
index 0fb53df..0000000
--- a/modules/workarounds/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./flatpak.nix
-  ];
-}
diff --git a/modules/workarounds/flatpak.nix b/modules/workarounds/flatpak.nix
deleted file mode 100644
index d3c4905..0000000
--- a/modules/workarounds/flatpak.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.kdePackages) breeze;
-          inherit
-            (pkgs)
-            noto-fonts
-            noto-fonts-color-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";
-    };
-  };
-}