diff --git a/modules/apps/media.nix b/modules/apps/media.nix index a46a9d8..416a7ad 100644 --- a/modules/apps/media.nix +++ b/modules/apps/media.nix @@ -14,6 +14,7 @@ with lib; enable = true; packages = [ "com.calibre_ebook.calibre" + "com.github.iwalton3.jellyfin-media-player" "com.github.unrud.VideoDownloader" "io.freetubeapp.FreeTube" "io.github.celluloid_player.Celluloid" diff --git a/modules/ui/flatpak.nix b/modules/ui/flatpak.nix index cc346b8..6a9044f 100644 --- a/modules/ui/flatpak.nix +++ b/modules/ui/flatpak.nix @@ -51,42 +51,5 @@ with lib; # Install base Flatpaks. For details, see https://github.com/gmodena/nix-flatpak packages = cfg.packages; }; - - # Workaround for getting Flatpak apps to use system fonts, icons, and cursors - # For details (and source), see https://github.com/NixOS/nixpkgs/issues/119433#issuecomment-1767513263 - # NOTE: If fonts in Flatpaks appear incorrect (like squares), run this command to regenerate the font cache: - # flatpak list --columns=application | xargs -I %s -- flatpak run --command=fc-cache %s -f -v - 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; [ - (lib.mkIf config.aux.system.ui.desktops.gnome.enable gnome-themes-extra) - (lib.mkIf config.aux.system.ui.desktops.kde.enable kdePackages.breeze-icons) - papirus-icon-theme - qogir-icon-theme - ]; - pathsToLink = [ "/share/icons" ]; - }; - aggregatedFonts = pkgs.buildEnv { - name = "system-fonts"; - paths = config.fonts.packages; - pathsToLink = [ "/share/fonts" ]; - }; - in - { - "/usr/share/icons" = mkRoSymBind "${aggregatedIcons}/share/icons"; - "/usr/local/share/fonts" = mkRoSymBind "${aggregatedFonts}/share/fonts"; - }; }; }