From 4fdc7f6aef860dbeea88eb6441fc3bc3e6ad8ed5 Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Tue, 15 Jul 2025 00:54:23 +0200 Subject: [PATCH] Modules/Firefox: Fix (?) bookmarks structure --- home/modules/firefox/bookmarks.nix | 153 +++++++++++++++-------------- home/modules/firefox/default.nix | 5 +- home/modules/firefox/settings.nix | 2 - 3 files changed, 83 insertions(+), 77 deletions(-) diff --git a/home/modules/firefox/bookmarks.nix b/home/modules/firefox/bookmarks.nix index e7d7e06b..62f44322 100644 --- a/home/modules/firefox/bookmarks.nix +++ b/home/modules/firefox/bookmarks.nix @@ -5,81 +5,88 @@ let }; in [ { - name = "NixOS"; toolbar = true; bookmarks = [ - (bookmark "Package Search" "https://search.nixos.org/packages") - (bookmark "Option Search" "https://search.nixos.org/options?") - (bookmark "Function Search" "https://noogle.dev/") - (bookmark "HM Option Search" "https://mipmip.github.io/home-manager-option-search/") - (bookmark "NUR Package Sarch" "https://nur.nix-community.org/") - (bookmark "Nix Package Versions" "https://lazamar.co.uk/nix-versions/") - (bookmark "Nixpkgs Progress Tracker" "https://nixpk.gs/pr-tracker.html") - (bookmark "NixOS Wiki" "https://wiki.nixos.org/wiki/NixOS_Wiki") - (bookmark "Nix Manual" "https://nix.dev/manual/nix/stable/") - (bookmark "Nixpkgs Manual" "https://nixos.org/manual/nixpkgs/unstable/") - (bookmark "NixOS Manual" "https://nixos.org/manual/nixos/unstable/") - (bookmark "Nixpkgs Issues" "https://github.com/NixOS/nixpkgs/issues") + # NixOS + + { + name = "NixOS"; + bookmarks = [ + (bookmark "Package Search" "https://search.nixos.org/packages") + (bookmark "Option Search" "https://search.nixos.org/options?") + (bookmark "Function Search" "https://noogle.dev/") + (bookmark "HM Option Search" "https://mipmip.github.io/home-manager-option-search/") + (bookmark "NUR Package Sarch" "https://nur.nix-community.org/") + (bookmark "Nix Package Versions" "https://lazamar.co.uk/nix-versions/") + (bookmark "Nixpkgs Progress Tracker" "https://nixpk.gs/pr-tracker.html") + (bookmark "NixOS Wiki" "https://wiki.nixos.org/wiki/NixOS_Wiki") + (bookmark "Nix Manual" "https://nix.dev/manual/nix/stable/") + (bookmark "Nixpkgs Manual" "https://nixos.org/manual/nixpkgs/unstable/") + (bookmark "NixOS Manual" "https://nixos.org/manual/nixos/unstable/") + (bookmark "Nixpkgs Issues" "https://github.com/NixOS/nixpkgs/issues") + ]; + } + (bookmark "Searchix" "https://searchix.ovh/") + (bookmark "Latest" "https://discourse.nixos.org/latest") + "separator" + + # HomeLab + + { + name = "Lab"; + bookmarks = [ + (bookmark "LAN Smart Switch" "http://192.168.86.2/") + (bookmark "WiFi Access Point" "http://192.168.86.3/") + (bookmark "OPNsense" "https://192.168.86.5/") + (bookmark "PVE Direct" "https://192.168.86.4:8006/#v1:0:18:4:::::::") + (bookmark "PVF Direct" "https://192.168.86.13:8006/#v1:0:18:4:::::::") + (bookmark "Local NGINX" "https://nginx.local.chriphost.de/") + (bookmark "Think NGINX" "https://nginx.think.chriphost.de/") + (bookmark "VPS NGINX" "http://vps.chriphost.de:51810/") + (bookmark "Portainer" "https://portainer.think.chriphost.de/") + ]; + } + (bookmark "Cloud" "https://nextcloud.local.chriphost.de/apps/files/files") + (bookmark "Immich" "https://immich.local.chriphost.de/photos") + (bookmark "Jelly" "https://jellyfin.local.chriphost.de/web/#/home.html") + (bookmark "HASS" "https://hass.think.chriphost.de/lovelace") + (bookmark "Docs" "https://paperless.local.chriphost.de/documents?sort=created&reverse=1&page=1") + (bookmark "Gitea" "https://gitea.local.chriphost.de/christoph") + (bookmark "Chat" "http://localhost:11435/") + "separator" + + # Coding + + { + name = "Coding"; + bookmarks = [ + (bookmark "C++Ref" "https://en.cppreference.com/w/") + (bookmark "Rust" "https://doc.rust-lang.org/stable/book/ch03-00-common-programming-concepts.html") + (bookmark "RustOS" "https://os.phil-opp.com/") + (bookmark "Interpreters" "https://craftinginterpreters.com/contents.html") + ]; + } + (bookmark "GH" "https://github.com/churl") + (bookmark "GL" "https://gitlab.com/churl") + (bookmark "SO" "https://stackoverflow.com/users/saves/17337508/all") + (bookmark "RegEx" "https://regex101.com/") + (bookmark "Shell" "https://explainshell.com/") + (bookmark "CDecl" "https://cdecl.org/") + (bookmark "ECR" "https://gallery.ecr.aws/") + "separator" + + # Stuff + + (bookmark "Spiegel" "https://www.spiegel.de/") + (bookmark "Heise" "https://www.heise.de/") + (bookmark "HN" "https://news.ycombinator.com/news") + (bookmark "Reddit" "https://www.reddit.com/user/FightingMushroom/saved/") + (bookmark "F10" "https://f10.local.chriphost.de/race/Everyone") + (bookmark "F11" "https://f11.local.chriphost.de/racepicks") + (bookmark "F11PB" "https://f11pb.local.chriphost.de/_/#/collections?collection=pbc_1736455494&filter=&sort=-%40rowid") + (bookmark "ISBNDB" "https://isbndb.com/") + (bookmark "Music" "https://bandcamp.com/chriphost") + (bookmark "Albums" "https://www.albumoftheyear.org/user/chriphost/list/307966/2025/") ]; } - (bookmark "Searchix" "https://searchix.ovh/") - (bookmark "Latest" "https://discourse.nixos.org/latest") - - "separator" - - { - name = "Lab"; - toolbar = true; - bookmarks = [ - (bookmark "LAN Smart Switch" "http://192.168.86.2/") - (bookmark "WiFi Access Point" "http://192.168.86.3/") - (bookmark "OPNsense" "https://192.168.86.5/") - (bookmark "PVE Direct" "https://192.168.86.4:8006/#v1:0:18:4:::::::") - (bookmark "PVF Direct" "https://192.168.86.13:8006/#v1:0:18:4:::::::") - (bookmark "Local NGINX" "https://nginx.local.chriphost.de/") - (bookmark "Think NGINX" "https://nginx.think.chriphost.de/") - (bookmark "VPS NGINX" "http://vps.chriphost.de:51810/") - (bookmark "Portainer" "https://portainer.think.chriphost.de/") - ]; - } - (bookmark "Cloud" "https://nextcloud.local.chriphost.de/apps/files/files") - (bookmark "Immich" "https://immich.local.chriphost.de/photos") - (bookmark "Jelly" "https://jellyfin.local.chriphost.de/web/#/home.html") - (bookmark "HASS" "https://hass.think.chriphost.de/lovelace") - (bookmark "Docs" "https://paperless.local.chriphost.de/documents?sort=created&reverse=1&page=1") - (bookmark "Gitea" "https://gitea.local.chriphost.de/christoph") - (bookmark "AI" "http://localhost:11435/") - - "separator" - - { - name = "Coding"; - toolbar = true; - bookmarks = [ - (bookmark "C++Ref" "https://en.cppreference.com/w/") - (bookmark "Rust" "https://doc.rust-lang.org/stable/book/ch03-00-common-programming-concepts.html") - (bookmark "RustOS" "https://os.phil-opp.com/") - (bookmark "Interpreters" "https://craftinginterpreters.com/contents.html") - ]; - } - (bookmark "GH" "https://github.com/churl") - (bookmark "GL" "https://gitlab.com/churl") - (bookmark "SO" "https://stackoverflow.com/users/saves/17337508/all") - (bookmark "HN" "https://news.ycombinator.com/news") - (bookmark "Heise" "https://www.heise.de/") - (bookmark "Spiegel" "https://www.spiegel.de/") - (bookmark "Reddit" "https://www.reddit.com/user/FightingMushroom/saved/") - - "separator" - - (bookmark "F10" "https://f10.local.chriphost.de/race/Everyone") - (bookmark "F11" "https://f11.local.chriphost.de/racepicks") - (bookmark "F11PB" "https://f11pb.local.chriphost.de/_/#/collections?collection=pbc_1736455494&filter=&sort=-%40rowid") - (bookmark "RegEx" "https://regex101.com/") - (bookmark "Shell" "https://explainshell.com/") - (bookmark "CDecl" "https://cdecl.org/") - (bookmark "ISBNDB" "https://isbndb.com/") - (bookmark "ECR" "https://gallery.ecr.aws/") - (bookmark "Music" "https://bandcamp.com/chriphost") - (bookmark "Albums" "https://www.albumoftheyear.org/user/chriphost/list/307966/2025/") ] diff --git a/home/modules/firefox/default.nix b/home/modules/firefox/default.nix index 945179cc..98ee5617 100644 --- a/home/modules/firefox/default.nix +++ b/home/modules/firefox/default.nix @@ -73,7 +73,7 @@ in { WebSuggestions = false; }; HardwareAcceleration = true; - NoDefaultBookmarks = true; + # NoDefaultBookmarks = true; # Prevents HM from applying bookmarks OfferToSaveLogins = false; PictureInPicture = true; SanitizeOnShutdown = { @@ -230,12 +230,13 @@ in { }; settings = lib.mkMerge [ - (builtins.readFile ./settings.nix) + (import ./settings.nix) { # NOTE: This has to be updated when something is changed inside firefox... "browser.uiCustomization.state" = builtins.readFile ./customizationState.json; "toolkit.legacyUserProfileCustomizations.stylesheets" = firefox.disableTabBar; + "identity.fxaccounts.account.device.name" = hostname; } (lib.optionalAttrs firefox.vaapi { diff --git a/home/modules/firefox/settings.nix b/home/modules/firefox/settings.nix index e55010c0..131b4161 100644 --- a/home/modules/firefox/settings.nix +++ b/home/modules/firefox/settings.nix @@ -75,8 +75,6 @@ "geo.provider.network.url" = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"; "geo.provider.use_gpsd" = false; - "identity.fxaccounts.account.device.name" = hostname; - "media.hardwaremediakeys.enabled" = false; # Do not interfere with spotify "media.videocontrols.picture-in-picture.video-toggle.enabled" = true;