diff --git a/home/profiles/graphical/chromium.nix b/home/profiles/graphical/chromium.nix deleted file mode 100644 index 3d9c3352..00000000 --- a/home/profiles/graphical/chromium.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ...}: { - # Backup browser! For aliexpress and things. - home.packages = [ - pkgs.ungoogled-chromium - ]; -} diff --git a/home/profiles/graphical/firefox/config.nix b/home/profiles/graphical/floorp/config.nix similarity index 99% rename from home/profiles/graphical/firefox/config.nix rename to home/profiles/graphical/floorp/config.nix index 1000650e..7fe694ac 100644 --- a/home/profiles/graphical/firefox/config.nix +++ b/home/profiles/graphical/floorp/config.nix @@ -1,5 +1,5 @@ _: { - programs.firefox.profiles.main.settings = { + programs.floorp.profiles.main.settings = { # Derived from https://github.com/arcnmx/home/blob/9eb1cd4dd43883e1a0c6a2a55c00d7c3bede1776/cfg/firefox/default.nix#L7 # and https://git.ztn.sh/zotan/snowleopard/src/branch/dev/assets/prefs.js "services.sync.engine.prefs" = false; diff --git a/home/profiles/graphical/firefox/containers.nix b/home/profiles/graphical/floorp/containers.nix similarity index 76% rename from home/profiles/graphical/firefox/containers.nix rename to home/profiles/graphical/floorp/containers.nix index d97d7b63..7ea4f468 100644 --- a/home/profiles/graphical/firefox/containers.nix +++ b/home/profiles/graphical/floorp/containers.nix @@ -1,5 +1,8 @@ -{ ... }: { - programs.firefox.profiles.main = { +{ config, lib, ... }: let + inherit (lib.attrsets) listToAttrs nameValuePair; + inherit (lib.modules) mkMerge; +in { + programs.floorp.profiles.main = { containersForce = true; containers = { main = { diff --git a/home/profiles/graphical/firefox/firefox.nix b/home/profiles/graphical/floorp/main.nix similarity index 96% rename from home/profiles/graphical/firefox/firefox.nix rename to home/profiles/graphical/floorp/main.nix index fc90ef50..eb0de5fc 100644 --- a/home/profiles/graphical/firefox/firefox.nix +++ b/home/profiles/graphical/floorp/main.nix @@ -2,11 +2,11 @@ defaultFont = "Monaspace Krypton"; in { home.sessionVariables = { - BROWSER = "firefox"; + BROWSER = "floorp"; }; home.packages = [ pkgs.ff2mpv-rust ]; - programs.firefox = { + programs.floorp = { nativeMessagingHosts = [ pkgs.ff2mpv-rust ]; diff --git a/home/profiles/graphical/firefox/mtab.nix b/home/profiles/graphical/floorp/mtab.nix similarity index 98% rename from home/profiles/graphical/firefox/mtab.nix rename to home/profiles/graphical/floorp/mtab.nix index 0637a540..d86c7ae6 100644 --- a/home/profiles/graphical/firefox/mtab.nix +++ b/home/profiles/graphical/floorp/mtab.nix @@ -1,5 +1,5 @@ { nur, ... }: { - programs.firefox.profiles.main.extensions = { + programs.floorp.profiles.main.extensions = { packages = with nur.repos.rycee.firefox-addons; [ mtab ]; diff --git a/home/profiles/graphical/firefox/tst.nix b/home/profiles/graphical/floorp/tst.nix similarity index 97% rename from home/profiles/graphical/firefox/tst.nix rename to home/profiles/graphical/floorp/tst.nix index 916dd6fe..bdaeee38 100644 --- a/home/profiles/graphical/firefox/tst.nix +++ b/home/profiles/graphical/floorp/tst.nix @@ -1,5 +1,5 @@ { nur, ... }: { - programs.firefox.profiles.main = { + programs.floorp.profiles.main = { extensions = { packages = with nur.repos.rycee.firefox-addons; [ tree-style-tab diff --git a/home/profiles/graphical/firefox/ublock.nix b/home/profiles/graphical/floorp/ublock.nix similarity index 95% rename from home/profiles/graphical/firefox/ublock.nix rename to home/profiles/graphical/floorp/ublock.nix index 80fe8665..924838e3 100644 --- a/home/profiles/graphical/firefox/ublock.nix +++ b/home/profiles/graphical/floorp/ublock.nix @@ -1,5 +1,5 @@ { nur, ... }: { - programs.firefox.profiles.main.extensions = { + programs.floorp.profiles.main.extensions = { packages = with nur.repos.rycee.firefox-addons; [ ublock-origin ]; diff --git a/home/profiles/shell/zsh.nix b/home/profiles/shell/zsh.nix index aab68404..930ba496 100644 --- a/home/profiles/shell/zsh.nix +++ b/home/profiles/shell/zsh.nix @@ -95,6 +95,7 @@ in { shellAliases = let packages = [ "sidequest" + "ungoogled-chromium" ]; flake = self; makeAliasForBin = package: nameValuePair package "nix run kat#${package}";