Remove the x- prefix from MIME types to comply with #1927

sxyazi · Nov 21, 2024 · ce8013c · ce8013c
1 parent b110486
commit ce8013c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/yazi-config/preset/theme.toml b/yazi-config/preset/theme.toml
@@ -190,10 +190,8 @@ rules = [
 	{ mime = "{audio,video}/*", fg = "magenta" },
 
 	# Archives
-	{ mime = "application/{zip,gzip,zstd,zlib,arj}", fg = "red" },
-	{ mime = "application/{zip,gzip,x}-compressed", fg = "red" },
-	{ mime = "application/x-{rar,tar,xz,bzip*,lzma,compress,archive,cpio,arj,deflate,xar}", fg = "red" },
-	{ mime = "application/x-{zip,rar,7z,gzip,arj}-compressed", fg = "red" },
+	{ mime = "application/{zip,rar,tar,gzip,xz,zstd,bzip*,zlib,lzma,compress,compressed,archive,cpio,arj,deflate,xar}", fg = "red" },
+	{ mime = "application/{zip,rar,7z,gzip,arj}-compressed", fg = "red" },
 	{ mime = "application/vnd.ms-cab-compressed", fg = "red" },
 
 	# Documents

diff --git a/yazi-config/preset/yazi.toml b/yazi-config/preset/yazi.toml
@@ -67,11 +67,9 @@ rules = [
 	# Media
 	{ mime = "{audio,video}/*", use = [ "play", "reveal" ] },
 	# Archive
-	{ mime = "application/{zip,gzip,zstd,zlib,arj}", use = [ "extract", "reveal" ] },
-	{ mime = "application/{zip,gzip,x}-compressed", use = [ "extract", "reveal" ] },
-	{ mime = "application/x-{rar,tar,xz,bzip*,lzma,compress,archive,cpio,arj,deflate,xar}", use = [ "extract", "reveal" ] },
-	{ mime = "application/x-{zip,rar,7z,gzip,arj}-compressed", use = [ "extract", "reveal" ] },
-	{ mime = "application/x-{debian-package,redhat-package-manager,rpm}", use = [ "extract", "reveal" ] },
+	{ mime = "application/{zip,rar,tar,gzip,xz,zstd,bzip*,zlib,lzma,compress,compressed,archive,cpio,arj,deflate,xar}", use = [ "extract", "reveal" ] },
+	{ mime = "application/{zip,rar,7z,gzip,arj}-compressed", use = [ "extract", "reveal" ] },
+	{ mime = "application/{debian-package,redhat-package-manager,rpm}", use = [ "extract", "reveal" ] },
 	{ mime = "application/vnd.debian.binary-package", use = [ "extract", "reveal" ] },
 	{ mime = "application/vnd.android.package-archive", use = [ "extract", "reveal" ] },
 	{ mime = "application/vnd.ms-cab-compressed", use = [ "extract", "reveal" ] },
@@ -139,22 +137,19 @@ previewers = [
 	# PDF
 	{ mime = "application/pdf", run = "pdf" },
 	# Archive
-	{ mime = "application/{zip,gzip,zstd,zlib,arj}", run = "archive" },
-	{ mime = "application/{zip,gzip,x}-compressed", run = "archive" },
-	{ mime = "application/x-{rar,tar,xz,bzip*,lzma,compress,archive,cpio,arj,deflate,xar}", run = "archive" },
-	{ mime = "application/x-{zip,rar,7z,gzip,arj}-compressed", run = "archive" },
-	{ mime = "application/x-{debian-package,redhat-package-manager,rpm}", run = "archive" },
+	{ mime = "application/{zip,rar,tar,gzip,xz,zstd,bzip*,zlib,lzma,compress,compressed,archive,cpio,arj,deflate,xar}", run = "archive" },
+	{ mime = "application/{zip,rar,7z,gzip,arj}-compressed", run = "archive" },
+	{ mime = "application/{debian-package,redhat-package-manager,rpm}", run = "archive" },
 	{ mime = "application/vnd.debian.binary-package", run = "archive" },
 	{ mime = "application/vnd.android.package-archive", run = "archive" },
 	{ mime = "application/vnd.ms-cab-compressed", run = "archive" },
 	{ name = "*.{AppImage, appimage}", run = "archive" },
 	# Virtual Disk / Disk Image
-	{ mime = "application/x-iso9660-image", run = "archive" },
-	{ mime = "application/x-{qemu,vhd,vhdx,vdi,vmdk}-disk", run = "archive" },
-	{ mime = "application/x-{vhd,vmdk}", run = "archive" },
-	{ mime = "application/x-virtualbox-{vdi,vhd,vhdx,vmdk}", run = "archive" },
-	{ mime = "application/x-ms-wim", run = "archive" },
-	{ mime = "application/x-apple-diskimage", run = "archive" },
+	{ mime = "application/iso9660-image", run = "archive" },
+	{ mime = "application/{qemu,vhd,vhdx,vdi,vmdk}-disk", run = "archive" },
+	{ mime = "application/{vhd,vmdk}", run = "archive" },
+	{ mime = "application/virtualbox-{vdi,vhd,vhdx,vmdk}", run = "archive" },
+	{ mime = "application/{ms-wim,apple-diskimage}", run = "archive" },
 	{ name = "*.{fat,ext,ext2,ext3,ext4,squashfs,ntfs,hfs,hfsx,img}", run = "archive" },
 	# Font
 	{ mime = "font/*", run = "font" },