qt6: switch from kvantum to kde family & hyprland: a new set of config

config/yazi/.config/yazi/package.toml

@@ -1,11 +1,11 @@
 [[plugin.deps]]
 use = "yazi-rs/plugins:git"
-rev = "6f26ae0"
-hash = "ce345e7e8baed03a2561b314fa85e59a"
+rev = "4848aac"
+hash = "5bb0bfab901d3601c370eafdd66edd31"
 
 [[plugin.deps]]
 use = "yazi-rs/plugins:smart-enter"
-rev = "6f26ae0"
+rev = "4848aac"
 hash = "187cc58ba7ac3befd49c342129e6f1b6"
 
 [[plugin.deps]]

config/yazi/.config/yazi/plugins/git.yazi/README.md

@@ -40,10 +40,11 @@ group = "git"
 You can customize the [Style](https://yazi-rs.github.io/docs/configuration/theme#types.style) of the status sign with:
 
 - `[git].unknown` - status cannot/not yet determined
-- `[git].modified` - modified file
-- `[git].added` - added file
-- `[git].untracked` - untracked file
 - `[git].ignored` - ignored file
+- `[git].untracked` - untracked file
+- `[git].unstaged` - unstaged file
+- `[git].staged` - staged file
+- `[git].added` - staged new file
 - `[git].deleted` - deleted file
 - `[git].updated` - updated file
 - `[git].clean` - clean file
@@ -53,17 +54,18 @@ For example:
 ```toml
 # theme.toml / flavor.toml
 [git]
-modified = { fg = "blue" }
+unstaged = { fg = "blue" }
 deleted  = { fg = "red", bold = true }
 ```
 
 You can also customize the text of the status sign with:
 
 - `[git].unknown_sign` - status cannot/not yet determined
-- `[git].modified_sign` - modified file
-- `[git].added_sign` - added file
-- `[git].untracked_sign` - untracked file
 - `[git].ignored_sign` - ignored file
+- `[git].untracked_sign` - untracked file
+- `[git].unstaged_sign` - unstaged file
+- `[git].staged_sign` - staged file
+- `[git].added_sign` - staged new file
 - `[git].deleted_sign` - deleted file
 - `[git].updated_sign` - updated file
 - `[git].clean_sign` - clean file
@@ -74,7 +76,7 @@ For example:
 # theme.toml / flavor.toml
 [git]
 unknown_sign  = " "
-modified_sign = "M"
+unstaged_sign = "M"
 deleted_sign  = "D"
 clean_sign    = "✔"
 ```

config/yazi/.config/yazi/plugins/git.yazi/main.lua

@@ -9,9 +9,10 @@ local WINDOWS = ya.target_family() == "windows"
 local CODES = {
 	unknown = 100, -- status cannot/not yet determined
 	excluded = 99, -- ignored directory
-	ignored = 6, -- ignored file
-	untracked = 5,
-	modified = 4,
+	ignored = 7, -- ignored file
+	untracked = 6,
+	unstaged = 5,
+	staged = 4,
 	added = 3,
 	deleted = 2,
 	updated = 1,
@@ -21,7 +22,8 @@ local CODES = {
 local PATTERNS = {
 	{ "!$", CODES.ignored },
 	{ "?$", CODES.untracked },
-	{ "[MT]", CODES.modified },
+	{ ".[MT]", CODES.unstaged },
+	{ "[MT] ", CODES.staged },
 	{ "[AC]", CODES.added },
 	{ "D", CODES.deleted },
 	{ "U", CODES.updated },
@@ -34,7 +36,8 @@ local function theme()
 		[CODES.unknown] = t.unknown or ui.Style(),
 		[CODES.ignored] = t.ignored or ui.Style():fg("darkgray"),
 		[CODES.untracked] = t.untracked or ui.Style():fg("magenta"),
-		[CODES.modified] = t.modified or ui.Style():fg("yellow"),
+		[CODES.unstaged] = t.unstaged or ui.Style():fg("yellow"),
+		[CODES.staged] = t.staged or ui.Style():fg("green"),
 		[CODES.added] = t.added or ui.Style():fg("green"),
 		[CODES.deleted] = t.deleted or ui.Style():fg("red"),
 		[CODES.updated] = t.updated or ui.Style():fg("yellow"),
@@ -43,7 +46,8 @@ local function theme()
 		[CODES.unknown] = t.unknown_sign or "",
 		[CODES.ignored] = t.ignored_sign or " ",
 		[CODES.untracked] = t.untracked_sign or "? ",
-		[CODES.modified] = t.modified_sign or " ",
+		[CODES.unstaged] = t.unstaged_sign or " ",
+		[CODES.staged] = t.staged_sign or " ",
 		[CODES.added] = t.added_sign or " ",
 		[CODES.deleted] = t.deleted_sign or " ",
 		[CODES.updated] = t.updated_sign or " ",

config/yazi/.config/yazi/plugins/git.yazi/types.lua

@@ -4,7 +4,7 @@
 
 ---@class Options
 ---@field order number The order in which the status is displayed
----@field renamed boolean Whether to include renamed files in the status (or treat them as modified)
+---@field renamed boolean Whether to include renamed files in the status (or treat them as unstaged)
 
 -- TODO: move this to `types.yazi` once it's get stable
 ---@alias UnstableFetcher fun(self: unknown, job: { files: File[] })