waybar: cleanup and style changes

Move around some modules, cleanup unused stuff, update style a bit.

2 files changed, 31 insertions, 35 deletions

diff --git a/dotfiles/.config/waybar/config b/dotfiles/.config/waybar/config
index 7d7a192..65e8e99 100644
--- a/dotfiles/.config/waybar/config
+++ b/dotfiles/.config/waybar/config
@@ -1,6 +1,6 @@
 // vim: filetype=json
 {
-    "layer": "bottom",
+    "layer": "top",
     "height": 32,
     "modules-left": [
         "sway/workspaces",
@@ -15,16 +15,15 @@
     ],
     "modules-right": [
         "custom/rec-status",
-        "niri/language",
         "custom/swaykbd",
         "custom/mail-status",
-        "custom/pac-status",
         "memory",
         "backlight",
         "battery#bat0",
         "battery#bat1",
         "custom/batwatt",
         "network",
+        "niri/language",
         "tray"
     ],
     "sway/mode": {
@@ -74,7 +73,12 @@
         "spacing": 10
     },
     "clock": {
-        "format": "{:%Y-%m-%d  %H:%M:%S}",
+        "format": "{:%Y年%m月%d日 %H:%M:%S}",
+        "tooltip-format": "{calendar}",
+        "calendar": {
+        	"mode": "year",
+        	"mode-mon-col": 3
+        },
         "interval": 1
     },
     "cpu": {
@@ -99,7 +103,7 @@
     "backlight": {
         // "device": "acpi_video1",
         "format": "<span color=\"#5b8277\">{icon}</span> {percent}%",
-        "format-icons": ["", ""]
+        "format-icons": ["", ""]
     },
     "battery#bat0": {
         "bat": "BAT0",
@@ -129,34 +133,13 @@
     },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "<span color=\"#5b8277\"></span> {essid}",
-        "format-ethernet": "<span color=\"#5b8277\"></span> {ifname}",
-        "format-linked": "<span color=\"#5b8277\"></span> {ifname}",
-        "format-disconnected": "<span color=\"#5b8277\">⚠</span> Disconnected",
+        "format-wifi": "<span color=\"#5b8277\"></span>  {essid}",
+        "format-ethernet": "<span color=\"#5b8277\"></span>  {ifname}",
+        "format-linked": "<span color=\"#5b8277\"></span>  {ifname}",
+        "format-disconnected": "<span color=\"#5b8h277\">⚠</span>  Disconnected",
         "format-alt": "{ifname}: {ipaddr}/{cidr}",
         "tooltip-format": "{ifname}: {ipaddr}/{cidr}"
     },
-    "custom/left-arrow-cyan": {
-        "format": ""
-    },
-    "custom/right-arrow-cyan": {
-        "format": ""
-    },
-    "custom/left-arrow-gray": {
-        "format": ""
-    },
-    "custom/left-arrow-black": {
-        "format": ""
-    },
-    "custom/right-arrow-black": {
-        "format": ""
-    },
-    "custom/left-decorator-black": {
-        "format": ""
-    },
-    "custom/right-decorator-black": {
-        "format": ""
-    },
     "pulseaudio": {
         "scroll-step": 2, // %, can be a float
         "format": "<span color=\"#5b8277\">{icon}</span> {volume}%",
@@ -231,6 +214,10 @@
         "tooltip": false
     },
     "niri/language": {
-    	"format": "⌨️ {short}"
+    	"on-click": "niri msg action switch-layout next",
+    	"on-click-right": "niri msg action switch-layout prev",
+    	"format-en": " 🇺🇸 EN ",
+    	"format-es": " 🇲🇽 ES ",
+    	"format-ru": " 🇷🇺 RU "
     }
 }
diff --git a/dotfiles/.config/waybar/style.css b/dotfiles/.config/waybar/style.css
index 5b1ca12..29de0b8 100644
--- a/dotfiles/.config/waybar/style.css
+++ b/dotfiles/.config/waybar/style.css
@@ -4,26 +4,35 @@
 }
 window#waybar {
   	background: #000000;
+  	/* background: linear-gradient(#000000, #151515); */
   	color: #f2eccf;
   	min-height: 0;
+  	border-bottom: 2px solid #33333a;
 }
 #tray,
-#network,
+#language,
 #custom-torrent-status,
 #workspaces {
   	background: #151517;
-  	border-top: 2px solid #000000;
-  	border-bottom: 2px solid #000000;
+  	margin: 3px 0 3px 0;
+  	border-style: solid;
+  	border-color: #33333a;
 }
 #memory.warning {
 	color: #b2872f;
 }
+#tray{
+  	border-width: 2px 2px 2px 0;
+}
+#language {
+  	border-width: 2px 0 2px 2px;
+}
 #workspaces {
   	padding: 0;
   	margin-right: 6px;
+  	border-width: 2px;
 }
 #workspaces button {
-  	min-width: 12px;
   	padding: 0 0.7em;
   	color: #fcf8e2;
   	border-radius: 0;