From 77e5f82b31028d5c6c56dcd0fb5e097220d51a15 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sat, 15 Jul 2023 08:51:36 +0000
Subject: [PATCH] programs: rename web-browser -> firefox

---
 hosts/by-name/moby/default.nix                     | 10 ----------
 hosts/by-name/moby/polyfill.nix                    | 14 ++++++++++++++
 hosts/common/programs/default.nix                  |  2 +-
 .../programs/{web-browser.nix => firefox.nix}      | 10 +++++-----
 hosts/modules/gui/default.nix                      |  2 +-
 5 files changed, 21 insertions(+), 17 deletions(-)
 rename hosts/common/programs/{web-browser.nix => firefox.nix} (97%)

diff --git a/hosts/by-name/moby/default.nix b/hosts/by-name/moby/default.nix
index 4e9ecf57..c78c0b8e 100644
--- a/hosts/by-name/moby/default.nix
+++ b/hosts/by-name/moby/default.nix
@@ -24,16 +24,6 @@
 
   sops.secrets.colin-passwd.neededForUsers = true;
 
-  sane.programs.web-browser.config = {
-    # compromise impermanence for the sake of usability
-    persistCache = "private";
-    persistData = "private";
-
-    # i don't do crypto stuff on moby
-    addons.ether-metamask.enable = false;
-    # addons.sideberry.enable = false;
-  };
-
   sane.user.persist.plaintext = [
     # TODO: make this just generally conditional upon pulse being enabled?
     ".config/pulse"  # persist pulseaudio volume
diff --git a/hosts/by-name/moby/polyfill.nix b/hosts/by-name/moby/polyfill.nix
index c41ce0bc..cc38966b 100644
--- a/hosts/by-name/moby/polyfill.nix
+++ b/hosts/by-name/moby/polyfill.nix
@@ -1,5 +1,19 @@
+# this file configures preferences per program, without actually enabling any programs.
+# the goal is to separate the place where we decide *what* to use (i.e. `sane.programs.firefox.enable = true` -- at the toplevel)
+# from where we specific how that thing should behave *if* it's in use.
+
 { pkgs, sane-lib, ... }:
 {
+  sane.programs.firefox.config = {
+    # compromise impermanence for the sake of usability
+    persistCache = "private";
+    persistData = "private";
+
+    # i don't do crypto stuff on moby
+    addons.ether-metamask.enable = false;
+    # addons.sideberry.enable = false;
+  };
+
   sane.gui.sxmo = {
     settings = {
       ### hardware: touch screen
diff --git a/hosts/common/programs/default.nix b/hosts/common/programs/default.nix
index acdb13e7..94e40be5 100644
--- a/hosts/common/programs/default.nix
+++ b/hosts/common/programs/default.nix
@@ -7,6 +7,7 @@
     ./cozy.nix
     ./epiphany.nix
     ./evince.nix
+    ./firefox.nix
     ./fontconfig.nix
     ./git.nix
     ./gnome-feeds.nix
@@ -35,7 +36,6 @@
     ./sublime-music.nix
     ./tangram.nix
     ./vlc.nix
-    ./web-browser.nix
     ./wireshark.nix
     ./zeal.nix
     ./zsh
diff --git a/hosts/common/programs/web-browser.nix b/hosts/common/programs/firefox.nix
similarity index 97%
rename from hosts/common/programs/web-browser.nix
rename to hosts/common/programs/firefox.nix
index 755b3ce9..b8727c78 100644
--- a/hosts/common/programs/web-browser.nix
+++ b/hosts/common/programs/firefox.nix
@@ -9,7 +9,7 @@
 { config, lib, pkgs, ...}:
 with lib;
 let
-  cfg = config.sane.programs.web-browser.config;
+  cfg = config.sane.programs.firefox.config;
   # allow easy switching between firefox and librewolf with `defaultSettings`, below
   librewolfSettings = {
     browser = pkgs.librewolf-unwrapped;
@@ -144,11 +144,11 @@ in
 {
   config = mkMerge [
     ({
-      sane.programs.web-browser.configOption = mkOption {
+      sane.programs.firefox.configOption = mkOption {
         type = types.submodule configOpts;
         default = {};
       };
-      sane.programs.web-browser.config.addons = {
+      sane.programs.firefox.config.addons = {
         # get names from:
         # - ~/ref/nix-community/nur-combined/repos/rycee/pkgs/firefox-addons/generated-firefox-addons.nix
         # `wget ...xpi`; `unar ...xpi`; `cat */manifest.json | jq '.browser_specific_settings.gecko.id'`
@@ -190,7 +190,7 @@ in
       };
     })
     ({
-      sane.programs.web-browser = {
+      sane.programs.firefox = {
         inherit package;
 
         mime = let
@@ -246,7 +246,7 @@ in
         '';
       };
     })
-    (mkIf config.sane.programs.web-browser.enabled {
+    (mkIf config.sane.programs.firefox.enabled {
       # TODO: move the persistence into the sane.programs API (above)
       # flush the cache to disk to avoid it taking up too much tmp.
       sane.user.persist.byPath."${cfg.browser.cacheDir}".store =
diff --git a/hosts/modules/gui/default.nix b/hosts/modules/gui/default.nix
index 770518e4..cf2254eb 100644
--- a/hosts/modules/gui/default.nix
+++ b/hosts/modules/gui/default.nix
@@ -11,8 +11,8 @@
   sane.programs.guiApps = {
     package = null;
     suggestedPrograms = [
+      "firefox"
       "tuiApps"
-      "web-browser"
     ] ++ lib.optional (pkgs.system == "x86_64-linux") "x86GuiApps"
     ++ [
       # "celluloid"  # mpv frontend