Skip to content

Properly specify lang tags #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PerchunPak wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Properly specify lang tags #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hm-module/mods.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ in {
profileName: profile: let
themesFilePath = "${profilePath}/${profileName}/zen-themes.json";

updateModsScript = pkgs.writeShellScript "zen-mods-update-${profileName}" '' # bash
updateModsScript = pkgs.writeShellScript "zen-mods-update-${profileName}" /* bash */ ''
THEMES_FILE="${themesFilePath}"
MODS="${lib.concatStringsSep " " profile.mods}"
BASE_DIR="${profilePath}/${profileName}"
Expand Down
4 changes: 2 additions & 2 deletions hm-module/places.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ in {
.groups = (.groups | sort_by(.index // 0))
'';

updateScript = pkgs.writeShellScript "zen-sessions-update-${profileName}" '' # bash
updateScript = pkgs.writeShellScript "zen-sessions-update-${profileName}" /* bash */ ''
SESSIONS_FILE="${sessionsFile}"
SESSIONS_TMP="$(mktemp)"
SESSIONS_MODIFIED="$(mktemp)"
Expand Down Expand Up @@ -568,7 +568,7 @@ in {
rm -f "$BACKUP_FILE"
'';
in
nameValuePair "zen-sessions-${profileName}" (lib.hm.dag.entryAfter ["writeBoundary"] '' # bash
nameValuePair "zen-sessions-${profileName}" (lib.hm.dag.entryAfter ["writeBoundary"] /* bash */ ''
${updateScript}
if [[ "$?" -eq 0 ]]; then
$VERBOSE_ECHO "zen-sessions: Updated spaces/pins for profile '${profileName}'"
Expand Down
4 changes: 2 additions & 2 deletions hm-module/sine.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ in {
profileName: profile: let
modsFilePath = "${profilePath}/${profileName}/chrome/sine-mods/mods.json";

updateSineModsScript = pkgs.writeShellScript "zen-sine-mods-update-${profileName}" '' # bash
updateSineModsScript = pkgs.writeShellScript "zen-sine-mods-update-${profileName}" /* bash */ ''
MODS_FILE="${modsFilePath}"
SINE_MODS="${lib.concatStringsSep " " profile.sine.mods}"
BASE_DIR="${profilePath}/${profileName}"
Expand Down Expand Up @@ -271,7 +271,7 @@ in {
fi
'';
in
nameValuePair "zen-sine-mods-${profileName}" (lib.hm.dag.entryAfter ["writeBoundary"] '' # bash
nameValuePair "zen-sine-mods-${profileName}" (lib.hm.dag.entryAfter ["writeBoundary"] /* bash */ ''
${updateSineModsScript}
if [[ "$?" -eq 0 ]]; then
$VERBOSE_ECHO "zen-sine-mods: Updated sine mods for profile '${profileName}'"
Expand Down
4 changes: 2 additions & 2 deletions package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
then "zen-browser"
else binaryName;

installDarwin = '' # bash
installDarwin = /* bash */ ''
runHook preInstall

mkdir -p "$out/Applications" "$out/bin"
Expand Down Expand Up @@ -97,7 +97,7 @@
runHook postInstall
'';

installLinux = '' # bash
installLinux = /* bash */ ''
runHook preInstall

# Linux tarball installation
Expand Down
4 changes: 2 additions & 2 deletions tests/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
inherit pkgs home-manager;
zen-browser-flake = self;

wrapWithX11 = testScript: '' # python
wrapWithX11 = testScript: /* python */ ''
machine.succeed("( nohup Xvfb :99 -screen 0 1024x768x24 </dev/null >>/tmp/xvfb.log 2>&1 & )")
machine.succeed("sleep 2")
machine.succeed("su - testuser -c 'DISPLAY=:99 timeout 5 zen-beta about:blank' || true")
Expand Down Expand Up @@ -53,7 +53,7 @@
];
};

testScript = '' # python
testScript = /* python */ ''
machine.wait_for_unit("multi-user.target")
machine.wait_for_unit("home-manager-testuser.service")
${suite.testScript}
Expand Down
2 changes: 1 addition & 1 deletion tests/enable-beta.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
};
};

testScript = '' # python
testScript = /* python */ ''
machine.succeed("su - testuser -c 'zen-beta --version'")
'';
}
2 changes: 1 addition & 1 deletion tests/pins-persistent.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
};
};

testScript = wrapWithX11 '' # python
testScript = wrapWithX11 /* python */ ''
machine.succeed("test -f /home/testuser/.config/zen/profiles.ini")
machine.succeed("grep -q 'Name=default' /home/testuser/.config/zen/profiles.ini")
machine.succeed("test -d /home/testuser/.config/zen/default")
Expand Down