Merge branch 'develop'

Author: deathaxe

PACKAGES.md

@@ -212,6 +212,10 @@ This file contains a list of possible packages you may need to install to see th
 
 - [NimLime](https://packagecontrol.io/packages/NimLime)
 
+## Nix
+
+- [Nix](https://packagecontrol.io/packages/Nix)
+
 ## Notes
 
 - [PlainNotes](https://packagecontrol.io/packages/PlainNotes)
@@ -356,6 +360,10 @@ This file contains a list of possible packages you may need to install to see th
 - [TypeScript](https://packagecontrol.io/packages/TypeScript)
 - [TypeScript Syntax](https://packagecontrol.io/packages/TypeScript%20Syntax)
 
+## Typst
+
+- [Typst](https://github.com/hyrious/typst-syntax-highlight)
+
 ## V
 
 - [V](https://packagecontrol.io/packages/V)

icons/icons.json

@@ -949,6 +949,14 @@
 				"name": "Git Blame",
 				"scope": "text.git.blame"
 			},
+			{
+				"extensions": [
+					"description",
+					".gitdescription"
+				],
+				"name": "Git Description",
+				"scope": "text.git.description"
+			},
 			{
 				"extensions": [
 					".gitkeep"
@@ -1629,6 +1637,18 @@
 			}
 		]
 	},
+	"file_type_nix": {
+		"color": "sky",
+		"syntaxes": [
+			{
+				"extensions": [
+					"nix"
+				],
+				"name": "Plain Text (Nix)",
+				"scope": "source.nix"
+			}
+		]
+	},
 	"file_type_nodejs": {
 		"aliases": [
 			{
@@ -2801,6 +2821,18 @@
 			}
 		]
 	},
+	"file_type_typst": {
+		"color": "cyan",
+		"syntaxes": [
+			{
+				"extensions": [
+					"typ"
+				],
+				"name": "Typst",
+				"scope": "source.typst"
+			}
+		]
+	},
 	"file_type_unity3d": {
 		"color": "sky",
 		"syntaxes": [

icons/multi/file_type_nix.png

@@ -13,7 +13,7 @@
         if module_name.startswith(prefix) and module_name != __name__
     ]:
         del sys.modules[module_name]
-    prefix = None
+    del prefix
 
     from .core import aliases
     from .core import overlay

icons/multi/file_type_nix@2x.png

@@ -2,7 +2,7 @@
 <plist version="1.0">
 	<dict>
 		<key>scope</key>
-		<string>source.git, source.shell.git, text.git, text.git.blame, text.git.keep</string>
+		<string>source.git, source.shell.git, text.git, text.git.blame, text.git.description, text.git.keep</string>
 		<key>settings</key>
 		<dict>
 			<key>icon</key>

icons/multi/file_type_nix@3x.png

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+	<dict>
+		<key>scope</key>
+		<string>source.nix</string>
+		<key>settings</key>
+		<dict>
+			<key>icon</key>
+			<string>file_type_nix</string>
+		</dict>
+	</dict>
+</plist>

icons/multi/file_type_typst.png

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+	<dict>
+		<key>scope</key>
+		<string>source.typst</string>
+		<key>settings</key>
+		<dict>
+			<key>icon</key>
+			<string>file_type_typst</string>
+		</dict>
+	</dict>
+</plist>