diff --git a/home-manager/firefox/config/preferences.nix b/home-manager/firefox/config/preferences.nix index f3cb96a..125a578 100644 --- a/home-manager/firefox/config/preferences.nix +++ b/home-manager/firefox/config/preferences.nix @@ -58,8 +58,12 @@ "browser.download.useDownloadDir" = false; "browser.download.dir" = "/tmp"; # Restore previous session automatically - "browser.startup.page"= 3; + "browser.startup.page" = 3; "extensions.activeThemeID" = "{5cd68d86-8324-4ab2-9e0d-3afcc60bee5f}"; "toolkit.legacyUserProfileCustomizations.stylesheets" = true; "browser.ctrlTab.sortByRecentlyUsed" = true; + # Firefox 75+ remembers the last workspace it was opened on as part of its session management. + # This is annoying, because I can have a blank workspace, open Firefox and + # then have Firefox open on some other workspace + "widget.disable-workspace-management" = true; } diff --git a/pkgs/ente-frontend/default.nix b/pkgs/ente-frontend/default.nix index 33e8f7a..b103044 100644 --- a/pkgs/ente-frontend/default.nix +++ b/pkgs/ente-frontend/default.nix @@ -7,7 +7,7 @@ buildNpmPackage rec { src = "${(fetchGit { url = "git@github.com:oberprofis/ente.git"; ref = "master"; - rev = "42ccf9f7427d8007fce65526e9b9d0443115e476"; + rev = "f82b14a08080865be3c31144787ffaf8509a018a"; })}/website/tracker-site"; npmDepsHash = "sha256-fYTRhIU+8pdIm3wC5wJRcDUhgN3d+mmvfmVzuu0pjLQ="; diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 8f1c189..38b4b75 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -101,6 +101,7 @@ environment.systemPackages = with pkgs; [ libimobiledevice ifuse # optional, to mount using 'ifuse' + (callPackage ./zen.nix {}) ]; nixpkgs.config.permittedInsecurePackages = [ diff --git a/systems/pc/zen.nix b/systems/pc/zen.nix new file mode 100644 index 0000000..d9ccea4 --- /dev/null +++ b/systems/pc/zen.nix @@ -0,0 +1,28 @@ +{ appimageTools, fetchurl, ... }: +let + pname = "zen"; + version = "latest"; + + src = fetchurl { + url = "https://github.com/zen-browser/desktop/releases/latest/download/zen-x86_64.AppImage"; + sha256 = "sha256-hZiJ8JLzLhtD1W8DAso3yBAJYhFE+nJEbQJa59AWjnU="; + }; + + appimageContents = appimageTools.extract { + inherit pname version src; + }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + # Install .desktop file + install -m 444 -D ${appimageContents}/zen.desktop $out/share/applications/${pname}.desktop + # Install icon + install -m 444 -D ${appimageContents}/zen.png $out/share/icons/hicolor/128x128/apps/${pname}.png + ''; + + meta = { + platforms = [ "x86_64-linux" ]; + }; +}