31 files changed, 4 insertions, 32 deletions

diff --git a/etc/audacious.profile b/etc/audacious.profile
index 19d735c32..be19e3924 100644
--- a/etc/audacious.profile
+++ b/etc/audacious.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/chromium.profile b/etc/chromium.profile
index a66578436..117ecab92 100644
--- a/etc/chromium.profile
+++ b/etc/chromium.profile
@@ -3,7 +3,6 @@ noblacklist ${HOME}/.config/chromium
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 netfilter
 whitelist ~/Downloads
 whitelist ~/.config/chromium
diff --git a/etc/clementine.profile b/etc/clementine.profile
index 3cec2b1d8..ee39bee37 100644
--- a/etc/clementine.profile
+++ b/etc/clementine.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/deadbeef.profile b/etc/deadbeef.profile
index 3267fd83e..c623845e0 100644
--- a/etc/deadbeef.profile
+++ b/etc/deadbeef.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/deluge.profile b/etc/deluge.profile
index 7d4fb55f5..ca63bc16d 100644
--- a/etc/deluge.profile
+++ b/etc/deluge.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/disable-common.inc b/etc/disable-common.inc
index 87a979034..8a4ba94ef 100644
--- a/etc/disable-common.inc
+++ b/etc/disable-common.inc
@@ -1,3 +1,7 @@
+# History files in $HOME
+blacklist ${HOME}/.history
+blacklist ${HOME}/.*_history
+
 # HTTP / FTP / Mail
 blacklist ${HOME}/.adobe
 blacklist ${HOME}/.macromedia
diff --git a/etc/disable-history.inc b/etc/disable-history.inc
deleted file mode 100644
index 7a91df828..000000000
--- a/etc/disable-history.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# History files in $HOME
-blacklist ${HOME}/.history
-blacklist ${HOME}/.*_history
diff --git a/etc/dropbox.profile b/etc/dropbox.profile
index dbf90e352..52be5a8be 100644
--- a/etc/dropbox.profile
+++ b/etc/dropbox.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/empathy.profile b/etc/empathy.profile
index 8d54ab401..c15eb1c0f 100644
--- a/etc/empathy.profile
+++ b/etc/empathy.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.wine
 caps.drop all
 seccomp
diff --git a/etc/evince.profile b/etc/evince.profile
index 6af871bf7..c0a2481c9 100644
--- a/etc/evince.profile
+++ b/etc/evince.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/fbreader.profile b/etc/fbreader.profile
index 46ea14807..92bbe4065 100644
--- a/etc/fbreader.profile
+++ b/etc/fbreader.profile
@@ -3,7 +3,6 @@ noblacklist ${HOME}/.FBReader
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/filezilla.profile b/etc/filezilla.profile
index 1b6684e75..9311b67ef 100644
--- a/etc/filezilla.profile
+++ b/etc/filezilla.profile
@@ -4,7 +4,6 @@ noblacklist ${HOME}/.config/filezilla
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.wine
 caps.drop all
 seccomp
diff --git a/etc/firefox.profile b/etc/firefox.profile
index ac6536ad4..8269eeb68 100644
--- a/etc/firefox.profile
+++ b/etc/firefox.profile
@@ -3,7 +3,6 @@ noblacklist ${HOME}/.mozilla
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/generic.profile b/etc/generic.profile
index 40a9b31af..cc40ad27e 100644
--- a/etc/generic.profile
+++ b/etc/generic.profile
@@ -4,7 +4,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/gnome-mplayer.profile b/etc/gnome-mplayer.profile
index 80beb8638..a1e633f07 100644
--- a/etc/gnome-mplayer.profile
+++ b/etc/gnome-mplayer.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/midori.profile b/etc/midori.profile
index 0200c300c..6f31d60ae 100644
--- a/etc/midori.profile
+++ b/etc/midori.profile
@@ -3,7 +3,6 @@ noblacklist ${HOME}/.config/midori
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/opera.profile b/etc/opera.profile
index d55c0aaa3..9a91ca94b 100644
--- a/etc/opera.profile
+++ b/etc/opera.profile
@@ -3,7 +3,6 @@ noblacklist ${HOME}/.config/opera
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 netfilter
 noroot
 
diff --git a/etc/pidgin.profile b/etc/pidgin.profile
index e35585087..cdd27b796 100644
--- a/etc/pidgin.profile
+++ b/etc/pidgin.profile
@@ -3,7 +3,6 @@ noblacklist ${HOME}/.purple
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.wine
 caps.drop all
 seccomp
diff --git a/etc/qbittorrent.profile b/etc/qbittorrent.profile
index 41f984602..26ade68bf 100644
--- a/etc/qbittorrent.profile
+++ b/etc/qbittorrent.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/quassel.profile b/etc/quassel.profile
index 20ac17bcd..42a172756 100644
--- a/etc/quassel.profile
+++ b/etc/quassel.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.wine
 caps.drop all
 seccomp
diff --git a/etc/rhythmbox.profile b/etc/rhythmbox.profile
index d7b45102a..53c23d8c6 100644
--- a/etc/rhythmbox.profile
+++ b/etc/rhythmbox.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/skype.profile b/etc/skype.profile
index fc4c54771..902888355 100644
--- a/etc/skype.profile
+++ b/etc/skype.profile
@@ -4,7 +4,6 @@ noblacklist ${HOME}/.local/share/steam
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 caps.drop all
 netfilter
 noroot
diff --git a/etc/spotify.profile b/etc/spotify.profile
index 71d55f067..af38a2eb3 100644
--- a/etc/spotify.profile
+++ b/etc/spotify.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 
 # Whitelist the folders needed by Spotify - This is more restrictive 
 # than a blacklist though, but this is all spotify requires for 
diff --git a/etc/steam.profile b/etc/steam.profile
index feaa46c84..8103a2a20 100644
--- a/etc/steam.profile
+++ b/etc/steam.profile
@@ -4,7 +4,6 @@ noblacklist ${HOME}/.local/share/steam
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 caps.drop all
 netfilter
 noroot
diff --git a/etc/thunderbird.profile b/etc/thunderbird.profile
index afd049eb1..ff7a714c3 100644
--- a/etc/thunderbird.profile
+++ b/etc/thunderbird.profile
@@ -15,7 +15,6 @@ blacklist ${HOME}/.remmina
 blacklist ${HOME}/.tconn
 
 
-include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/totem.profile b/etc/totem.profile
index 3a7a24d8c..0d8df7a91 100644
--- a/etc/totem.profile
+++ b/etc/totem.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/transmission-gtk.profile b/etc/transmission-gtk.profile
index 6ef8c5490..92906c6a1 100644
--- a/etc/transmission-gtk.profile
+++ b/etc/transmission-gtk.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/transmission-qt.profile b/etc/transmission-qt.profile
index 06a425a0f..163ccb34d 100644
--- a/etc/transmission-qt.profile
+++ b/etc/transmission-qt.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/vlc.profile b/etc/vlc.profile
index 3ac67983e..f2b2d72d7 100644
--- a/etc/vlc.profile
+++ b/etc/vlc.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/wine.profile b/etc/wine.profile
index 3319f912f..3728638a8 100644
--- a/etc/wine.profile
+++ b/etc/wine.profile
@@ -4,7 +4,6 @@ noblacklist ${HOME}/.local/share/steam
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 caps.drop all
 netfilter
 noroot
diff --git a/etc/xchat.profile b/etc/xchat.profile
index c1cd9e205..f7f775bf0 100644
--- a/etc/xchat.profile
+++ b/etc/xchat.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-history.inc
 blacklist ${HOME}/.wine
 caps.drop all
 seccomp