From 57123373e139de42a27c14e3233f485aa79e259b Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Wed, 17 Jan 2024 16:22:05 +0000 Subject: [PATCH] Switch chromium back for firefox --- flake.lock | 24 +++++++++++-- flake.nix | 1 + home/default.nix | 1 + home/firefox.nix | 60 ++++++++++++++++++++++++++++++++ home/hyprland/config.nix | 8 ++++- home/hyprland/default.nix | 26 +++++++------- home/hyprland/waybar/default.nix | 7 ++-- home/nyxt/default.nix | 5 ++- system/chromium.nix | 1 - system/firefox.nix | 18 +++++----- system/hyprland.nix | 7 +++- 11 files changed, 125 insertions(+), 33 deletions(-) create mode 100644 home/firefox.nix diff --git a/flake.lock b/flake.lock index 896ada2f..187e652c 100644 --- a/flake.lock +++ b/flake.lock @@ -19,6 +19,22 @@ } }, "base16-alacritty": { + "flake": false, + "locked": { + "lastModified": 1703982197, + "narHash": "sha256-TNxKbwdiUXGi4Z4chT72l3mt3GSvOcz6NZsUH8bQU/k=", + "owner": "aarowill", + "repo": "base16-alacritty", + "rev": "c95c200b3af739708455a03b5d185d3d2d263c6e", + "type": "github" + }, + "original": { + "owner": "aarowill", + "repo": "base16-alacritty", + "type": "github" + } + }, + "base16-alacritty-yaml": { "flake": false, "locked": { "lastModified": 1674275109, @@ -31,6 +47,7 @@ "original": { "owner": "aarowill", "repo": "base16-alacritty", + "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", "type": "github" } }, @@ -230,6 +247,7 @@ "inputs": { "base16": "base16", "base16-alacritty": "base16-alacritty", + "base16-alacritty-yaml": "base16-alacritty-yaml", "base16-fish": "base16-fish", "base16-foot": "base16-foot", "base16-helix": "base16-helix", @@ -243,11 +261,11 @@ ] }, "locked": { - "lastModified": 1704308480, - "narHash": "sha256-88ICCdJyYYtsolRnPhI9IF+bhUIVUyhJ7nrKcKPgf6M=", + "lastModified": 1705504375, + "narHash": "sha256-oRVxuJ6sCljsgfoWb+SsIK2MvUjsxrXQHRoVTUDVC40=", "owner": "danth", "repo": "stylix", - "rev": "9bc1900b6888efdda39c2e02c7c8666911b72608", + "rev": "2d59480b4531ce8d062d20a42560a266cb42b9d0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4ae65cd3..31854634 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,7 @@ homeModules = [ ./home/default.nix ./home/emacs.nix + ./home/firefox.nix ./home/accounts/default.nix ./home/hyprland/default.nix ./home/nyxt/default.nix diff --git a/home/default.nix b/home/default.nix index d554e022..e00661c9 100644 --- a/home/default.nix +++ b/home/default.nix @@ -2,6 +2,7 @@ imports = [ ./scripts/default.nix ]; stylix.targets = { avizo.enable = true; + firefox.enable = true; foot.enable = true; fzf.enable = true; rofi.enable = true; diff --git a/home/firefox.nix b/home/firefox.nix new file mode 100644 index 00000000..31a41510 --- /dev/null +++ b/home/firefox.nix @@ -0,0 +1,60 @@ +{ pkgs, ... }: { + stylix.targets.firefox.profileNames = [ "default" ]; + programs.firefox = { + enable = true; + package = null; # Use system Firefox + profiles.default = { + settings = { + "app.shield.optoutstudies.enabled" = false; + "browser.bookmarks.addedImportButton" = false; + "browser.bookmarks.showMobileBookmarks" = false; + "browser.toolbars.bookmarks.visibility" = "newtab"; + "browser.contentblocking.category" = "strict"; + "browser.search.region" = "GB"; + "browser.search.isUS" = false; + "browser.warnOnQuitShortcut" = false; + "distribution.searchplugins.defaultLocale" = "en-GB"; + "doh-rollout.home-region" = "GB"; + # Catppuccin Mocha (Lavender) theme + "extensions.activeThemeID" = "{8446b178-c865-4f5c-8ccc-1d7887811ae3}"; + "extensions.formautofill.creditCards.enabled" = false; + "general.useragent.locale" = "en-GB"; + "intl.accept_languages" = "en-gb,en"; + "intl.locale.requested" = "en-gb,en"; + "intl.regional_prefs.use_os_locales" = false; + "media.eme.enabled" = true; + "privacy.webrtc.legacyGlobalIndicator" = false; + "signon.management.page.breach-alerts.enabled" = false; + "signon.rememberSignons" = false; + "browser.newtabpage.pinned" = [ + { + title = "NixOS Wiki"; + url = "https://nixos.wiki"; + } + { + title = "Arch Wiki"; + url = "https://wiki.archlinux.org"; + } + { + title = "Hyprland Wiki"; + url = "https://wiki.hyprland.org"; + } + ]; + }; + search = { + default = "DuckDuckGo"; + force = true; + order = [ "DuckDuckGo" ]; + engines = { + "MyNixOS" = { + urls = + [{ template = "https://mynixos.com/search?q={searchTerms}"; }]; + icon = + "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@mn" ]; + }; + }; + }; + }; + }; +} diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix index 8bf50e80..48d2d129 100644 --- a/home/hyprland/config.nix +++ b/home/hyprland/config.nix @@ -198,7 +198,13 @@ in '' bind = SUPER, W, moveworkspacetomonitor, name:web current bind = SUPER, W, workspace, name:web bind = SUPER SHIFT, W, movetoworkspace, name:web - windowrule = workspace name:web silent, (chromium-browser) + windowrule = workspace name:web silent, (firefox) + windowrulev2 = float,title:(Picture-in-Picture|Library),class:(firefox) + windowrulev2 = size 750 400,title:(Picture-in-Picture),class:(firefox) + windowrulev2 = size 800 800,title:(Library),class:(firefox) + windowrulev2 = move onscreen 100%-775 100%-425,title:(Picture-in-Picture),class:(firefox) + windowrulev2 = center,title:(Library),class:(firefox) + windowrulev2 = pin,title:(Picture-in-Picture),class:(firefox) bind = SUPER, F, moveworkspacetomonitor, name:files current bind = SUPER, F, workspace, name:files diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 322ef795..a657a02b 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -117,19 +117,19 @@ "image/png" = [ "emacs.desktop" ]; "video/mp4" = [ "mpv.desktop" ]; "text/csv" = [ "emacs.desktop" ]; - "text/html" = [ "chromium.desktop" ]; - "x-scheme-handler/http" = [ "chromium.desktop" ]; - "x-scheme-handler/https" = [ "chromium.desktop" ]; - "x-scheme-handler/about" = [ "chromium.desktop" ]; - "x-scheme-handler/chrome" = [ "chromium.desktop" ]; - "x-scheme-handler/zoomus" = [ "chromium.desktop" ]; - "application/x-extension-htm" = [ "chromium.desktop" ]; - "application/x-extension-html" = [ "chromium.desktop" ]; - "application/x-extension-shtml" = [ "chromium.desktop" ]; - "application/xhtml+xml" = [ "chromium.desktop" ]; - "application/x-extension-xhtml" = [ "chromium.desktop" ]; - "application/x-extension-xht" = [ "chromium.desktop" ]; - "application/x-mozilla-bookmarks" = [ "chromium.desktop" ]; + "text/html" = [ "emacs.desktop" ]; + "x-scheme-handler/http" = [ "firefox.desktop" ]; + "x-scheme-handler/https" = [ "firefox.desktop" ]; + "x-scheme-handler/about" = [ "firefox.desktop" ]; + "x-scheme-handler/chrome" = [ "firefox.desktop" ]; + "x-scheme-handler/zoomus" = [ "firefox.desktop" ]; + "application/x-extension-htm" = [ "firefox.desktop" ]; + "application/x-extension-html" = [ "firefox.desktop" ]; + "application/x-extension-shtml" = [ "firefox.desktop" ]; + "application/xhtml+xml" = [ "firefox.desktop" ]; + "application/x-extension-xhtml" = [ "firefox.desktop" ]; + "application/x-extension-xht" = [ "firefox.desktop" ]; + "application/x-mozilla-bookmarks" = [ "firefox.desktop" ]; "x-scheme-handler/msteams" = [ "teams-for-linux.desktop" ]; }; associations.added = defaultApplications; diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix index ff24c729..8514b15e 100644 --- a/home/hyprland/waybar/default.nix +++ b/home/hyprland/waybar/default.nix @@ -41,13 +41,12 @@ "6" = "󰫈 "; "editor" = " "; "term" = "󰆍 "; - "web" = "󰀹 "; + "web" = "󰈹 "; "files" = "󰝰 "; "btm" = " "; "chat" = "󰙯 "; "games" = "󰓓 "; "stream" = "󰕃 "; - "remote" = "󰢹 "; }; show-special = false; sort-by = "id"; @@ -60,13 +59,15 @@ "player-icons" = { "default" = "󰲸 "; "emms" = " "; + "firefox" = "󰈹 "; + "mpv" = "󰦟 "; }; "status-icons" = { "playing" = "󰐊"; "paused" = "󰏤"; "stopped" = "󰓛"; }; - "ignored-players" = [ "chromium" ]; + "ignored-players" = [ ]; }; pulseaudio = { scroll-step = 5; diff --git a/home/nyxt/default.nix b/home/nyxt/default.nix index 2e90d875..9abeec82 100644 --- a/home/nyxt/default.nix +++ b/home/nyxt/default.nix @@ -1 +1,4 @@ -{ ... }: { xdg.configFile."nyxt/config.lisp".source = ./config.lisp; } +{ pkgs, ... }: { + home.packages = [ pkgs.nyxt ]; + xdg.configFile."nyxt/config.lisp".source = ./config.lisp; +} diff --git a/system/chromium.nix b/system/chromium.nix index 0b8f98af..226b8d7a 100644 --- a/system/chromium.nix +++ b/system/chromium.nix @@ -1,5 +1,4 @@ { pkgs, ... }: { - environment.systemPackages = with pkgs; [ chromium ]; programs.chromium = rec { enable = true; defaultSearchProviderEnabled = true; diff --git a/system/firefox.nix b/system/firefox.nix index 793aea3e..ae260375 100644 --- a/system/firefox.nix +++ b/system/firefox.nix @@ -34,6 +34,12 @@ install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; }; + # Catppuccin Mocha (Lavender) theme + "{8446b178-c865-4f5c-8ccc-1d7887811ae3}" = { + installation_mode = "force_installed"; + install_url = + "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-mocha-lavender-git/latest.xpi"; + }; }; FirefoxHome = { Search = true; @@ -55,21 +61,13 @@ url = "https://git.xenia.me.uk"; } { - name = "NextCloud"; - url = "https://cloud.xenia.me.uk"; - } - { - name = "Syncthing"; - url = "https://sync.xenia.me.uk"; + name = "Grafana Dashboard"; + url = "https://grafana.xenia.me.uk"; } { name = "AdGuard Home"; url = "https://guard.xenia.me.uk"; } - { - name = "Grafana Dashboard"; - url = "https://grafana.xenia.me.uk"; - } ]; } { diff --git a/system/hyprland.nix b/system/hyprland.nix index 1008d866..c13c7aab 100644 --- a/system/hyprland.nix +++ b/system/hyprland.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { - imports = [ ./desktop.nix ./emacs.nix ./nyxt.nix ./chromium.nix ]; + imports = [ ./desktop.nix ./emacs.nix ./firefox.nix ./chromium.nix ]; nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland"; environment = { @@ -38,6 +38,11 @@ libreoffice webcord teams-for-linux + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly ]; }; security.pam.services.swaylock = { };