diff --git a/.config/fish/functions/ugc.fish b/.config/fish/functions/ugc.fish index b39bbf2..60751c9 100644 --- a/.config/fish/functions/ugc.fish +++ b/.config/fish/functions/ugc.fish @@ -41,6 +41,9 @@ function ugc --description "Update git fork." git switch $default_branch end + # Pull from the origin remote + git pull $origin_remote $default_branch + # Merge upstream git fetch $upstream_remote git pull $upstream_remote $default_branch diff --git a/.config/update_theme.sh b/.config/update_theme.sh index 9fd8e0c..ee0fe41 100755 --- a/.config/update_theme.sh +++ b/.config/update_theme.sh @@ -19,6 +19,8 @@ main() { GT_default=$(gsettings get org.gnome.Terminal.ProfilesList default | tr -d \') case $1 in "sunset" ) # Go to dark mode + # Global Gnome theme + #gsettings set org.gnome.desktop.interface color-scheme prefer-dark # Set the Dracula theme set org.gnome.desktop.wm.preferences theme Dracula # Set the Terminal profile @@ -31,6 +33,8 @@ main() { sed -i "s/bubblegum/monokai/g" "$HOME"/.config/micro/settings.json ;; "sunrise" ) # Go to light mode + # Global Gnome theme + #gsettings set org.gnome.desktop.interface color-scheme prefer-light # Set the Terminal profile gsettings set org.gnome.Terminal.Legacy.Profile:/org/gnome/terminal/legacy/profiles:/:"${GT_default}"/ visible-name "Light" gsettings set org.gnome.Terminal.Legacy.Profile:/org/gnome/terminal/legacy/profiles:/:"${GT_default}"/ foreground-color "rgb(23,20,33)" diff --git a/.mozilla/firefox/user.js b/.mozilla/firefox/user.js index 1174408..5204847 100644 --- a/.mozilla/firefox/user.js +++ b/.mozilla/firefox/user.js @@ -29,3 +29,5 @@ user_pref("pdfjs.annotationEditorMode", 0); // permet d'annoté les PDFs user_pref("alerts.useSystemBackend", true); // notification natives sur windows user_pref("extensions.pocket.enabled", false); // désactive Pocket user_pref("layout.css.has-selector.enabled", true); // https://developer.mozilla.org/en-US/docs/Web/CSS/:has +user_pref("extensions.webextensions.restrictedDomains", ""); // retire les domaines restreints (domanes de Mozilla) pour les extensions +user_pref("extensions.quarantinedDomains.enabled", false); // autorise les extensions à fonctionner sur tout les sites