diff options
| -rw-r--r-- | hypr/.config/hypr/hyprland.conf | 7 | ||||
| -rw-r--r-- | quickshell/.config/quickshell/shell.qml | 24 |
2 files changed, 22 insertions, 9 deletions
diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf index 1070a73..85d356e 100644 --- a/hypr/.config/hypr/hyprland.conf +++ b/hypr/.config/hypr/hyprland.conf @@ -228,7 +228,8 @@ bind = $mainMod, asterisk, workspace, 7 # 七 bind = $mainMod, parenright, workspace, 8 # 八 bind = $mainMod, plus, workspace, 9 # 九 bind = $mainMod, bracketright, workspace, 10 # 十 -bind = $mainMod, exclam, workspace, 11 # +bind = $mainMod, exclam, workspace, 11 +bind = $mainMod, numbersign, workspace, 12 # 📦 Move to Workspace (Dvorak layout keys) bind = $mainMod SHIFT, ampersand, movetoworkspace, 1 @@ -242,6 +243,7 @@ bind = $mainMod SHIFT, parenright, movetoworkspace, 8 bind = $mainMod SHIFT, plus, movetoworkspace, 9 bind = $mainMod SHIFT, bracketright, movetoworkspace, 10 bind = $mainMod SHIFT, exclam, movetoworkspace, 11 +bind = $mainMod SHIFT, numbersign, movetoworkspace, 12 # 🖱 Scroll Through Workspaces (mainMod + scroll) bind = $mainMod, mouse_down, workspace, e+1 @@ -296,4 +298,5 @@ exec-once = hyprctl dispatch renameworkspace "7 七" exec-once = hyprctl dispatch renameworkspace "8 八" exec-once = hyprctl dispatch renameworkspace "9 九" exec-once = hyprctl dispatch renameworkspace "10 十" -exec-once = hyprctl dispatch renameworkspace "11 " +exec-once = hyprctl dispatch renameworkspace "11 ᚨ" +exec-once = hyprctl dispatch renameworkspace "12 ᚠ" diff --git a/quickshell/.config/quickshell/shell.qml b/quickshell/.config/quickshell/shell.qml index d2c802b..8ce5869 100644 --- a/quickshell/.config/quickshell/shell.qml +++ b/quickshell/.config/quickshell/shell.qml @@ -66,19 +66,29 @@ PanelWindow { spacing: 12 Repeater { - model: ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十", ""] + model: ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十", "ᚨ", "ᚠ"] - Text { + Item { required property int index required property string modelData property int wsId: index + 1 property string state: wsState(wsId) - text: modelData - color: state === "focused" ? "#FFC500" : state === "occupied" ? "#8affff" : "#4d7f7f" - font.family: "Noto Sans CJK SC" - font.pixelSize: 13 - font.bold: state === "focused" + width: wsLabel.implicitWidth + height: wsLabel.implicitHeight + + Text { + id: wsLabel + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + anchors.verticalCenterOffset: parent.wsId >= 11 ? 4 : 0 + + text: parent.modelData + color: parent.state === "focused" ? "#FFC500" : parent.state === "occupied" ? "#8affff" : "#4d7f7f" + font.family: parent.wsId >= 11 ? "Junicode" : "Noto Sans CJK SC" + font.pixelSize: parent.wsId >= 11 ? 17 : 13 + font.bold: parent.state === "focused" + } MouseArea { anchors.fill: parent |