Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

firefox: support bookmark tags (#3942)

Browse source
This commit is contained in:
Naïm Favier 2023-05-04 16:58:13 +02:00 committed by GitHub
parent 6abb775e75
commit ae6d5466bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/programs/firefox.nix
View file

@ -71,6 +71,9 @@ let
}" ADD_DATE="0" LAST_MODIFIED="0"${ }" ADD_DATE="0" LAST_MODIFIED="0"${
lib.optionalString (bookmark.keyword != null) lib.optionalString (bookmark.keyword != null)
" SHORTCUTURL=\"${escapeXML bookmark.keyword}\"" " SHORTCUTURL=\"${escapeXML bookmark.keyword}\""
}${
lib.optionalString (bookmark.tags != [ ])
" TAGS=\"${escapeXML (concatStringsSep "," bookmark.tags)}\""
}>${escapeXML bookmark.name}</A>''; }>${escapeXML bookmark.name}</A>'';
directoryToHTML = indentLevel: directory: '' directoryToHTML = indentLevel: directory: ''
@ -251,6 +254,12 @@ in {
description = "Bookmark name."; description = "Bookmark name.";
}; };
tags = mkOption {
type = types.listOf types.str;
default = [ ];
description = "Bookmark tags.";
};
keyword = mkOption { keyword = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
@ -300,6 +309,7 @@ in {
[ [
{ {
name = "wikipedia"; name = "wikipedia";
tags = [ "wiki" ];
keyword = "wiki"; keyword = "wiki";
url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go"; url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go";
} }
@ -317,6 +327,7 @@ in {
} }
{ {
name = "wiki"; name = "wiki";
tags = [ "wiki" "nix" ];
url = "https://nixos.wiki/"; url = "https://nixos.wiki/";
} }
]; ];

4
tests/modules/programs/firefox/profile-settings-expected-bookmarks.html
View file

@ -10,12 +10,12 @@
<DL><p> <DL><p>
<DT><A HREF="https://nixos.wiki/wiki/Home_Manager" ADD_DATE="0" LAST_MODIFIED="0">Home Manager</A> <DT><A HREF="https://nixos.wiki/wiki/Home_Manager" ADD_DATE="0" LAST_MODIFIED="0">Home Manager</A>
</p></DL> </p></DL>
<DT><A HREF="https://en.wikipedia.org/wiki/Special:Search?search=%s&amp;go=Go" ADD_DATE="0" LAST_MODIFIED="0" SHORTCUTURL="wiki">wikipedia</A> <DT><A HREF="https://en.wikipedia.org/wiki/Special:Search?search=%s&amp;go=Go" ADD_DATE="0" LAST_MODIFIED="0" SHORTCUTURL="wiki" TAGS="wiki">wikipedia</A>
<DT><A HREF="https://www.kernel.org" ADD_DATE="0" LAST_MODIFIED="0">kernel.org</A> <DT><A HREF="https://www.kernel.org" ADD_DATE="0" LAST_MODIFIED="0">kernel.org</A>
<DT><H3>Nix sites</H3> <DT><H3>Nix sites</H3>
<DL><p> <DL><p>
<DT><A HREF="https://nixos.org/" ADD_DATE="0" LAST_MODIFIED="0">homepage</A> <DT><A HREF="https://nixos.org/" ADD_DATE="0" LAST_MODIFIED="0">homepage</A>
<DT><A HREF="https://nixos.wiki/" ADD_DATE="0" LAST_MODIFIED="0">wiki</A> <DT><A HREF="https://nixos.wiki/" ADD_DATE="0" LAST_MODIFIED="0" TAGS="wiki,nix">wiki</A>
<DT><H3>Nix sites</H3> <DT><H3>Nix sites</H3>
<DL><p> <DL><p>
<DT><A HREF="https://nixos.org/" ADD_DATE="0" LAST_MODIFIED="0">homepage</A> <DT><A HREF="https://nixos.org/" ADD_DATE="0" LAST_MODIFIED="0">homepage</A>

2
tests/modules/programs/firefox/profile-settings.nix
View file

@ -31,6 +31,7 @@ lib.mkIf config.test.enableBig {
} }
{ {
name = "wikipedia"; name = "wikipedia";
tags = [ "wiki" ];
keyword = "wiki"; keyword = "wiki";
url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go"; url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go";
} }
@ -47,6 +48,7 @@ lib.mkIf config.test.enableBig {
} }
{ {
name = "wiki"; name = "wiki";
tags = [ "wiki" "nix" ];
url = "https://nixos.wiki/"; url = "https://nixos.wiki/";
} }
{ {