profile cleanup

6 files changed, 30 insertions, 17 deletions

diff --git a/etc/gimp-2.8.profile b/etc/gimp-2.8.profile
index 1902fac72..ce6cee7a5 100644
--- a/etc/gimp-2.8.profile
+++ b/etc/gimp-2.8.profile
@@ -1,4 +1,8 @@
 # Persistent global definitions go here
 include /etc/firejail/globals.local
 
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include /etc/firejail/gimp-2.8.local
+
 include /etc/firejail/gimp.profile
diff --git a/etc/mate-calculator.profile b/etc/mate-calculator.profile
index 67a9f244e..acc687b81 100644
--- a/etc/mate-calculator.profile
+++ b/etc/mate-calculator.profile
@@ -1,4 +1,8 @@
 # Persistent global definitions go here
 include /etc/firejail/globals.local
 
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include /etc/firejail/mate-calculator.local
+
 #include /etc/firejail/mate-calc.profile
diff --git a/etc/thunar.profile b/etc/thunar.profile
index cd84acf39..d8389ebc8 100644
--- a/etc/thunar.profile
+++ b/etc/thunar.profile
@@ -1,4 +1,8 @@
 # Persistent global definitions go here
 include /etc/firejail/globals.local
 
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include /etc/firejail/thunar.local
+
 include /etc/firejail/Thunar.profile
diff --git a/etc/vivaldi-beta.profile b/etc/vivaldi-beta.profile
index 51954c643..f2c2f4cc0 100644
--- a/etc/vivaldi-beta.profile
+++ b/etc/vivaldi-beta.profile
@@ -6,4 +6,4 @@ include /etc/firejail/globals.local
 include /etc/firejail/vivaldi-beta.local
 
 # Vivaldi Beta browser profile
-include /etc/firejail/vivaldi-stable.profile
+include /etc/firejail/vivaldi.profile
diff --git a/etc/vivaldi-stable.profile b/etc/vivaldi-stable.profile
index a57b2dd78..9b2ccd4f3 100644
--- a/etc/vivaldi-stable.profile
+++ b/etc/vivaldi-stable.profile
@@ -4,19 +4,5 @@ include /etc/firejail/globals.local
 # This file is overwritten during software install.
 # Persistent customizations should go in a .local file.
 include /etc/firejail/vivaldi.local
-noblacklist ~/.cache/vivaldi
 
-# Vivaldi browser profile
-noblacklist ~/.config/vivaldi
-include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-devel.inc
-
-netfilter
-
-whitelist ${DOWNLOADS}
-mkdir ~/.config/vivaldi
-whitelist ~/.config/vivaldi
-mkdir ~/.cache/vivaldi
-whitelist ~/.cache/vivaldi
-include /etc/firejail/whitelist-common.inc
+include /etc/firejail/vivaldi.profile
diff --git a/etc/vivaldi.profile b/etc/vivaldi.profile
index c01c6d608..25d78439d 100644
--- a/etc/vivaldi.profile
+++ b/etc/vivaldi.profile
@@ -6,4 +6,19 @@ include /etc/firejail/globals.local
 include /etc/firejail/vivaldi.local
 
 # Vivaldi browser profile
-include /etc/firejail/vivaldi-stable.profile
+noblacklist ~/.cache/vivaldi
+
+# Vivaldi browser profile
+noblacklist ~/.config/vivaldi
+include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-programs.inc
+include /etc/firejail/disable-devel.inc
+
+netfilter
+
+whitelist ${DOWNLOADS}
+mkdir ~/.config/vivaldi
+whitelist ~/.config/vivaldi
+mkdir ~/.cache/vivaldi
+whitelist ~/.cache/vivaldi
+include /etc/firejail/whitelist-common.inc