diff --git a/waybar/config.template b/waybar/config.template
index deab144f3..cb8a38ef9 100644
--- a/waybar/config.template
+++ b/waybar/config.template
@@ -19,7 +19,7 @@
// Choose the order of the modules
"modules-left": ["sway/workspaces", "sway/window"],
"modules-center": [],
- "modules-right": ["sway/mode", "custom/weather", "backlight", "cpu", "memory", "custom/disk", "temperature", "custom/battery", "pulseaudio", "tray", "custom/wallpaper", "custom/todo", "custom/osk", "custom/pkg", "custom/bar", "custom/gammastep", "custom/idle_mode", "custom/nc", "custom/clock", "custom/power"],
+ "modules-right": ["sway/mode", "custom/weather", "custom/keyboard", "backlight", "cpu", "memory", "custom/disk", "temperature", "pulseaudio", "custom/battery", "tray", "custom/wallpaper", "custom/pkg", "custom/idle_mode", "custom/clock", "custom/nc"],
// Modules configuration
"sway/workspaces": {
// "disable-scroll": true,
@@ -86,7 +86,7 @@
},
"temperature": {
"critical-threshold": 80,
- "format": "{temperatureC}°C"
+ "format": " {temperatureC}°C"
},
"backlight": {
"device": "acpi_video1",
@@ -127,7 +127,8 @@
},
"on-scroll-up": "${HOME}/scripts/waybar/waybar-volume.sh up",
"on-scroll-down": "${HOME}/scripts/waybar/waybar-volume.sh down",
- "on-click": "${HOME}/scripts/waybar/waybar-volume.sh"
+ "on-click": "pavucontrol",
+ "on-click-right": "${HOME}/scripts/waybar/waybar-volume.sh"
},
"tray": {
"icon-size": 24,
@@ -138,28 +139,25 @@
"exec": "echo '✶\nRotate wallpaper\nactive'",
"on-click": "${HOME}/scripts/sway/rotate-wallpaper.sh"
},
- "custom/todo": {
- "interval": 86400,
- "exec": "echo '☑\nTo-do list\n'",
- "on-click": "${HOME}/scripts/waybar/waybar-todo.sh",
- },
- "custom/osk": {
+ //"custom/todo": {
+ //"interval": 86400,
+ //"exec": "echo '☑\nTo-do list\n'",
+ //"on-click": "${HOME}/scripts/waybar/waybar-todo.sh",
+ //},
+ "custom/keyboard": {
"interval": 1,
- "on-click": "${HOME}/scripts/waybar/waybar-keyboard.sh",
- "exec": "if [ -e $HOME/.local/state/onscreen-keyboard ]; then CLASS='activated'; else CLASS=''; fi; echo '\uf11c \nToggle onscreen keyboard\n'$CLASS",
+ "on-click": "${HOME}/scripts/waybar/waybar-keyboard.sh layout",
+ "on-click-right": "${HOME}/scripts/waybar/waybar-keyboard.sh osk",
+ "exec": "${HOME}/scripts/waybar/waybar-keyboard.sh bar",
+ "return-type": "json",
},
"custom/pkg": {
- "interval": 60,
+ "interval": 360,
"tooltip-format": "{:%d %B}\n{calendar}",
- "on-click": "${HOME}/scripts/waybar/waybar-pkg.sh upgrade",
+ "on-click": "alacritty --config-file ~/.dotfiles/alacritty/host.toml --class Alacritty-grave -e ${HOME}/scripts/waybar/waybar-pkg.sh upgrade",
"return-type": "json",
"exec": "${HOME}/scripts/waybar/waybar-pkg.sh bar"
},
- "custom/bar": {
- "interval": 86400,
- "exec": "echo '\u200a\nLock bar\n'",
- "on-click": "${HOME}/scripts/waybar/toggle.sh"
- },
"custom/idle_mode": {
"interval": 1,
"return-type": "json",
@@ -174,9 +172,8 @@
"on-click": "${HOME}/scripts/waybar/waybar-gammastep.sh toggle"
},
"custom/nc": {
- "on-click": "swaync-client -t",
"tooltip": true,
- "format": "{icon}",
+ "format": "{icon} Test",
"format-icons": {
"notification": " ",
"none": " ",
@@ -188,20 +185,16 @@
"dnd-inhibited-none": " "
},
"return-type": "json",
- "exec-if": "which swaync-client",
"exec": "swaync-client -swb",
- "on-click": "swaync-client -t -sw",
+ "exec-if": "which swaync-client",
+ "on-click": "swaync-client -t",
"on-click-right": "swaync-client -d",
"escape": true
},
"custom/clock": {
"interval": 60,
- "on-click": "${HOME}/.local/bin/firefox/firefox-bin https://papillon.john.me.tz/calendar.php",
+ "on-click": "flatpak run org.mozilla.Firefox https://papillon.john.me.tz/calendar.php",
"return-type": "json",
"exec": "echo '{\"class\": \"clock\", \"text\": \"'$(date '+%H:%M')'\", \"tooltip\": \"'$(date '+%A, %B %d, %Y | %Y-%m-%d')'\"}'"
},
- "custom/power": {
- "format": "\u23FB",
- "on-click": "if [ $(sudo pgrep -xc wofi) -gt 0 ]; then pkill wofi; else ${HOME}/scripts/sway/power-menu.sh; fi"
- },
}]
diff --git a/waybar/style.css b/waybar/style.css
index 6c400df85..ac2439584 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -57,7 +57,7 @@ window#waybar {
color: @fg;
}
-#window, #mode, #custom-weather, #mpd, #cpu, #memory, #custom-disk, #temperature, #custom-battery, #pulseaudio, #tray, #custom-wallpaper, #custom-todo, #custom-osk, #custom-pkg, #custom-bar, #custom-idle_mode, #custom-clock, #custom-power {
+#window, #mode, #custom-weather, #mpd, #cpu, #memory, #custom-disk, #temperature, #custom-battery, #pulseaudio, #tray, #custom-todo, #custom-keyboard, #custom-pkg, #custom-clock {
color: @grey06;
padding: 0px 2px;
margin: 0px;
@@ -65,16 +65,11 @@ window#waybar {
/* Tray */
-#custom-wallpaper, #custom-todo, #custom-osk {
- font-size: 22px;
- margin-top: -8px;
- margin-bottom: -8px;
- margin-left: 2px;
- margin-right: 2px;
-}
-
-#tray, #custom-wallpaper, #custom-todo, #custom-osk, #custom-pkg, #custom-bar, #custom-clock, #custom-power {
+#tray, #custom-wallpaper, #custom-pkg, #custom-clock, #custom-idle_mode {
+ background: @grey03;
+ border-bottom: 1px solid @fg;
color: @bluehi;
+ margin: 0px;
}
/* Workspaces */
@@ -113,7 +108,7 @@ window#waybar {
/* MPD */
#mpd {
- color: @bg;
+ color: @fg;
}
/* Weather */
@@ -123,36 +118,16 @@ window#waybar {
margin-bottom: -2px;
}
-/* CPU */
+/* Keyboard */
-#cpu {
- color: @fg;
- color: @greenhi;
+#custom-keyboard {
+ color: @bluehi;
+ margin-right: -2px;
+ margin-top: -1px;
}
-/* Memory */
-
-#memory {
- color: @fg;
- color: @purplehi;
-}
-
-/* Disk */
-
-#custom-disk {
- color: @fg;
- color: @purple;
-}
-
-/* Temperature */
-
-#temperature {
- color: @fg;
- color: @yellowhi;
-}
-
-#temperature.critical {
- color: @redhi;
+#custom-keyboard.alternate {
+ color: @orange;
}
/* Backlight */
@@ -160,18 +135,74 @@ window#waybar {
#backlight {
margin-left: 5px;
margin-right: 2px;
- color: @fg;
+ color: @yellowhi;
+}
+
+/* CPU */
+
+#cpu {
color: @greenhi;
}
+/* Memory */
+
+#memory {
+ color: @purplehi;
+}
+
+/* Disk */
+
+#custom-disk {
+ color: @orangehi;
+}
+
+/*
+ * green
+ * blue
+ * purple
+ * orange
+*
+ * red
+ * yellow
+ * aqua
+ * redhi
+ * greenhi
+ * yellowhi
+ * bluehi
+ * purple hi
+ * aquahi
+ * orangehi
+ */
+
+/* Temperature */
+
+#temperature {
+ color: @yellowhi;
+}
+
+#temperature.critical {
+ color: @redhi;
+}
+
+/* Pulseaudio */
+
+#pulseaudio {
+ color: @bluehi;
+}
+
+#pulseaudio.muted {
+ color: @grey06;
+}
+
/* Battery */
#custom-battery {
color: @green;
+ margin-top: -1px;
}
#custom-battery.charging {
- color: @green;
+ margin-top: 2px;
}
#custom-battery.discharging {
@@ -191,16 +222,6 @@ window#waybar {
color: @redhi;
}
-/* Pulseaudio */
-
-#pulseaudio {
- color: @bluehi;
-}
-
-#pulseaudio.muted {
- color: @grey06;
-}
-
/* Tray */
#tray {
@@ -210,22 +231,8 @@ window#waybar {
/* Wallpaper rotation */
#custom-wallpaper {
- margin-left: -4px;
- margin-top: -10px;
-}
-
-/* Todo-txt */
-
-#custom-todo {
-}
-
-/* On-Screen Keyboard */
-
-#custom-osk {
-}
-
-#custom-osk.activated {
- color: @white;
+ font-size: 22px;
+ margin-top: -4px;
}
/* Package upgrades */
@@ -238,36 +245,29 @@ window#waybar {
color: @orange;
}
-/* Bar locker */
-
-#custom-bar {
- margin-right: 6px;
-}
-
-/* Notifications */
-
-#custom-nc {
- margin-left: 5px;
- padding-right: 5px;
- font-family: "NotoSansMono Nerd Font";
-}
-
/* Idle Mode */
#custom-idle_mode {
font-family: "Font Awesome 6 Brands", "Font Awesome 6 Free";
+ padding-right: 3px;
+}
+
+#custom-idle_mode.none {
+ color: @red;
}
/* Clock */
#custom-clock {
color: @fg;
+ font-weight: bold;
+ margin: 0px;
}
-/* Power button */
+/* Notifications */
-#custom-power {
- margin-right: 0px;
- margin-top: 1px;
- color: @red;
+#custom-nc {
+ font-family: "NotoSansMono Nerd Font";
+ background: @grey06;
+ margin: 0px;
}