Restructure

apparmor.d/profiles-m-r/mutt

@@ -24,57 +24,6 @@ profile mutt @{exec_path} {
 
   @{exec_path} mr,
 
-  # Mutt config files
-  /usr/share/mutt/**         r,
-  /etc/{mutt/,}Muttrc        r,
-  /etc/{mutt/,}Muttrc.d/{*,} r,
-  owner @{HOME}/.mutt/**     r,
-  owner @{HOME}/.muttrc*     r,
-
-  owner @{HOME}/.cache/mutt rwk,
-
-  # Used When viewing attachments
-  owner /tmp/*              lrw,
-
-  # Needed to compose a message
-  owner /{var/,}tmp/.mutt*/  rw,
-  owner /{var/,}tmp/.mutt*/* lrwk,
-  owner /{var/,}tmp/mutt*    lrwk,
-
-  # Needed for the edit operation.
-  @{HOME}/ r,
-
-  # User mbox
-  # Could be a file or dir depending on mbox_type variable
-  owner /var/{spool/,}mail/*             rwlk,
-  owner @{HOME}/{mbox,postponed,sent}*   rwlk,
-  owner @{HOME}/{mbox,postponed,sent}/   rw,
-  owner @{HOME}/{mbox,postponed,sent}/** rwlk,
-  # User maildir
-  owner @{user_mail_dirs}/ rw,
-  owner @{user_mail_dirs}/** rwlk -> @{user_mail_dirs}/**,
-
-  # Trusted certificate store
-  owner @{HOME}/.mutt_certificates rwk,
-  
-  # Mutt history file
-  owner @{HOME}/.mutthistory rwk,
-  
-  # Mutt signature file
-  owner @{HOME}/.signature r,
-
-  # Common location for mail aliases
-  owner @{HOME}/.mail_aliases r,
-  
-  /usr/share/terminfo/** r,
-
-  /etc/mime.types r,
- 
-  # Mutt mailcap search path
-  owner @{HOME}/.mailcap    r,
-  /etc/{mutt/,}mailcap      r,
-  /usr/{local/,}etc/mailcap r,
-
   # Used to exec programs defined in the mailcap.
   # There are countless programs that can be executed from the mailcap.
   # This profile includes only the most basic.
@@ -102,6 +51,56 @@ profile mutt @{exec_path} {
   @{bin}/gpgsm           rCx -> gpg,
   @{bin}/pgpewrap        rCx -> gpg,
 
+  /usr/share/terminfo/** r,
+
+  /etc/mime.types r,
+
+  # Mutt mailcap search path
+  /etc/{mutt/,}mailcap      r,
+  /usr/{local/,}etc/mailcap r,
+  owner @{HOME}/.mailcap    r,
+
+  # Mutt config files
+  /usr/share/mutt/**         r,
+  /etc/{mutt/,}Muttrc        r,
+  /etc/{mutt/,}Muttrc.d/{*,} r,
+  owner @{HOME}/.mutt/**     r,
+  owner @{HOME}/.muttrc*     r,
+
+  owner @{HOME}/.cache/mutt rwk,
+
+  # Used When viewing attachments
+  owner /tmp/*              lrw,
+
+  # Needed to compose a message
+  owner /{var/,}tmp/.mutt*/  rw,
+  owner /{var/,}tmp/.mutt*/* lrwk,
+  owner /{var/,}tmp/mutt*    lrwk,
+
+  # Needed for the edit operation.
+  owner @{HOME}/ r,
+
+  # User mbox
+  # Could be a file or dir depending on mbox_type variable
+  owner /var/{spool/,}mail/*             rwlk,
+  owner @{HOME}/{mbox,postponed,sent}*   rwlk,
+  owner @{HOME}/{mbox,postponed,sent}/   rw,
+  owner @{HOME}/{mbox,postponed,sent}/** rwlk,
+  # User maildir
+  owner @{user_mail_dirs}/ rw,
+  owner @{user_mail_dirs}/** rwlk -> @{user_mail_dirs}/**,
+
+  # Trusted certificate store
+  owner @{HOME}/.mutt_certificates rwk,
+  
+  # Mutt history file
+  owner @{HOME}/.mutthistory rwk,
+  
+  # Mutt signature file
+  owner @{HOME}/.signature r,
+
+  # Common location for mail aliases
+  owner @{HOME}/.mail_aliases r,
   
   profile html-renderer {
     include <abstractions/base>