feat(profile): modernise some profiles.

apparmor.d/profiles-m-r/psi

@@ -11,21 +11,16 @@ include <tunables/global>
 profile psi @{exec_path} {
   include <abstractions/base>
   include <abstractions/consoles>
-  include <abstractions/dri-enumerate>
+  include <abstractions/desktop>
   include <abstractions/enchant>
   include <abstractions/fontconfig-cache-read>
-  include <abstractions/fonts>
-  include <abstractions/freedesktop.org>
-  include <abstractions/gtk>
-  include <abstractions/mesa>
+  include <abstractions/graphics>
   include <abstractions/nameservice-strict>
-  include <abstractions/qt5>
   include <abstractions/qt5-compose-cache-write>
   include <abstractions/qt5-settings-write>
   include <abstractions/ssl_certs>
   include <abstractions/thumbnails-cache-read>
   include <abstractions/user-download-strict>
-  include <abstractions/X>
 
   network inet dgram,
   network inet6 dgram,
@@ -38,12 +33,11 @@ profile psi @{exec_path} {
   @{exec_path} mr,
 
   @{bin}/aplay       rCx -> aplay,
-  @{bin}/gpg{,2}     rCx -> gpg,
+  @{bin}/gpg{,2}     rPx,
   @{bin}/lsb_release rPx -> lsb_release,
-  @{bin}/xdg-open    rCx -> open,
+  @{open_path}       rPx -> child-open,
   @{lib}/firefox/firefox rPUx,
 
-  /usr/share/hwdata/pnp.ids r,
   /usr/share/psi/{,**} r,
 
   /etc/debian_version r,
@@ -51,8 +45,6 @@ profile psi @{exec_path} {
   /etc/machine-id r,
   /var/lib/dbus/machine-id r,
 
-  owner /var/tmp/etilqs_@{hex} rw,
-
   owner @{HOME}/ r,
   owner @{user_cache_dirs}/ rw,
   owner @{user_cache_dirs}/#@{int} rw,
@@ -64,18 +56,17 @@ profile psi @{exec_path} {
   owner @{user_share_dirs}/psi/** rwk,
 
   owner @{tmp}/#@{int} rw,
+  owner @{tmp}/etilqs_@{hex} rw,
   owner @{tmp}/Psi.* rwl -> /tmp/#@{int},
 
   @{run}/systemd/inhibit/[0-9]*.ref rw,
 
-       owner @{PROC}/@{pid}/mountinfo r,
-       owner @{PROC}/@{pid}/mounts r,
-  deny       @{PROC}/sys/kernel/random/boot_id r,
-  deny owner @{PROC}/@{pid}/cmdline r,
+        @{PROC}/sys/kernel/random/boot_id r,
+  owner @{PROC}/@{pid}/cmdline r,
+  owner @{PROC}/@{pid}/mountinfo r,
+  owner @{PROC}/@{pid}/mounts r,
 
-  /dev/shm/#@{int} rw,
-
-  # file_inherit
+        /dev/shm/#@{int} rw,
   owner /dev/tty@{int} rw,
 
   profile aplay {
@@ -95,42 +86,7 @@ profile psi @{exec_path} {
     # file_inherit
     /dev/dri/card@{int} rw,
 
-  }
-
-  profile gpg {
-    include <abstractions/base>
-
-    @{bin}/gpg{,2} mr,
-
-    owner @{HOME}/.gnupg/ rw,
-    owner @{HOME}/.gnupg/** rwkl -> @{HOME}/.gnupg/**,
-
-    # file_inherit
-    /dev/dri/card@{int} rw,
-
-  }
-
-  profile open {
-    include <abstractions/base>
-    include <abstractions/xdg-open>
-
-    @{bin}/xdg-open mr,
-
-    @{sh_path}             rix,
-    @{bin}/{m,g,}awk       rix,
-    @{bin}/readlink        rix,
-    @{bin}/basename        rix,
-
-    owner @{HOME}/ r,
-
-    owner @{run}/user/@{uid}/ r,
-
-    # Allowed apps to open
-    @{lib}/firefox/firefox rPUx,
-
-    # file_inherit
-    owner @{HOME}/.xsession-errors w,
-
+    include if exists <local/psi_aplay>
   }
 
   include if exists <local/psi>