diff --git a/desktop/configs/waybar/config b/desktop/configs/waybar/config
index 9b7c3df..4572899 100644
--- a/desktop/configs/waybar/config
+++ b/desktop/configs/waybar/config
@@ -6,7 +6,7 @@
"passtrough": false,
"gtk-layer-shell": true,
"height": 0,
- "output": "HDMI-A-1",
+ /* "output": "DP-3", */
"modules-left": [
"hyprland/workspaces",
@@ -33,19 +33,19 @@
"on-click": "activate",
"format": "{icon}",
"format-icons": {
- "1": "一",
- "2": "二",
- "3": "三",
- "4": "四",
- "5": "五",
- "6": "六",
- "7": "七",
- "8": "八",
- "9": "九",
- "10": "十",
- "11": "十一",
- "12": "十二",
- "13": "十三"
+ "1": "1",
+ "2": "2",
+ "3": "3",
+ "4": "4",
+ "5": "5",
+ "6": "6",
+ "7": "7",
+ "8": "8",
+ "9": "9",
+ "10": "10",
+ "11": "11",
+ "12": "12",
+ "13": "13"
}
},
@@ -61,9 +61,9 @@
},
"pulseaudio": {
- "format": " {volume}%",
+ "format": " {volume}%",
"tooltip": false,
- "format-muted": " N/A",
+ "format-muted": " N/A",
"on-click": "pavucontrol &",
"scroll-step": 5
},
diff --git a/desktop/configs/waybar/config-chinese b/desktop/configs/waybar/config-chinese
new file mode 100644
index 0000000..9b7c3df
--- /dev/null
+++ b/desktop/configs/waybar/config-chinese
@@ -0,0 +1,87 @@
+{
+ "layer": "top",
+ "position": "top",
+ "mod": "dock",
+ "exclusive": true,
+ "passtrough": false,
+ "gtk-layer-shell": true,
+ "height": 0,
+ "output": "HDMI-A-1",
+
+ "modules-left": [
+ "hyprland/workspaces",
+ ],
+
+ "modules-center": [
+ "hyprland/window"
+ ],
+
+ "modules-right": [
+ "pulseaudio",
+ "clock",
+ "tray",
+ ],
+
+ "hyprland/window": {
+ "format": "{}"
+ },
+
+ "hyprland/workspaces": {
+ "on-scroll-up": "hyprctl dispatch workspace e+1",
+ "on-scroll-down": "hyprctl dispatch workspace e-1",
+ "all-outputs": true,
+ "on-click": "activate",
+ "format": "{icon}",
+ "format-icons": {
+ "1": "一",
+ "2": "二",
+ "3": "三",
+ "4": "四",
+ "5": "五",
+ "6": "六",
+ "7": "七",
+ "8": "八",
+ "9": "九",
+ "10": "十",
+ "11": "十一",
+ "12": "十二",
+ "13": "十三"
+ }
+ },
+
+ "tray": {
+ "icon-size": 20,
+ "tooltip": false,
+ "spacing": 10
+ },
+
+ "clock": {
+ "format": "{:%a %b %d, %H:%M}",
+ "tooltip-format": "{:%Y %B}\n\n{calendar}"
+ },
+
+ "pulseaudio": {
+ "format": " {volume}%",
+ "tooltip": false,
+ "format-muted": " N/A",
+ "on-click": "pavucontrol &",
+ "scroll-step": 5
+ },
+
+ "network": {
+ "format-wifi": " {essid} {signalStrength}%",
+ "format-ethernet": " {signalStrength}%",
+ "format-disconnected": " N/A"
+ },
+
+ "battery": {
+ "states": {
+ "warning": 20,
+ "critical": 15
+ },
+ "format": " {capacity}%",
+ "format-charging": " {capacity}%",
+ "format-plugged": " {capacity}%"
+ }
+}
+
diff --git a/desktop/configs/waybar/style-solarized.css b/desktop/configs/waybar/style-solarized.css
new file mode 100644
index 0000000..66c12cc
--- /dev/null
+++ b/desktop/configs/waybar/style-solarized.css
@@ -0,0 +1,50 @@
+* {
+ border: none;
+ border-radius: 0;
+ padding: 0;
+ margin: 0;
+ font-size: 11px;
+}
+
+window#waybar {
+ background: #fff;
+ color: #292828;
+}
+
+#custom-logo {
+ font-size: 18px;
+ margin: 0;
+ margin-left: 7px;
+ margin-right: 12px;
+ padding: 0;
+ font-family: NotoSans Nerd Font Mono;
+}
+
+#workspaces button {
+ margin-left: 2px;
+ margin-right: 10px;
+ color: #292828;
+}
+
+#workspaces button:hover,
+#workspaces button:active {
+ background-color: #fff;
+ color: #292828;
+}
+
+#workspaces button.focused {
+ background-color: #383737;
+}
+
+#language {
+ margin-right: 7px;
+}
+
+#battery {
+ margin-left: 7px;
+ margin-right: 3px;
+}
+
+#clock {
+ margin: 0px 6px;
+}
diff --git a/desktop/configs/waybar/style.css b/desktop/configs/waybar/style.css
index 5f61e22..90a7669 100644
--- a/desktop/configs/waybar/style.css
+++ b/desktop/configs/waybar/style.css
@@ -1,129 +1,50 @@
* {
- border: none;
- border-radius: 0;
- font-family: "Cartograph CF Nerd Font";
- font-weight: bold;
- font-size: 16px;
- min-height: 0;
- margin: 1px;
+ border: none;
+ border-radius: 0;
+ padding: 0;
+ margin: 0;
+ font-size: 11px;
}
window#waybar {
- background: rgba(75, 75, 75, 0);
- color: #f1f1f1;
+ background: #292828;
+ color: #ffffff;
}
-tooltip {
- background: #595959;
- border-radius: 0px;
+#custom-logo {
+ font-size: 18px;
+ margin: 0;
+ margin-left: 7px;
+ margin-right: 12px;
+ padding: 0;
+ font-family: NotoSans Nerd Font Mono;
}
#workspaces button {
- padding: 5px;
- color: #f1f1f1;
+ margin-left: 2px;
+ margin-right: 10px;
+ color: #ffffff;
}
-#workspaces button.active {
- background-color: #e16b53;
- border-radius: 10px;
+#workspaces button:hover,
+#workspaces button:active {
+ background-color: #292828;
+ color: #ffffff;
}
#workspaces button.focused {
- color: #f1f1f1;
- background: #595959;
- border-radius: 10px;
+ background-color: #383737;
}
-#workspaces button.urgent {
- color: #f1f1f1;
- background: #595959;
- border-radius: 10px;
+#language {
+ margin-right: 7px;
}
-#workspaces button:hover {
- background: #f1f1f1;
- color: #595959;
- border-radius: 10px;
-}
-
-#custom-language,
-#custom-updates,
-#custom-caffeine,
-#custom-weather,
-#window,
-#clock,
-#battery,
-#pulseaudio,
-#network,
-#workspaces,
-#tray,
-#language,
-#backlight {
- background:
- /*#F6821E*/
- #444444;
- padding: 0px 5px;
- margin: 0px;
- font-weight: 100;
-}
-
-#tray {
- margin-right: 0px;
- border-radius: 0px 10px 10px 0px;
-}
-
-#workspaces {
- color: #f1f1f1;
- margin-left: 0px;
- padding-right: 0px;
- padding-left: 5px;
- border-radius: 10px;
-}
-
-#custom-caffeine {
- color: #f1f1f1;
- border-right: 0px;
- margin-left: 10px;
-}
-
-#custom-language {
- color: #f1f1f1;
- border-left: 0px;
- border-right: 0px;
-}
-
-#custom-updates {
- color: #f1f1f1;
- border-left: 0px;
- border-right: 0px;
-}
-
-#window {
- color: #f1f1f1;
- background-color: #595959;
- font-weight: 100;
- border-radius: 10px;
- margin-left: 0px;
- margin-right: 60px;
+#battery {
+ margin-left: 7px;
+ margin-right: 3px;
}
#clock {
- color: #f1f1f1;
- margin-left: 0px;
- border-right: 0px;
- padding: 0px 10px;
- border-radius: 0px 10px 10px 0px;
-}
-
-#pulseaudio {
- color: #f1f1f1;
- border-left: 0px;
- border-right: 0px;
- padding-left: 10px;
- border-radius: 10px 0px 0px 10px;
-}
-
-#pulseaudio.microphone {
- color: #f1f1f1;
- margin-right: 5px;
+ margin: 0px 6px;
}
diff --git a/desktop/configs/waybar/style.css.chinese b/desktop/configs/waybar/style.css.chinese
new file mode 100644
index 0000000..a18a3d3
--- /dev/null
+++ b/desktop/configs/waybar/style.css.chinese
@@ -0,0 +1,128 @@
+* {
+ border: none;
+ border-radius: 0;
+ font-family: "Cartograph CF Nerd Font";
+ font-weight: bold;
+ font-size: 16px;
+ min-height: 0;
+ margin: 1px;
+}
+
+window#waybar {
+ background: rgba(75, 75, 75, 0);
+ color: #f1f1f1;
+}
+
+tooltip {
+ background: #595959;
+ border-radius: 0px;
+}
+
+#workspaces button {
+ padding: 5px;
+ color: #f1f1f1;
+}
+
+#workspaces button.active {
+ background-color: #e16b53;
+ border-radius: 10px;
+}
+
+#workspaces button.focused {
+ color: #f1f1f1;
+ background: #595959;
+ border-radius: 10px;
+}
+
+#workspaces button.urgent {
+ color: #f1f1f1;
+ background: #595959;
+ border-radius: 10px;
+}
+
+#workspaces button:hover {
+ background: #f1f1f1;
+ color: #595959;
+ border-radius: 10px;
+}
+
+#custom-language,
+#custom-updates,
+#custom-caffeine,
+#custom-weather,
+#window,
+#clock,
+#battery,
+#pulseaudio,
+#network,
+#workspaces,
+#tray,
+#language,
+#backlight {
+ background:
+ /*#F6821E*/
+ #444444;
+ padding: 0px 5px;
+ margin: 0px;
+ font-weight: 100;
+}
+
+#tray {
+ margin-right: 0px;
+ border-radius: 0px 10px 10px 0px;
+}
+
+#workspaces {
+ color: #f1f1f1;
+ margin-left: 0px;
+ padding-right: 0px;
+ padding-left: 5px;
+ border-radius: 10px;
+}
+
+#custom-caffeine {
+ color: #f1f1f1;
+ border-right: 0px;
+ margin-left: 10px;
+}
+
+#custom-language {
+ color: #f1f1f1;
+ border-left: 0px;
+ border-right: 0px;
+}
+
+#custom-updates {
+ color: #f1f1f1;
+ border-left: 0px;
+ border-right: 0px;
+}
+
+#window {
+ color: #f1f1f1;
+ background-color: #595959;
+ font-weight: 100;
+ border-radius: 10px;
+ margin-left: 0px;
+ margin-right: 60px;
+}
+
+#clock {
+ color: #f1f1f1;
+ margin-left: 0px;
+ border-right: 0px;
+ padding: 0px 10px;
+}
+
+#pulseaudio {
+ color: #f1f1f1;
+ border-left: 0px;
+ border-right: 0px;
+ padding-left: 10px;
+ border-radius: 10px 0px 0px 10px;
+}
+
+#pulseaudio.microphone {
+ color: #f1f1f1;
+ margin-right: 5px;
+}