programs: rename web-browser -> firefox
This commit is contained in:
parent
55d64eb598
commit
77e5f82b31
|
@ -24,16 +24,6 @@
|
||||||
|
|
||||||
sops.secrets.colin-passwd.neededForUsers = true;
|
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 = [
|
sane.user.persist.plaintext = [
|
||||||
# TODO: make this just generally conditional upon pulse being enabled?
|
# TODO: make this just generally conditional upon pulse being enabled?
|
||||||
".config/pulse" # persist pulseaudio volume
|
".config/pulse" # persist pulseaudio volume
|
||||||
|
|
|
@ -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, ... }:
|
{ 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 = {
|
sane.gui.sxmo = {
|
||||||
settings = {
|
settings = {
|
||||||
### hardware: touch screen
|
### hardware: touch screen
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
./cozy.nix
|
./cozy.nix
|
||||||
./epiphany.nix
|
./epiphany.nix
|
||||||
./evince.nix
|
./evince.nix
|
||||||
|
./firefox.nix
|
||||||
./fontconfig.nix
|
./fontconfig.nix
|
||||||
./git.nix
|
./git.nix
|
||||||
./gnome-feeds.nix
|
./gnome-feeds.nix
|
||||||
|
@ -35,7 +36,6 @@
|
||||||
./sublime-music.nix
|
./sublime-music.nix
|
||||||
./tangram.nix
|
./tangram.nix
|
||||||
./vlc.nix
|
./vlc.nix
|
||||||
./web-browser.nix
|
|
||||||
./wireshark.nix
|
./wireshark.nix
|
||||||
./zeal.nix
|
./zeal.nix
|
||||||
./zsh
|
./zsh
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
{ config, lib, pkgs, ...}:
|
{ config, lib, pkgs, ...}:
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
cfg = config.sane.programs.web-browser.config;
|
cfg = config.sane.programs.firefox.config;
|
||||||
# allow easy switching between firefox and librewolf with `defaultSettings`, below
|
# allow easy switching between firefox and librewolf with `defaultSettings`, below
|
||||||
librewolfSettings = {
|
librewolfSettings = {
|
||||||
browser = pkgs.librewolf-unwrapped;
|
browser = pkgs.librewolf-unwrapped;
|
||||||
|
@ -144,11 +144,11 @@ in
|
||||||
{
|
{
|
||||||
config = mkMerge [
|
config = mkMerge [
|
||||||
({
|
({
|
||||||
sane.programs.web-browser.configOption = mkOption {
|
sane.programs.firefox.configOption = mkOption {
|
||||||
type = types.submodule configOpts;
|
type = types.submodule configOpts;
|
||||||
default = {};
|
default = {};
|
||||||
};
|
};
|
||||||
sane.programs.web-browser.config.addons = {
|
sane.programs.firefox.config.addons = {
|
||||||
# get names from:
|
# get names from:
|
||||||
# - ~/ref/nix-community/nur-combined/repos/rycee/pkgs/firefox-addons/generated-firefox-addons.nix
|
# - ~/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'`
|
# `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;
|
inherit package;
|
||||||
|
|
||||||
mime = let
|
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)
|
# TODO: move the persistence into the sane.programs API (above)
|
||||||
# flush the cache to disk to avoid it taking up too much tmp.
|
# flush the cache to disk to avoid it taking up too much tmp.
|
||||||
sane.user.persist.byPath."${cfg.browser.cacheDir}".store =
|
sane.user.persist.byPath."${cfg.browser.cacheDir}".store =
|
|
@ -11,8 +11,8 @@
|
||||||
sane.programs.guiApps = {
|
sane.programs.guiApps = {
|
||||||
package = null;
|
package = null;
|
||||||
suggestedPrograms = [
|
suggestedPrograms = [
|
||||||
|
"firefox"
|
||||||
"tuiApps"
|
"tuiApps"
|
||||||
"web-browser"
|
|
||||||
] ++ lib.optional (pkgs.system == "x86_64-linux") "x86GuiApps"
|
] ++ lib.optional (pkgs.system == "x86_64-linux") "x86GuiApps"
|
||||||
++ [
|
++ [
|
||||||
# "celluloid" # mpv frontend
|
# "celluloid" # mpv frontend
|
||||||
|
|
Loading…
Reference in New Issue
Block a user