From 4caf2312e7facd52362d9813cc15f3fe938f507a Mon Sep 17 00:00:00 2001 From: William Date: Sun, 10 Mar 2024 11:12:13 -0300 Subject: [PATCH] Revert "flatpak temp font and icon fix" This reverts commit f1b5f0fde955901cc573403e3f624adb997b98c2. --- hosts/desktops/common/default.nix | 1 - hosts/desktops/common/flatpakfix.nix | 27 --------------------------- 2 files changed, 28 deletions(-) delete mode 100644 hosts/desktops/common/flatpakfix.nix diff --git a/hosts/desktops/common/default.nix b/hosts/desktops/common/default.nix index dc64274..02b2402 100644 --- a/hosts/desktops/common/default.nix +++ b/hosts/desktops/common/default.nix @@ -3,7 +3,6 @@ { imports = [ ./boot.nix - ./flatpakfix.nix ./hardware.nix ./home-manager.nix ./impermanence.nix diff --git a/hosts/desktops/common/flatpakfix.nix b/hosts/desktops/common/flatpakfix.nix deleted file mode 100644 index 296d54f..0000000 --- a/hosts/desktops/common/flatpakfix.nix +++ /dev/null @@ -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"; - }; -}