I'm an idiot.

chiraag-nataraj · Jan 11, 2018 · 61892f7 · 61892f7
1 parent f56eb79
commit 61892f7
Show file tree

Hide file tree

Showing 44 changed files with 9 additions and 412 deletions.
diff --git a/Viber.profile b/Viber.profile
@@ -1,18 +1,9 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-private-bin sh,dig,awk,xdg-mime,cut,touch,mv
-private-etc hosts,fonts,mailcap,resolv.conf,X11,pulse,alternatives,localtime,nsswitch.conf,ssl,proxychains.conf
-private-tmp
-=======
 # Firejail profile for Viber
 # This file is overwritten after every install/update
 # Persistent local customizations
 include /etc/firejail/Viber.local
 # Persistent global definitions
 include /etc/firejail/globals.local
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
-
 
 whitelist ${DOWNLOADS}
 whitelist ${HOME}/.ViberPC
@@ -31,33 +22,18 @@ whitelist /dev/zero
 whitelist /opt/viber
 include /etc/firejail/whitelist-common.inc
 
-<<<<<<< HEAD
-noexec ${HOME}
-noexec /tmp
-
 shell none
 seccomp
-# noroot
-=======
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 caps.drop all
 ipc-namespace
 nogroups
-<<<<<<< HEAD
-ipc-namespace
-
-# x11 xpra
+# noroot
 
 env QML_DISABLE_DISK_CACHE=1
-=======
-noroot
-seccomp
-shell none
 
 private-bin sh,dig,awk
 private-etc hosts,fonts,mailcap,resolv.conf,X11,pulse,alternatives,localtime,nsswitch.conf,ssl,proxychains.conf
 private-tmp
 
 noexec ${HOME}
 noexec /tmp
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
diff --git a/akregator.profile b/akregator.profile
@@ -1,19 +1,9 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-blacklist /usr/local/bin
-blacklist /usr/local/sbin
-
-whitelist ${HOME}/.config/
-whitelist ${HOME}/.local/share/akregator/
-=======
 # Firejail profile for akregator
 # This file is overwritten after every install/update
 # Persistent local customizations
 include /etc/firejail/akregator.local
 # Persistent global definitions
 include /etc/firejail/globals.local
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media

diff --git a/amule.profile b/amule.profile
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-=======
 # Firejail profile for amule
 # This file is overwritten after every install/update
 # Persistent local customizations
@@ -13,7 +9,7 @@ blacklist /boot
 blacklist /media
 blacklist /mnt
 blacklist /opt
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
+
 blacklist /usr/local/bin
 blacklist /usr/local/sbin
 

diff --git a/ardour5.profile b/ardour5.profile
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-=======
 # Firejail profile for ardour5
 # This file is overwritten after every install/update
 # Persistent local customizations
@@ -13,7 +9,7 @@ blacklist /boot
 blacklist /media
 blacklist /mnt
 blacklist /opt
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
+
 blacklist /usr/local/bin
 
 whitelist ${DOWNLOADS}

diff --git a/blender.profile b/blender.profile
@@ -1,18 +1,9 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-whitelist ${HOME}/.config/blender
-
-whitelist ${DOWNLOADS}
-whitelist ${HOME}/Videos
-=======
 # Firejail profile for blender
 # This file is overwritten after every install/update
 # Persistent local customizations
 include /etc/firejail/blender.local
 # Persistent global definitions
 include /etc/firejail/globals.local
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media

diff --git a/calligra.profile b/calligra.profile
@@ -1,18 +1,9 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-whitelist ${HOME}/.config/Trolltech.conf
-whitelist ${HOME}/.gtkrc-2.0
-whitelist ${HOME}/.kde
-whitelist ${HOME}/.themes
-=======
 # Firejail profile for calligra
 # This file is overwritten after every install/update
 # Persistent local customizations
 include /etc/firejail/calligra.local
 # Persistent global definitions
 include /etc/firejail/globals.local
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media

diff --git a/cin.profile b/cin.profile
@@ -1,22 +1,9 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-whitelist ${HOME}/.bcast5
-
-whitelist ${DOWNLOADS}
-whitelist ${HOME}/Videos
-
-private-bin cin
-private-dev
-private-etc fonts,pulse
-=======
 # Firejail profile for cin
 # This file is overwritten after every install/update
 # Persistent local customizations
 include /etc/firejail/cin.local
 # Persistent global definitions
 include /etc/firejail/globals.local
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media

diff --git a/darktable.profile b/darktable.profile
@@ -1,20 +1,9 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-blacklist /usr/local/bin
-
-whitelist ${HOME}/Downloads
-whitelist ${HOME}/Pictures
-whitelist ${HOME}/.config/darktable
-whitelist ${HOME}/.cache/darktable
-=======
 # Firejail profile for darktable
 # This file is overwritten after every install/update
 # Persistent local customizations
 include /etc/firejail/darktable.local
 # Persistent global definitions
 include /etc/firejail/globals.local
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media

