From 4c7cdbeb8ec1733b042789dc9aa600b72df1db1a Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Mon, 8 Apr 2024 14:25:04 +0100 Subject: [PATCH] Add bookmarks.org and export steps to nix config Move bookmarks.org into this repo and use runCommand to call emacs org-html-export-to-html, set output file as firefox homepage Remove bookmarks from git-sync-all.sh Disable firefox SanitizeOnShutdown so that I can keep pinned tabs between sessions --- home/scripts/git-sync-all.sh | 2 -- system/bookmarks.org | 47 ++++++++++++++++++++++++++++++++++++ system/firefox.nix | 22 ++++++----------- 3 files changed, 55 insertions(+), 16 deletions(-) create mode 100644 system/bookmarks.org diff --git a/home/scripts/git-sync-all.sh b/home/scripts/git-sync-all.sh index 65130379..6a6f1024 100755 --- a/home/scripts/git-sync-all.sh +++ b/home/scripts/git-sync-all.sh @@ -2,7 +2,6 @@ SYNC_DIRS=( "$HOME/.password-store/" "$HOME/.diary/" - "$HOME/.bookmarks/" "$HOME/.elfeed/" "$HOME/Documents/Org/" "$HOME/Documents/References/" @@ -10,7 +9,6 @@ SYNC_DIRS=( SYNC_URLS=( "https://git.xenia.me.uk/pixelifytica/pass.git" "https://git.xenia.me.uk/pixelifytica/diary.git" - "https://git.xenia.me.uk/pixelifytica/bookmarks.git" "https://git.xenia.me.uk/pixelifytica/elfeed.git" "https://git.xenia.me.uk/pixelifytica/org.git" "https://git.xenia.me.uk/pixelifytica/references.git" diff --git a/system/bookmarks.org b/system/bookmarks.org new file mode 100644 index 00000000..78e93772 --- /dev/null +++ b/system/bookmarks.org @@ -0,0 +1,47 @@ +#+title: Bookmarks +#+author: Evie Litherland-Smith +#+email: evie@xenia.me.uk +#+language: en +* Messaging :messaging: +- [[https://web.whatsapp.com/][WhatsApp Web]] +- [[https://discord.com/login][Discord]] +* Server :server: +- [[https://xenia.me.uk][Home Page]] +- [[https://git.xenia.me.uk][Forgejo]] +* Documentation :documentation: +- [[https://nixos-and-flakes.thiscute.world/][NixOS and Flakes]] +- [[https://nix-community.github.io/home-manager/options.xhtml][Home Manager Configuration Options]] +- [[https://mipmip.github.io/home-manager-option-search/][Home Manager Option Search]] +- [[https://mozilla.github.io/policy-templates/][Mozilla Policy Templates]] +- [[https://chromeenterprise.google/policies/][Chrome Enterprise Policy List]] +* Awesome Repos :awesome:git: +- [[https://github.com/emacs-tw/awesome-emacs][Awesome Emacs]] +- [[https://github.com/hyprland-community/awesome-hyprland][Awesome Hyprland]] +* Work :work: +- [[https://nucleus.ukaea.uk/][Nucleus]] +- [[https://marval.service.ukaea.uk/MSMSelfService/Index.aspx][Marval Helpdesk]] +- [[https://ubw.unit4cloud.com/uk_aea_prod_web/Login/Login.aspx][Unit4 Business World]] +- [[https://git.ccfe.ac.uk/][GitLab (CCFE)]] +** JET :jet: +- [[http://w3.jet.uk/][Homepage]] +- [[https://users.euro-fusion.org/pages/physics-summary/LatestSession.php][Physics Summary]] +- [[https://data.jet.uk/][JET Data Services]] +- [[https://www.jspo.jet.uk/pages/operations/jpecreports_2023.html][JSPO]] +- [[https://dvcm.jetdata.eu/][DVCM]] +*** Mimics :mimics: +- [[http://webmimic.jet.uk/mc/codas/countdown][Countdown]] +- [[http://webmimic.jet.uk/DG/codas/ks5.mim.html][KS5]] +- [[http://webmimic.jet.uk/DG/codas/kt3spec.mim.html][KT3]] +** MAST-U :mastu: +- [[https://users.mastu.ukaea.uk/home][Users Page]] +- [[https://intranet.ccfe.ac.uk/mastu-handbook][Diagnostic Handbook]] +** OpenWiki :wiki:jdc: +- [[https://wiki.jetdata.eu/open/index.php?title=Main_Page][Main Page]] +- [[https://wiki.jetdata.eu/open/index.php?title=Diagnostic_Coordinator_Wiki][Diagnostic Coordinator]] +- [[https://wiki.jetdata.eu/open/index.php?title=Spectroscopy_Group:index][Spectroscopy Group]] +- [[https://wiki.jetdata.eu/open/index.php?title=CXS:Topic3][KS5]] +- [[https://wiki.jetdata.eu/open/index.php?title=KT3_Journals][KT3]] +** Office :microsoft:office: +- [[https://outlook.office.com][Outlook]] +- [[https://teams.cloud.microsoft][Microsoft Teams]] +- [[https://teams.microsoft.com][Microsoft Teams (Old)]] diff --git a/system/firefox.nix b/system/firefox.nix index 886c55ec..4a28adbb 100644 --- a/system/firefox.nix +++ b/system/firefox.nix @@ -1,4 +1,4 @@ -{...}: { +{pkgs, ...}: { programs.firefox = { enable = true; languagePacks = ["en-GB"]; @@ -80,9 +80,14 @@ HardwareAcceleration = true; Homepage = { Locked = true; - StartPage = "none"; + StartPage = "homepage-locked"; + URL = "file://${pkgs.runCommand "bookmarks" {} '' + mkdir $out + cp ${./bookmarks.org} $out/bookmarks.org + ${pkgs.emacs}/bin/emacs -Q $out/bookmarks.org --batch --eval="(cd \"$out\")" -f pwd -f org-html-export-to-html --kill + ''}/bookmarks.html"; }; - NewTabPage = false; + NewTabPage = true; NoDefaultBookmarks = true; OfferToSaveLogins = false; PasswordManagerEnabled = false; @@ -120,17 +125,6 @@ "media.eme.enabled" = true; }; RequestedLocales = ["en-GB"]; - SanitizeOnShutdown = { - Cache = true; - Cookies = false; - Downloads = true; - FormData = true; - History = true; - Sessions = false; - SiteSettings = false; - OfflineApps = false; - Locked = true; - }; SearchBar = "unified"; ShowHomeButton = true; StartDownloadsInTempDirectory = true;