From 827f1769bb93e067e5339d3b538add772ca5795b Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Wed, 19 Apr 2023 15:11:10 +0900
Subject: [PATCH] Using discord on flatpak

---
 modules/home/apps/default.nix         |  1 -
 modules/home/hyprland/default.nix     |  1 -
 modules/nixos/fonts/default.nix       |  1 +
 modules/nixos/fonts/flatpak_fonts.nix | 24 ++++++++++++++++++++++++
 modules/nixos/nix/default.nix         |  2 +-
 5 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 modules/nixos/fonts/flatpak_fonts.nix

diff --git a/modules/home/apps/default.nix b/modules/home/apps/default.nix
index aa97b21..92e3620 100644
--- a/modules/home/apps/default.nix
+++ b/modules/home/apps/default.nix
@@ -31,7 +31,6 @@ in {
         firefox
         mpv
         xdg-utils
-        discord
         swaylock
         swayidle
         zathura
diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix
index 977fc15..46fd505 100644
--- a/modules/home/hyprland/default.nix
+++ b/modules/home/hyprland/default.nix
@@ -14,7 +14,6 @@ in {
       home.packages = with pkgs; [
         nur.repos.ocfox.swww
         xorg.xprop
-        discord
         kitty
         grim
         slurp
diff --git a/modules/nixos/fonts/default.nix b/modules/nixos/fonts/default.nix
index d610b93..26bf0fd 100644
--- a/modules/nixos/fonts/default.nix
+++ b/modules/nixos/fonts/default.nix
@@ -6,6 +6,7 @@
 }: let
   cfg = config.fonts;
 in {
+  imports = [./flatpak_fonts.nix];
   options.fonts = {enable = lib.mkEnableOption "fonts";};
   config = lib.mkIf cfg.enable {
     console = {
diff --git a/modules/nixos/fonts/flatpak_fonts.nix b/modules/nixos/fonts/flatpak_fonts.nix
new file mode 100644
index 0000000..169b683
--- /dev/null
+++ b/modules/nixos/fonts/flatpak_fonts.nix
@@ -0,0 +1,24 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  system.fsPackages = [pkgs.bindfs];
+  fileSystems = let
+    mkRoSymBind = path: {
+      device = path;
+      fsType = "fuse.bindfs";
+      options = ["ro" "resolve-symlinks" "x-gvfs-hide"];
+    };
+    aggregatedFonts = pkgs.buildEnv {
+      name = "system-fonts";
+      paths = config.fonts.fonts;
+      pathsToLink = ["/share/fonts"];
+    };
+  in {
+    # Create an FHS mount to support flatpak host icons/fonts
+    # icons don't work, don't know why, don't care
+    # "/usr/share/icons" = mkRoSymBind (config.system.path + "/share/icons");
+    "/usr/share/fonts" = mkRoSymBind (aggregatedFonts + "/share/fonts");
+  };
+}
diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix
index 987f4a9..32485f0 100644
--- a/modules/nixos/nix/default.nix
+++ b/modules/nixos/nix/default.nix
@@ -55,7 +55,7 @@ in {
           ".cache/flatpak"
           ".local/share/atuin"
           # Cache for sessions (keep website logged in, plugin downloaded...)
-          "./mozilla"
+          ".mozilla"
           ".config/google-chrome"
           ".config/discord"
           # Don't reinstall plugins on reboot