diff --git a/dia.profile b/dia.profile
@@ -1,21 +1,9 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-whitelist ${HOME}/.gtkrc-2.0
-whitelist ${HOME}/.themes
-whitelist ${HOME}/.icons
-whitelist ${HOME}/.dia
-
-whitelist ${DOWNLOADS}
-whitelist ${HOME}/Documents
-=======
 # Firejail profile for dia
 # This file is overwritten after every install/update
 # Persistent local customizations
 include /etc/firejail/dia.local
 # Persistent global definitions
 include /etc/firejail/globals.local
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media

diff --git a/fetchmail.profile b/fetchmail.profile
@@ -1,21 +1,9 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-whitelist ${HOME}/scripts/fetchmail-real.sh
-# whitelist ${HOME}/.fetchmailrc.gpg
-## Location of your fetchmailrc - I decrypt it into /tmp/fetchmailrc
-whitelist /tmp/fetchmailrc
-whitelist ${HOME}/Mail
-whitelist ${HOME}/.procmailrc.gmail
-whitelist ${HOME}/.procmailrc.brown
-=======
 # Firejail profile for fetchmail
 # This file is overwritten after every install/update
 # Persistent local customizations
 include /etc/firejail/fetchmail.local
 # Persistent global definitions
 include /etc/firejail/globals.local
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media

diff --git a/flowblade.profile b/flowblade.profile
@@ -1,18 +1,9 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-whitelist ${HOME}/.flowblade
-whitelist ${HOME}/.themes
-whitelist ${HOME}/.config/gtk-3.0
-whitelist ${HOME}/.config/flowblade
-=======
 # Firejail profile for flowblade
 # This file is overwritten after every install/update
 # Persistent local customizations
 include /etc/firejail/flowblade.local
 # Persistent global definitions
 include /etc/firejail/globals.local
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media

diff --git a/freecad.profile b/freecad.profile
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-=======
 # Firejail profile for freecad
 # This file is overwritten after every install/update
 # Persistent local customizations
@@ -13,7 +9,7 @@ blacklist /boot
 blacklist /media
 blacklist /mnt
 blacklist /opt
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
+
 blacklist /usr/local/bin
 blacklist /usr/local/sbin
 

diff --git a/gimp.profile b/gimp.profile
@@ -1,21 +1,9 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-whitelist ${HOME}/.gimp-2.8
-whitelist ${HOME}/.gtkrc-2.0
-whitelist ${HOME}/.themes
-whitelist ${HOME}/.fonts
-
-whitelist ${DOWNLOADS}
-whitelist ${HOME}/Pictures
-=======
 # Firejail profile for gimp
 # This file is overwritten after every install/update
 # Persistent local customizations
 include /etc/firejail/gimp.local
 # Persistent global definitions
 include /etc/firejail/globals.local
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media

diff --git a/google-chrome.profile b/google-chrome.profile
@@ -1,16 +1,9 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-blacklist /usr/local/bin
-blacklist /usr/local/sbin
-=======
 # Firejail profile for google-chrome
 # This file is overwritten after every install/update
 # Persistent local customizations
 include /etc/firejail/google-chrome.local
 # Persistent global definitions
 include /etc/firejail/globals.local
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media

diff --git a/google-earth.profile b/google-earth.profile
@@ -1,15 +1,9 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-# Hack to automatically discard the lock file
-=======
 # Firejail profile for google-earth
 # This file is overwritten after every install/update
 # Persistent local customizations
 include /etc/firejail/google-earth.local
 # Persistent global definitions
 include /etc/firejail/globals.local
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media

diff --git a/hugin.profile b/hugin.profile
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-=======
 # Firejail profile for hugin
 # This file is overwritten after every install/update
 # Persistent local customizations
@@ -13,7 +9,7 @@ blacklist /boot
 blacklist /media
 blacklist /mnt
 blacklist /opt
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
+
 blacklist /usr/local/bin
 blacklist /usr/local/sbin
 

diff --git a/imagej.profile b/imagej.profile
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-=======
 # Firejail profile for imagej
 # This file is overwritten after every install/update
 # Persistent local customizations
@@ -13,7 +9,7 @@ blacklist /boot
 blacklist /media
 blacklist /mnt
 blacklist /opt
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
+
 blacklist /usr/local/bin
 blacklist /usr/local/sbin
 

diff --git a/inkscape.profile b/inkscape.profile
@@ -1,17 +1,9 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-whitelist ${HOME}/.config/inkscape
-whitelist ${HOME}/.gtkrc-2.0
-whitelist ${HOME}/.themes
-=======
 # Firejail profile for inkscape
 # This file is overwritten after every install/update
 # Persistent local customizations
 include /etc/firejail/inkscape.local
 # Persistent global definitions
 include /etc/firejail/globals.local
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media

diff --git a/kdenlive.profile b/kdenlive.profile
@@ -1,19 +1,9 @@
-<<<<<<< HEAD
-include /etc/firejail/globals.local
-
-# Apparently these break kdenlive for some people - they work for me though?
-# whitelist ${HOME}/.config/
-# whitelist ${HOME}/kdenlive
-# whitelist ${DOWNLOADS}
-# whitelist ${HOME}/Videos
-=======
 # Firejail profile for kdenlive
 # This file is overwritten after every install/update
 # Persistent local customizations
 include /etc/firejail/kdenlive.local
 # Persistent global definitions
 include /etc/firejail/globals.local
->>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media