steam-frame/lhns--steam-frame-nix
1
0 Fork 0
mirror of https://github.com/lhns/steam-frame-nix.git synced 2026-10-06 03:00:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

firefox: write user.js as a copy, not a store symlink

Browse Source 
The Flatpak sandbox doesn't see /nix, so the linked user.js dangled and
Firefox never read it (vrFullscreenFix had no effect). The copy starts with a
marker line, so the module still recognises its own file.
This commit is contained in:
Pierre Kisters committed 2026-09-28 05:19:57 +02:00
1 parent d027502445
commit 9cabba16df
1 file changed
+11 -6
Download Patch File Download Diff File Expand all files Collapse all files
modules/firefox.nix
+11 -6
View File
@@ -2,7 +2,8 @@
# - vrFullscreenFix: in the Steam session gamescope focuses a fullscreen X11 # - vrFullscreenFix: in the Steam session gamescope focuses a fullscreen X11
# window but never shows it (Firefox looks frozen). ignore-widgets keeps # window but never shows it (Firefox looks frozen). ignore-widgets keeps
# fullscreen inside the window. Profile names are random and $HOME isn't # fullscreen inside the window. Profile names are random and $HOME isn't
# readable at eval time, so user.js is linked into each profile on switch. # readable at eval time, so user.js is written into each profile on switch
# (a copy: /nix isn't visible in the Flatpak sandbox, a store link dangles).
# - desktopProfile: the sessions have separate buses/displays, so a second # - desktopProfile: the sessions have separate buses/displays, so a second
# Firefox can't reach the running one and hits the profile lock; the nested # Firefox can't reach the running one and hits the profile lock; the nested
# desktop gets its own profile (no fullscreen fix: fullscreen works there). # desktop gets its own profile (no fullscreen fix: fullscreen works there).
@@ -12,7 +13,8 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
cfg = config.steamFrame.firefox; cfg = config.steamFrame.firefox;
toUserJs = name: prefs: pkgs.writeText name (lib.concatStrings (lib.mapAttrsToList marker = "// Managed by steam-frame-nix (steamFrame.firefox); rewritten on switch.";
toUserJs = name: prefs: pkgs.writeText name (marker + "\n" + lib.concatStrings (lib.mapAttrsToList
(k: v: "user_pref(${builtins.toJSON k}, ${builtins.toJSON v});\n") prefs)); (k: v: "user_pref(${builtins.toJSON k}, ${builtins.toJSON v});\n") prefs));
vrPrefs = cfg.prefs // lib.optionalAttrs cfg.vrFullscreenFix { "full-screen-api.ignore-widgets" = true; }; vrPrefs = cfg.prefs // lib.optionalAttrs cfg.vrFullscreenFix { "full-screen-api.ignore-widgets" = true; };
userJs = toUserJs "firefox-user.js" vrPrefs; userJs = toUserJs "firefox-user.js" vrPrefs;
@@ -73,19 +75,22 @@ in {
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# Linked into every existing profile (profile names are random); an empty # Written into every existing profile (profile names are random); a
# user.js is harmless and keeps turning prefs off revertible. # user.js with no prefs is harmless and keeps turning prefs off revertible.
# Ours: a symlink (older versions) or a file starting with the marker.
home.activation.firefoxUserJs = home.activation.firefoxUserJs =
(lib.hm.dag.entryAfter [ "writeBoundary" ] '' (lib.hm.dag.entryAfter [ "writeBoundary" ] ''
for prof in "${ffDir}"/*/; do for prof in "${ffDir}"/*/; do
[ -f "$prof/prefs.js" ] || continue # only real profiles [ -f "$prof/prefs.js" ] || continue # only real profiles
${pickUserJs} ${pickUserJs}
target="$prof/user.js" target="$prof/user.js"
if [ -e "$target" ] && [ ! -L "$target" ]; then if [ -e "$target" ] && [ ! -L "$target" ] && [ "$(head -n1 "$target")" != ${lib.escapeShellArg marker} ]; then
echo "firefox: skipping $target (not managed by us, move it away to adopt)" echo "firefox: skipping $target (not managed by us, move it away to adopt)"
continue continue
fi fi
run ln -sfn "$js" "$target" cmp -s "$js" "$target" && [ ! -L "$target" ] && continue
run rm -f "$target"
run install -m644 "$js" "$target"
done done
''); '');