diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index f13f4e98..4a46dff8 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -196,7 +196,7 @@ ++ (lib.lists.forEach layers ignorealpha); windowrule = [ # Workspace binds - "workspace 2, (chromium-browser|firefox)" + "workspace 2, (firefox|chromium-browser)" "workspace 3, (libreoffice|soffice)(.*)" "workspace 4, (com.obsproject.Studio|WebCord|signal)" "workspace 4, org.prismlauncher.PrismLauncher" diff --git a/home/waybar/default.nix b/home/waybar/default.nix index f39f2cff..e760f161 100644 --- a/home/waybar/default.nix +++ b/home/waybar/default.nix @@ -45,10 +45,10 @@ "(btm)" = " Resource Usage [$1]"; "(cava)" = "󰝚 Music Visualiser [$1]"; "(.*) - Thunar" = "󰝰 $1"; - "(.*) - Chromium" = "󰊯 $1"; "Mozilla Firefox" = "󰈹 $1"; "(.*) — Mozilla Firefox" = "󰈹 $1"; "Nyxt - (.*)" = "󰀹 $1"; + "(.*) - Chromium" = "󰊯 $1"; "((?:.*)WebCord.*)" = "󰙯 $1"; "(Signal.*)" = "󰭹 $1"; "([Ss]team)" = "󰓓 $1"; diff --git a/system/firefox.nix b/system/firefox.nix index c483d5dc..1341f364 100644 --- a/system/firefox.nix +++ b/system/firefox.nix @@ -78,90 +78,6 @@ Locked = true; StartPage = "none"; }; - ManagedBookmarks = [ - # TODO update these - {toplevel_name = "Managed Bookmarks";} - { - name = "Standard"; - children = [ - { - name = "WhatsApp Web"; - url = "https://web.whatsapp.com/"; - } - ]; - } - { - name = "Server"; - children = [ - { - name = "Gitea"; - url = "https://git.xenia.me.uk"; - } - { - name = "Grafana Dashboard"; - url = "https://grafana.xenia.me.uk"; - } - { - name = "AdGuard Home"; - url = "https://guard.xenia.me.uk"; - } - ]; - } - { - name = "Documentation"; - children = [ - { - name = "NixOS and Flakes"; - url = "https://nixos-and-flakes.thiscute.world/"; - } - { - name = "Home Manager Configuration Options"; - url = "https://nix-community.github.io/home-manager/options.xhtml"; - } - { - name = "Home Manager Option Search"; - url = "https://mipmip.github.io/home-manager-option-search/"; - } - { - name = "Stylix Docs"; - url = "https://danth.github.io/stylix/"; - } - { - name = "The Rust Book"; - url = "https://doc.rust-lang.org/stable/book/"; - } - { - name = "Rust by Example"; - url = "https://doc.rust-lang.org/stable/rust-by-example/"; - } - { - name = "Mozilla Policy Templates"; - url = "https://mozilla.github.io/policy-templates/"; - } - { - name = "Chrome Enterprise Policy List"; - url = "https://chromeenterprise.google/policies/"; - } - ]; - } - { - name = "Awesome Repos"; - children = [ - { - name = "Emacs"; - url = "https://github.com/emacs-tw/awesome-emacs"; - } - { - name = "Hyprland"; - url = "https://github.com/hyprland-community/awesome-hyprland"; - } - { - name = "Gitea"; - url = "https://gitea.com/gitea/awesome-gitea"; - } - ]; - } - ]; NewTabPage = false; NoDefaultBookmarks = true; OfferToSaveLogins = false; diff --git a/system/hyprland.nix b/system/hyprland.nix index 404cdc60..2a3c13db 100644 --- a/system/hyprland.nix +++ b/system/hyprland.nix @@ -3,7 +3,7 @@ pkgs, ... }: { - imports = [./desktop.nix ./chromium.nix]; + imports = [./desktop.nix ./firefox.nix]; nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland"; environment = { sessionVariables = { @@ -51,7 +51,7 @@ xdg.portal.enable = true; xdg.mime = let emacs = ["emacsclient.desktop" "emacs.desktop"]; - browser = ["chromium.desktop"]; + browser = ["firefox.desktop"]; applications = { "inode/directory" = emacs; "inode/symlink" = emacs;