Update 6 files

- /home/dot_config/firefoxprofileswitcher/avatars.json
- /home/dot_config/firefoxprofileswitcher/profile-options.json
- /home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl
- /home/.chezmoiscripts/universal/run_onchange_after_40-firefox.tmpl
- /home/dot_local/share/firefox/profiles.ini.tmpl
- /home/dot_local/share/firefox/distribution/policies.json
This commit is contained in:
Brian Zalewski 2023-02-05 05:13:10 +00:00
parent b4f8f537b5
commit 2c361fa687
6 changed files with 14 additions and 29 deletions

View file

@ -154,6 +154,7 @@ for SETTINGS_DIR in "$HOME/snap/firefox/common/.mozilla/firefox" "$HOME/.var/app
if [ -n "$DEFAULT_RELEASE_PROFILE" ]; then if [ -n "$DEFAULT_RELEASE_PROFILE" ]; then
logg info "Renaming $DEFAULT_RELEASE_PROFILE to $SETTINGS_DIR/profile.plugins" logg info "Renaming $DEFAULT_RELEASE_PROFILE to $SETTINGS_DIR/profile.plugins"
rsync -a "$DEFAULT_RELEASE_PROFILE/" "$SETTINGS_DIR/profile.plugins" rsync -a "$DEFAULT_RELEASE_PROFILE/" "$SETTINGS_DIR/profile.plugins"
rsync -a "${XDG_DATA_HOME:-$HOME/.local/share}/firefox/" "$SETTINGS_DIR/profile.plugins"
fi fi
### Miscellaneous default profiles ### Miscellaneous default profiles
@ -161,6 +162,7 @@ for SETTINGS_DIR in "$HOME/snap/firefox/common/.mozilla/firefox" "$HOME/.var/app
if [ ! -d "$SETTINGS_DIR/profile.${NEW_PROFILE}" ] && [ -d "$SETTINGS_DIR/profile.default" ]; then if [ ! -d "$SETTINGS_DIR/profile.${NEW_PROFILE}" ] && [ -d "$SETTINGS_DIR/profile.default" ]; then
logg info "Cloning $NEW_PROFILE from profile.default" logg info "Cloning $NEW_PROFILE from profile.default"
rsync -a "$SETTINGS_DIR/profile.default/" "$SETTINGS_DIR/profile.${NEW_PROFILE}" rsync -a "$SETTINGS_DIR/profile.default/" "$SETTINGS_DIR/profile.${NEW_PROFILE}"
rsync -a "${XDG_DATA_HOME:-$HOME/.local/share}/firefox/" "$SETTINGS_DIR/profile.${NEW_PROFILE}"
fi fi
done done

View file

@ -22,15 +22,14 @@ if [ -n "$KEYID" ] && command -v gpg > /dev/null; then
KEYID_TRIMMED="$(echo "$KEYID" | sed 's/^0x//')" KEYID_TRIMMED="$(echo "$KEYID" | sed 's/^0x//')"
if ! gpg --list-secret-keys --keyid-format=long | grep "$KEYID_TRIMMED" > /dev/null; then if ! gpg --list-secret-keys --keyid-format=long | grep "$KEYID_TRIMMED" > /dev/null; then
logg info 'Attempting to download the specified public GPG key (`{{ .user.gpg.id }}`) from public keyservers' logg info 'Attempting to download the specified public GPG key (`{{ .user.gpg.id }}`) from public keyservers'
sudo pkill dirmngr
dirmngr --daemon --standard-resolver
gpg --keyserver https://pgp.mit.edu --recv "$KEYID" || EXIT_CODE=$? gpg --keyserver https://pgp.mit.edu --recv "$KEYID" || EXIT_CODE=$?
if [ -n "$EXIT_CODE" ]; then if [ -n "$EXIT_CODE" ]; then
logg warn 'Error downloading public GPG key' logg warn 'Error downloading public GPG key'
logg info 'Retrying after turning on debug mode and using the standard DNS resolver'
sudo pkill dirmngr
dirmngr --debug-all --daemon --standard-resolver
gpg --keyserver hkps://pgp.mit.edu --recv "$KEYID" || EXIT_CODE=$? gpg --keyserver hkps://pgp.mit.edu --recv "$KEYID" || EXIT_CODE=$?
if [ -n "$EXIT_CODE" ]; then if [ -n "$EXIT_CODE" ]; then
logg error 'Failed to retrieve public user GPG key on hkps://pgp.mit.edu' logg warn 'Failed to retrieve public user GPG key on hkps://pgp.mit.edu'
gpgconf --kill dirmngr gpgconf --kill dirmngr
KEYID="${KEYID^^}" KEYID="${KEYID^^}"
KEYID="$(echo "$KEYID" | sed 's/^0X/0x/')" KEYID="$(echo "$KEYID" | sed 's/^0X/0x/')"

