feat(tunable): unify some XDG and user dirs varibale name.
This commit is contained in:
parent
9e791deee5
commit
c7955cacd8
11 changed files with 77 additions and 69 deletions
|
|
@ -11,30 +11,7 @@
|
|||
|
||||
# First part, second part in /etc/apparmor.d/tunables/xdg-user-dirs.d/apparmor.d
|
||||
|
||||
# Extra user personal directories
|
||||
@{XDG_SCREENSHOTS_DIR}="Pictures/Screenshots"
|
||||
@{XDG_WALLPAPERS_DIR}="Pictures/Wallpapers"
|
||||
@{XDG_BOOKS_DIR}="Books"
|
||||
@{XDG_GAMES_DIR}=".games"
|
||||
@{XDG_PROJECTS_DIR}="Projects"
|
||||
@{XDG_WORK_DIR}="Work"
|
||||
@{XDG_MAIL_DIR}="Mail" ".{m,M}ail"
|
||||
@{XDG_SYNC_DIR}="Sync"
|
||||
@{XDG_TORRENTS_DIR}="Torrents"
|
||||
@{XDG_VM_DIR}=".vm"
|
||||
@{XDG_VM_SHARES_DIR}="VM_Shares"
|
||||
@{XDG_IMG_DIR}="images"
|
||||
@{XDG_GAMESSTUDIO_DIR}="unity3d"
|
||||
|
||||
# User personal keyrings
|
||||
@{XDG_GPG_DIR}=".gnupg"
|
||||
@{XDG_SSH_DIR}=".ssh"
|
||||
@{XDG_PASSWORD_STORE_DIR}=".password-store"
|
||||
|
||||
# User personal private directories
|
||||
@{XDG_PRIVATE_DIR}=".{p,P}rivate" "{p,P}rivate"
|
||||
|
||||
# Definition of local user configuration directories
|
||||
# Define the XDG Base Directory
|
||||
@{XDG_CACHE_DIR}=".cache"
|
||||
@{XDG_CONFIG_DIR}=".config"
|
||||
@{XDG_DATA_DIR}=".local/share"
|
||||
|
|
@ -42,28 +19,59 @@
|
|||
@{XDG_BIN_DIR}=".local/bin"
|
||||
@{XDG_LIB_DIR}=".local/lib"
|
||||
|
||||
# Full path of the user configuration directories
|
||||
# Define extended user directories not defined in the XDG standard but commonly
|
||||
# used in profiles
|
||||
@{XDG_SCREENSHOTS_DIR}="Pictures/Screenshots"
|
||||
@{XDG_WALLPAPERS_DIR}="Pictures/Wallpapers"
|
||||
@{XDG_BOOKS_DIR}="Books"
|
||||
@{XDG_GAMES_DIR}="Games"
|
||||
@{XDG_PROJECTS_DIR}="Projects"
|
||||
@{XDG_WORK_DIR}="Work"
|
||||
@{XDG_MAIL_DIR}="Mail" ".{m,M}ail"
|
||||
@{XDG_SYNC_DIR}="Sync"
|
||||
@{XDG_TORRENTS_DIR}="Torrents"
|
||||
@{XDG_GAMESSTUDIO_DIR}="unity3d"
|
||||
|
||||
# Define user directories for virtual machines, shared folders and disk images
|
||||
@{XDG_VM_DIR}=".vm"
|
||||
@{XDG_VMSHARE_DIR}=".vmshare"
|
||||
@{XDG_IMG_DIR}=".img"
|
||||
|
||||
# Define user build directories and artifacts output
|
||||
@{XDG_BUILD_DIR}=".build"
|
||||
@{XDG_PKG_DIR}=".pkg"
|
||||
|
||||
# Define user personal keyrings
|
||||
@{XDG_GPG_DIR}=".gnupg"
|
||||
@{XDG_SSH_DIR}=".ssh"
|
||||
@{XDG_PASSWORDSTORE_DIR}=".password-store"
|
||||
|
||||
# Define user personal private directories
|
||||
@{XDG_PRIVATE_DIR}=".{p,P}rivate" "{p,P}rivate"
|
||||
|
||||
# Full path of the XDG Base Directory
|
||||
@{user_cache_dirs}=@{HOME}/@{XDG_CACHE_DIR}
|
||||
@{user_config_dirs}=@{HOME}/@{XDG_CONFIG_DIR}
|
||||
@{user_state_dirs}=@{HOME}/@{XDG_STATE_DIR}
|
||||
@{user_bin_dirs}=@{HOME}/@{XDG_BIN_DIR}
|
||||
@{user_lib_dirs}=@{HOME}/@{XDG_LIB_DIR}
|
||||
@{user_state_dirs}=@{HOME}/@{XDG_STATE_DIR}
|
||||
|
||||
# User build directories and output
|
||||
@{user_build_dirs}="/tmp/build/"
|
||||
@{user_pkg_dirs}="/tmp/pkg/"
|
||||
@{user_img_dirs}=@{HOME}/@{XDG_IMG_DIR} @{MOUNTS}/@{XDG_IMG_DIR}
|
||||
|
||||
# Other user directories
|
||||
@{user_books_dirs}=@{HOME}/@{XDG_BOOKS_DIR} @{MOUNTS}/@{XDG_BOOKS_DIR}
|
||||
@{user_games_dirs}=@{HOME}/@{XDG_GAMES_DIR} @{MOUNTS}/@{XDG_GAMES_DIR}
|
||||
@{user_private_dirs}=@{HOME}/@{XDG_PRIVATE_DIR} @{MOUNTS}/@{XDG_PRIVATE_DIR}
|
||||
@{user_password_store_dirs}=@{HOME}/@{XDG_PASSWORD_STORE_DIR} @{MOUNTS}/@{XDG_PASSWORD_STORE_DIR}
|
||||
@{user_projects_dirs}=@{HOME}/@{XDG_PROJECTS_DIR} @{MOUNTS}/@{XDG_PROJECTS_DIR}
|
||||
@{user_work_dirs}=@{HOME}/@{XDG_WORK_DIR} @{MOUNTS}/@{XDG_WORK_DIR}
|
||||
@{user_mail_dirs}=@{HOME}/@{XDG_MAIL_DIR} @{MOUNTS}/@{XDG_MAIL_DIR}
|
||||
@{user_projects_dirs}=@{HOME}/@{XDG_PROJECTS_DIR} @{MOUNTS}/@{XDG_PROJECTS_DIR}
|
||||
@{user_sync_dirs}=@{HOME}/@{XDG_SYNC_DIR} @{MOUNTS}/*/@{XDG_SYNC_DIR}
|
||||
@{user_sync_dirs}=@{HOME}/@{XDG_SYNC_DIR} @{MOUNTS}/@{XDG_SYNC_DIR}
|
||||
@{user_torrents_dirs}=@{HOME}/@{XDG_TORRENTS_DIR} @{MOUNTS}/@{XDG_TORRENTS_DIR}
|
||||
@{user_vm_dirs}=@{HOME}/@{XDG_VM_DIR} @{MOUNTS}/@{XDG_VM_DIR}
|
||||
@{user_vmshare_dirs}=@{HOME}/@{XDG_VMSHARE_DIR} @{MOUNTS}/@{XDG_VMSHARE_DIR}
|
||||
@{user_img_dirs}=@{HOME}/@{XDG_IMG_DIR} @{MOUNTS}/@{XDG_IMG_DIR}
|
||||
@{user_build_dirs}=@{HOME}/@{XDG_BUILD_DIR} @{MOUNTS}/@{XDG_BUILD_DIR}
|
||||
@{user_pkg_dirs}=@{HOME}/@{XDG_PKG_DIR} @{MOUNTS}/@{XDG_PKG_DIR}
|
||||
@{user_gpg_dirs}=@{HOME}/@{XDG_GPG_DIR} @{MOUNTS}/@{XDG_GPG_DIR}
|
||||
@{user_ssh_dirs}=@{HOME}/@{XDG_SSH_DIR} @{MOUNTS}/@{XDG_SSH_DIR}
|
||||
@{user_passwordstore_dirs}=@{HOME}/@{XDG_PASSWORDSTORE_DIR} @{MOUNTS}/@{XDG_PASSWORDSTORE_DIR}
|
||||
@{user_private_dirs}=@{HOME}/@{XDG_PRIVATE_DIR} @{MOUNTS}/@{XDG_PRIVATE_DIR}
|
||||
|
||||
# vim:syntax=apparmor
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
@{XDG_DOWNLOAD_DIR}+=".tb/tor-browser/Browser/Downloads"
|
||||
|
||||
# Other user directories
|
||||
@{user_documents_dirs}=@{HOME}/@{XDG_DOCUMENTS_DIR} @{MOUNTS}/@{XDG_DOCUMENTS_DIR}
|
||||
@{user_desktop_dirs}=@{HOME}/@{XDG_DESKTOP_DIR} @{MOUNTS}/@{XDG_DESKTOP_DIR}
|
||||
@{user_download_dirs}=@{HOME}/@{XDG_DOWNLOAD_DIR} @{MOUNTS}/@{XDG_DOWNLOAD_DIR}
|
||||
@{user_templates_dirs}=@{HOME}/@{XDG_TEMPLATES_DIR} @{MOUNTS}/@{XDG_TEMPLATES_DIR}
|
||||
@{user_publicshare_dirs}=@{HOME}/@{XDG_PUBLICSHARE_DIR} @{MOUNTS}/@{XDG_PUBLICSHARE_DIR}
|
||||
@{user_documents_dirs}=@{HOME}/@{XDG_DOCUMENTS_DIR} @{MOUNTS}/@{XDG_DOCUMENTS_DIR}
|
||||
@{user_music_dirs}=@{HOME}/@{XDG_MUSIC_DIR} @{MOUNTS}/@{XDG_MUSIC_DIR}
|
||||
@{user_pictures_dirs}=@{HOME}/@{XDG_PICTURES_DIR} @{MOUNTS}/@{XDG_PICTURES_DIR}
|
||||
@{user_videos_dirs}=@{HOME}/@{XDG_VIDEOS_DIR} @{MOUNTS}/@{XDG_VIDEOS_DIR}
|
||||
@{user_publicshare_dirs}=@{HOME}/@{XDG_PUBLICSHARE_DIR} @{MOUNTS}/@{XDG_PUBLICSHARE_DIR}
|
||||
@{user_templates_dirs}=@{HOME}/@{XDG_TEMPLATES_DIR} @{MOUNTS}/@{XDG_TEMPLATES_DIR}
|
||||
@{user_vm_shares}=@{HOME}/@{XDG_VM_SHARES_DIR} @{MOUNTS}/@{XDG_VM_SHARES_DIR}
|
||||
|
||||
include if exists <tunables/xdg-user-dirs.d/apparmor.d.d>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue