From 1b95189069aef317587f4224fd285e720bf01d3a Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Mon, 16 Oct 2023 10:24:57 +0100 Subject: [PATCH] Firefox bookmark and rules updates Tweak font size to make waybar better, force dark polarity for theme --- home/hyprland/config.nix | 2 + system/desktop.nix | 7 ++ system/firefox.nix | 171 +++++++++++---------------------------- 3 files changed, 54 insertions(+), 126 deletions(-) diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix index f0c9d7f2..1217df18 100644 --- a/home/hyprland/config.nix +++ b/home/hyprland/config.nix @@ -185,6 +185,8 @@ in '' windowrule = pin,(Rofi) windowrule = dimaround,(Rofi) windowrule = stayfocused,(Rofi) + windowrule = nofullscreenrequest,(firefox) + windowrule = nomaximizerequest,(firefox) windowrulev2 = float,title:(File|Picture-in-Picture),class:(firefox) windowrulev2 = pin,title:(File|Picture-in-Picture),class:(firefox) windowrulev2 = workspace special silent, title:^(Firefox — Sharing Indicator)$ diff --git a/system/desktop.nix b/system/desktop.nix index cb80d964..54bee424 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -22,11 +22,18 @@ stylix = { image = ./wallpapers/default.jpg; base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml"; + polarity = "dark"; opacity = { popups = 0.8; terminal = 0.8; }; fonts = rec { + sizes = { + applications = 12; + desktop = 12; + popups = 10; + terminal = 12; + }; emoji = { name = "Noto Color Emoji"; package = pkgs.noto-fonts-emoji; diff --git a/system/firefox.nix b/system/firefox.nix index 3edeab29..23cc69e0 100644 --- a/system/firefox.nix +++ b/system/firefox.nix @@ -73,48 +73,54 @@ }; ManagedBookmarks = [ { toplevel_name = "Standard Bookmarks"; } - { - name = "Config Repo"; - url = "https://git.xenia.me.uk/xenia/nixos"; - } { name = "NextCloud"; url = "https://cloud.xenia.me.uk/"; } { - name = "NixOS Wiki"; - url = "https://nixos.wiki/"; + name = "Wikis"; + children = [ + { + name = "NixOS Wiki"; + url = "https://nixos.wiki/"; + } + { + name = "Hyprland Wiki"; + url = "https://wiki.hyprland.org/"; + } + { + name = "Arch Wiki"; + url = "https://wiki.archlinux.org/"; + } + ]; } { - name = "Hyprland Wiki"; - url = "https://wiki.hyprland.org/"; + name = "Docs"; + children = [ + { + name = "NixOS and Flakes"; + url = "https://nixos-and-flakes.thiscute.world/"; + } + { + name = "Doom Emacs Docs"; + url = "https://docs.doomemacs.org/"; + } + { + name = "Nerd Fonts Cheat Sheet"; + url = "https://www.nerdfonts.com/cheat-sheet"; + } + { + name = "Stylix Docs"; + url = "https://danth.github.io/stylix/"; + } + { + name = "Mozilla Policy Templates"; + url = "https://mozilla.github.io/policy-templates/"; + } + ]; } { - name = "Arch Wiki"; - url = "https://wiki.archlinux.org/"; - } - { - name = "NixOS and Flakes"; - url = "https://nixos-and-flakes.thiscute.world/"; - } - { - name = "Doom Emacs Docs"; - url = "https://docs.doomemacs.org/"; - } - { - name = "Awesome Hyprland"; - url = "https://github.com/hyprland-community/awesome-hyprland"; - } - { - name = "Nerd Fonts Cheat Sheet"; - url = "https://www.nerdfonts.com/cheat-sheet"; - } - { - name = "Mozilla Policy Templates"; - url = "https://mozilla.github.io/policy-templates/"; - } - { - name = "Dev"; + name = "Repos"; children = [ { name = "Gitea"; @@ -129,29 +135,12 @@ url = "https://gitlab.com"; } { - name = "StackOverflow"; - url = "https://stackoverflow.com"; + name = "Config Repo"; + url = "https://git.xenia.me.uk/xenia/nixos"; } { - name = "PyPI"; - url = "https://pypi.org"; - } - ]; - } - { - name = "Games"; - children = [ - { - name = "ProtonDB"; - url = "https://www.protondb.com/"; - } - { - name = "SteamDB"; - url = "https://steamdb.info/"; - } - { - name = "Roberts Space Industries"; - url = "https://robertsspaceindustries.com/"; + name = "Awesome Hyprland"; + url = "https://github.com/hyprland-community/awesome-hyprland"; } ]; } @@ -162,19 +151,6 @@ name = "Nucleus"; url = "https://nucleus.ukaea.uk"; } - { - name = "JET"; - url = "http://w3.jet.uk"; - } - { - name = "Marval"; - url = "https://marval.service.ukaea.uk/MSMSelfService/Index.aspx"; - } - { - name = "U4BW"; - url = - "https://ubw.unit4cloud.com/uk_aea_prod_web/Login/Login.aspx"; - } { name = "Office365"; url = "https://www.office.com"; @@ -185,65 +161,8 @@ "https://users.euro-fusion.org/pages/physics-summary/LatestSession.php"; } { - name = "JSPO"; - url = - "https://www.jspo.jet.uk/pages/operations/jpecreports_2023.html"; - } - { - name = "pySpec"; - url = "http://heimdall003.jet.uk:3060/v1/interactive"; - } - { - name = "Rosters"; - children = [ - { - name = "J2 Roster"; - url = - "https://apps.powerapps.com/play/e/default-c6ac664b-ae27-4d5d-b4e6-bb5717196fc7/a/c403a9ad-95e0-47b7-8c82-752b22a6d6f5?tenantId=c6ac664b-ae27-4d5d-b4e6-bb5717196fc7&source=portal"; - } - { - name = "KS5"; - url = - "https://wiki.jetdata.eu/open/index.php?title=Ks5:roster3008"; - } - ]; - } - { - name = "OpenWiki"; - children = [ - { - name = "Main Page"; - url = - "https://wiki.jetdata.eu/open/index.php?title=Main_Page"; - } - { - name = "KS5"; - url = - "https://wiki.jetdata.eu/open/index.php?title=CXS:Topic3"; - } - { - name = "KT3"; - url = - "https://wiki.jetdata.eu/open/index.php?title=KT3_Journals"; - } - ]; - } - { - name = "Mimics"; - children = [ - { - name = "Countdown"; - url = "http://webmimic.jet.uk/mc/codas/countdown"; - } - { - name = "KS5"; - url = "http://webmimic.jet.uk/DG/codas/ks5.mim.html"; - } - { - name = "KT3"; - url = "http://webmimic.jet.uk/DG/codas/kt3spec.mim.html"; - } - ]; + name = "Main Page"; + url = "https://wiki.jetdata.eu/open/index.php?title=Main_Page"; } ]; }