View file

@ -1,11 +0,0 @@
{
"avatars": {
"0B803C3C78AB69A7FA2B43EDF4F139C60B16081EE3C8B4F98FAF07D2EA236505": "res:/img/avatars/modern_cros_200/abstract/avatar_melon.png",
"43D07063950E4B54FE593B7C6DF3BC64ADAA374A1BBFA885CDFC04C7A3C8072A": "res:/img/avatars/modern_cros_200/abstract/avatar_pizza.png",
"A9D6FA4B7A2043B7FB3EDCB95FEDCC8B137DF5821357CF76ADB6B29B5B3E558A": "res:/img/avatars/modern_cros_200/abstract/avatar_sandwich.png",
"E098B8A5E8AD32E45AFFE798EBA7067D889111E9D57D92FA01046EF0AFCB1CCA": "res:/img/avatars/modern_cros_200/abstract/avatar_icewater.png",
"2E72B43D0149045B0A028448C9D10BD55F961857D1AD7F758BE71CB87539E787": "res:/img/avatars/modern_cros_200/illustration/avatar_cheese.png",
"1D24BBDF1FB63F9785102F65138E17B1EE8C8531856791F6646A3C75F9B3F852": "res:/img/avatars/modern_cros_200/illustration/avatar_basketball.png",
"4C1004A5D052D0ED7B120AC39DFD6F33EAD3EA7EAC047B9DD4F8AEF91232BE51": "res:/img/avatars/modern_cros_200/abstract/avatar_avocado.png"
}
}

View file

@ -1,11 +0,0 @@
{
"options": {
"E098B8A5E8AD32E45AFFE798EBA7067D889111E9D57D92FA01046EF0AFCB1CCA": {},
"2E72B43D0149045B0A028448C9D10BD55F961857D1AD7F758BE71CB87539E787": {},
"0B803C3C78AB69A7FA2B43EDF4F139C60B16081EE3C8B4F98FAF07D2EA236505": {},
"43D07063950E4B54FE593B7C6DF3BC64ADAA374A1BBFA885CDFC04C7A3C8072A": {},
"1D24BBDF1FB63F9785102F65138E17B1EE8C8531856791F6646A3C75F9B3F852": {},
"A9D6FA4B7A2043B7FB3EDCB95FEDCC8B137DF5821357CF76ADB6B29B5B3E558A": {},
"4C1004A5D052D0ED7B120AC39DFD6F33EAD3EA7EAC047B9DD4F8AEF91232BE51": {}
}
}

View file

@ -39,7 +39,7 @@
"Homepage": { "Homepage": {
"Locked": false, "Locked": false,
"StartPage": "previous-session", "StartPage": "previous-session",
"URL": "http://install.doctor" "URL": "http://home.megabyte.space"
}, },
"NetworkPrediction": false, "NetworkPrediction": false,
"NoDefaultBookmarks": true, "NoDefaultBookmarks": true,

View file

@ -1,5 +1,5 @@
[Profile6] [Profile6]
Name=Default (w/ plugins) Name=Factory (w/ plugins)
IsRelative=1 IsRelative=1
Path={{ if eq .host.distro.family "darwin" }}Profiles/{{ end }}profile.plugins Path={{ if eq .host.distro.family "darwin" }}Profiles/{{ end }}profile.plugins
@ -18,19 +18,25 @@ Name=Miscellaneous
IsRelative=1 IsRelative=1
Path={{ if eq .host.distro.family "darwin" }}Profiles/{{ end }}profile.miscellaneous Path={{ if eq .host.distro.family "darwin" }}Profiles/{{ end }}profile.miscellaneous
{{- if (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) }}
[Profile2] [Profile2]
Name=Private Name=Private
IsRelative=1 IsRelative=1
Path={{ if eq .host.distro.family "darwin" }}Profiles/{{ end }}profile.private Path={{ if eq .host.distro.family "darwin" }}Profiles/{{ end }}profile.private
Default=1
{{- end }}
[Profile1] [Profile1]
Name=Git (Public) Name=Git (Public)
IsRelative=1 IsRelative=1
Path={{ if eq .host.distro.family "darwin" }}Profiles/{{ end }}profile.git Path={{ if eq .host.distro.family "darwin" }}Profiles/{{ end }}profile.git
{{- if not (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) }}
Default=1 Default=1
{{- end }}
[Profile0] [Profile0]
Name=Default Name=Factory
IsRelative=1 IsRelative=1
Path={{ if eq .host.distro.family "darwin" }}Profiles/{{ end }}profile.default Path={{ if eq .host.distro.family "darwin" }}Profiles/{{ end }}profile.default