-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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.
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
firefox: split bookmarks into separate submodule file #6402
base: master
Are you sure you want to change the base?
firefox: split bookmarks into separate submodule file #6402
Conversation
@@ -2,7 +2,7 @@ | |||
|
|||
|
|||
|
|||
user_pref("browser.bookmarks.file", "/nix/store/00000000000000000000000000000000-@name@-bookmarks.html"); | |||
user_pref("browser.bookmarks.file", "/nix/store/00000000000000000000000000000000-bookmarks.html"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The app name isn't necessary for this file, so I just removed it to make things simpler.
Thanks for your contribution! I like the direction you're going with splitting everything into selfcontained submodules. I see that you renamed the Apart from that it looks good to me! |
Did you add yourself as maintainer for the module? |
Oh yep, that's why I kept that option as internal so it won't be exposed to the user. The alias I added for
Oh nope, I'm not too familiar with the bookmarks code and I don't use it myself. I was just going through other options that could be broken out into submodules (without any existing related PRs to avoid merge conflicts). I'm not quite sure who'd be best to add here 🤔 - would it be ok to add you and @rycee? @ethorsoe, would you be interested in being the maintainer since you originally added bookmarks support in #2355? |
Oh wait, actually I like the idea of the submodule matching NixOS/rfcs#42. I'll rename |
f562152
to
b7add2c
Compare
Oh, I didn't catch that! In that case it shouldn't matter what the option containing the submodule is called. |
Hmmmm, I'm realizing that like the search submodule, this could potentially override any existing bookmarks. I was planning on making the That would be a breaking change though 😅 - I guess there's no point trying to avoid it. |
b7add2c
to
eee18d9
Compare
Ok it should be good now! |
description = "Bookmark tags."; | ||
}; | ||
type = (with types; | ||
coercedTo (listOf anything) (bookmarks: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I used (listOf anything)
here because I couldn't find a nice way to pull out the original type from the submodule.
I don't believe this is an issue since this will just redirect you to the new submodule format.
eee18d9
to
7475712
Compare
Ok, I decided to add myself as a maintainer, since this change ended up becoming more than just a simple refactor, and I feel familiar enough with the code now. Ideally it'd be nice to have a maintainer who actually uses this feature though! I'm realizing, I might actually reconsider adding myself back as maintainer for all of firefox once we have everything organized out into smaller submodule files. |
7475712
to
31fd994
Compare
31fd994
to
c382fd6
Compare
@@ -786,9 +660,9 @@ in { | |||
|
|||
"${profilesPath}/${profile.path}/user.js" = mkIf (profile.preConfig != "" | |||
|| profile.settings != { } || profile.extraConfig != "" | |||
|| profile.bookmarks != [ ]) { | |||
|| profile.bookmarks.enable) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does this change the compatibility, with existing configs and if so why is it done?
I still prefer |
Description
This splits the bookmarks submodule into a seperate file, to make it easier to maintain (like how the search module was previously split out in #5697).
Checklist
Change is backwards compatible.
Code formatted with
./format
.Code tested through
nix-shell --pure tests -A run.all
or
nix build --reference-lock-file flake.lock ./tests#test-all
using Flakes.Test cases updated/added. See example.
Commit messages are formatted like
See CONTRIBUTING for more information and recent commit messages for examples.
If this PR adds a new module
Maintainer CC
@brckd @rycee