From 0036b8341410c7c426a4b9baab2cde049bcad858 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Tue, 27 Jun 2023 11:41:18 +0100 Subject: [PATCH] Split firefox bookmarks definition --- home/gui/firefox.nix | 107 +------------------------------------------ home/personal.nix | 56 +++++++++++++++++++++- home/work.nix | 66 ++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 107 deletions(-) diff --git a/home/gui/firefox.nix b/home/gui/firefox.nix index 18694498..825f9e8c 100644 --- a/home/gui/firefox.nix +++ b/home/gui/firefox.nix @@ -1,13 +1,12 @@ {pkgs, ...}: { programs.firefox = { enable = true; - profiles.evie = { + profiles.default = { settings = { "app.shield.optoutstudies.enabled" = false; "browser.bookmarks.addedImportButton" = true; "browser.bookmarks.showMobileBookmarks" = true; "browser.contentblocking.category" = "strict"; - "browser.startup.homepage" = "https://nixos.org"; "browser.search.region" = "GB"; "browser.search.isUS" = false; "browser.warnOnQuitShortcut" = false; @@ -57,110 +56,6 @@ }; }; }; - bookmarks = [ - { - name = "toolbar"; - toolbar = true; - bookmarks = [ - { - name = "Wikipedia"; - tags = ["wiki"]; - keyword = "wiki"; - url = "https://en.wikipedia.org"; - } - { - name = "Nix sites"; - bookmarks = [ - { - name = "NixOS Wiki"; - tags = ["wiki" "nix"]; - url = "https://nixos.wiki/"; - } - { - name = "Arch Wiki"; - tags = ["wiki" "arch"]; - url = "https://wiki.archlinux.org/"; - } - ]; - } - { - name = "Source control"; - bookmarks = [ - { - name = "Gitea"; - tags = ["git" "source" "xenia"]; - url = "https://git.xenia.me.uk"; - } - { - name = "GitHub"; - tags = ["git" "source"]; - url = "https://github.com"; - } - { - name = "GitLab"; - tags = ["git" "source"]; - url = "https://gitlab.com"; - } - { - name = "UKAEA GitLab"; - tags = ["git" "source" "work" "UKAEA"]; - url = "https://git.ccfe.ac.uk"; - } - ]; - } - { - name = "Work"; - bookmarks = [ - { - name = "Nucleus"; - tags = ["work" "UKAEA"]; - url = "https://nucleus.ukaea.uk"; - } - { - name = "U4BW"; - tags = ["work" "UKAEA" "admin"]; - url = "https://ubw.unit4cloud.com/uk_aea_prod_web"; - } - { - name = "Outlook"; - tags = ["work" "UKAEA" "email"]; - url = "https://outlook.office.com"; - } - { - name = "Microsoft Teams"; - tags = ["work" "UKAEA" "communication"]; - url = "https://teams.microsoft.com"; - } - { - name = "SharePoint"; - tags = ["work" "UKAEA" "cloud" "storage"]; - url = "https://ukaeauk-my.sharepoint.com/personal/evie_litherland-smith_ukaea_uk/_layouts/15/onedrive.aspx?view=0"; - } - { - name = "Physics Summary"; - tags = ["work" "UKAEA" "JET" "operations"]; - url = "https://users.euro-fusion.org/pages/physics-summary/LatestSession.php"; - } - { - name = "JET homepage"; - tags = ["work" "UKAEA" "JET"]; - url = "w3.jet.uk"; - } - ]; - } - { - name = "Proton Mail"; - tags = ["email"]; - url = "https://mail.proton.me"; - } - { - name = "Nextcloud"; - tags = ["cloud" "storage" "federation" "xenia"]; - url = "https://cloud.xenia.me.uk"; - } - ]; - } - ]; }; }; } diff --git a/home/personal.nix b/home/personal.nix index 9127f8cf..8e059002 100644 --- a/home/personal.nix +++ b/home/personal.nix @@ -1 +1,55 @@ -{...}: {imports = [./default.nix ./git/personal.nix ./ssh/personal.nix];} +{...}: { + imports = [./default.nix ./git/personal.nix ./ssh/personal.nix]; + programs.firefox.profiles.default = { + settings."browser.startup.homepage" = "https://cloud.xenia.me.uk"; + bookmarks = [ + { + name = "toolbar"; + toolbar = true; + bookmarks = [ + { + name = "Wikipedia"; + tags = ["wiki"]; + keyword = "wiki"; + url = "https://en.wikipedia.org"; + } + { + name = "NixOS Wiki"; + tags = ["wiki" "nix"]; + url = "https://nixos.wiki/"; + } + { + name = "Arch Wiki"; + tags = ["wiki" "arch"]; + url = "https://wiki.archlinux.org/"; + } + { + name = "Nextcloud"; + tags = ["cloud" "storage" "federation" "xenia"]; + url = "https://cloud.xenia.me.uk"; + } + { + name = "Proton Mail"; + tags = ["email"]; + url = "https://mail.proton.me"; + } + { + name = "Gitea"; + tags = ["git" "source" "xenia"]; + url = "https://git.xenia.me.uk"; + } + { + name = "GitHub"; + tags = ["git" "source"]; + url = "https://github.com"; + } + { + name = "GitLab"; + tags = ["git" "source"]; + url = "https://gitlab.com"; + } + ]; + } + ]; + }; +} diff --git a/home/work.nix b/home/work.nix index 0823bd06..f223d876 100644 --- a/home/work.nix +++ b/home/work.nix @@ -12,4 +12,70 @@ --delete-during --delete-excluded\ $HOME/.config/nvim/ freia:.config/nvim ''; + programs.firefox.profiles.default = { + settings."browser.startup.homepage" = "https://nucleus.ukaea.uk"; + bookmarks = [ + { + name = "toolbar"; + toolbar = true; + bookmarks = [ + { + name = "Gitea"; + tags = ["git" "source" "xenia"]; + url = "https://git.xenia.me.uk"; + } + { + name = "GitHub"; + tags = ["git" "source"]; + url = "https://github.com"; + } + { + name = "GitLab"; + tags = ["git" "source"]; + url = "https://gitlab.com"; + } + { + name = "UKAEA GitLab"; + tags = ["git" "source" "work" "UKAEA"]; + url = "https://git.ccfe.ac.uk"; + } + { + name = "Nucleus"; + tags = ["work" "UKAEA"]; + url = "https://nucleus.ukaea.uk"; + } + { + name = "U4BW"; + tags = ["work" "UKAEA" "admin"]; + url = "https://ubw.unit4cloud.com/uk_aea_prod_web"; + } + { + name = "Outlook"; + tags = ["work" "UKAEA" "email"]; + url = "https://outlook.office.com"; + } + { + name = "Microsoft Teams"; + tags = ["work" "UKAEA" "communication"]; + url = "https://teams.microsoft.com"; + } + { + name = "SharePoint"; + tags = ["work" "UKAEA" "cloud" "storage"]; + url = "https://ukaeauk-my.sharepoint.com/personal/evie_litherland-smith_ukaea_uk/_layouts/15/onedrive.aspx?view=0"; + } + { + name = "Physics Summary"; + tags = ["work" "UKAEA" "JET" "operations"]; + url = "https://users.euro-fusion.org/pages/physics-summary/LatestSession.php"; + } + { + name = "JET homepage"; + tags = ["work" "UKAEA" "JET"]; + url = "w3.jet.uk"; + } + ]; + } + ]; + }; }