update wayfire/waybar config

2 files changed, 33 insertions, 25 deletions

diff --git a/waybar/config b/waybar/config
index 42c9a23..0bfdf65 100644
--- a/waybar/config
+++ b/waybar/config
@@ -7,7 +7,7 @@
     // Choose the order of the modules
     "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad", "custom/media"],
     "modules-center": ["sway/window"],
-    "modules-right": ["pulseaudio", "network", "cpu", "memory", "disk", "temperature", "keyboard-state", "battery", "battery#bat1", "clock", "tray"],
+    "modules-right": ["pulseaudio", "network", "cpu", "memory", "disk", "temperature", "keyboard-state", "battery#bat0", "battery#bat1", "clock", "tray"],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -96,7 +96,7 @@
     },
 	"disk": {
 		"path": "/Z",
-        "format": "{percentage_used}% 🖴"
+        "format": "{free} 🖴"
 	},
     "temperature": {
         // "thermal-zone": 2,
@@ -111,7 +111,8 @@
         "format": "{percent}% {icon}",
         "format-icons": ["", "", "", "", "", "", "", "", ""]
     },
-    "battery": {
+    "battery#bat0": {
+        "bat": "BAT0",
         "states": {
             // "good": 95,
             "warning": 30,
@@ -126,7 +127,19 @@
         "format-icons": ["", "", "", "", ""]
     },
     "battery#bat1": {
-        "bat": "BAT1"
+        "bat": "BAT1",
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{capacity}% {icon}",
+        "format-charging": "{capacity}% ",
+        "format-plugged": "{capacity}% ",
+        "format-alt": "{time} {icon}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        "format-icons": ["", "", "", "", ""]
     },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
diff --git a/wayfire/wayfire.ini b/wayfire/wayfire.ini
index a497cf2..add5b78 100644
--- a/wayfire/wayfire.ini
+++ b/wayfire/wayfire.ini
@@ -4,9 +4,9 @@ modifier = <alt> <super>
 
 [animate]
 close_animation = fade
-duration = 400
+duration = 200
 enabled_for = (type equals "toplevel" | (type equals "x-or" & focusable equals true))
-fade_duration = 400
+fade_duration = 200
 fade_enabled_for = type equals "overlay"
 fire_color = \#B22303FF
 fire_duration = 300
@@ -15,7 +15,7 @@ fire_particle_size = 16.000000
 fire_particles = 2000
 open_animation = fade
 random_fire_color = false
-startup_duration = 600
+startup_duration = 500
 zoom_duration = 500
 zoom_enabled_for = none
 
@@ -65,7 +65,7 @@ focus_button_with_modifiers = false
 focus_buttons = BTN_LEFT | BTN_MIDDLE | BTN_RIGHT
 focus_buttons_passthrough = true
 max_render_time = -1
-plugins = alpha animate autostart command decoration expo fast-switcher fisheye grid move oswitch place resize vswitch window-rules wrot switcher wayfire-shell ipc gtk-shell foreign-toplevel xdg-activation
+plugins = alpha animate autostart command decoration expo fast-switcher fisheye grid move oswitch place resize vswitch window-rules wrot wayfire-shell ipc gtk-shell foreign-toplevel xdg-activation
 preferred_decoration_mode = client
 transaction_timeout = 100
 vheight = 3
@@ -90,12 +90,12 @@ speed_zoom = 0.070000
 zoom = 0.100000
 
 [decoration]
-active_color = \#222222AA
+active_color = \#222222FF
 border_size = 4
 button_order = minimize maximize close
 font = sans-serif
 ignore_views = none
-inactive_color = \#333333DD
+inactive_color = \#555555FF
 title_height = 30
 
 [dock]
@@ -118,8 +118,8 @@ move_delay = 500
 move_fingers = 3
 
 [fast-switcher]
-activate = <alt> KEY_ESC
-activate_backward = <alt> <shift> KEY_ESC
+activate = <alt> KEY_TAB
+activate_backward = <alt> <shift> KEY_TAB
 inactive_alpha = 0.700000
 
 [fisheye]
@@ -131,13 +131,13 @@ zoom = 7.000000
 
 [grid]
 duration = 300
-restore = <super> KEY_DOWN | <super> KEY_KP0
+restore = <super> KEY_DOWN | <super> KEY_KP0 | <super> KEY_J
 slot_b = <super> KEY_KP2
 slot_bl = <super> KEY_KP1
 slot_br = <super> KEY_KP3
-slot_c = <super> KEY_UP | <super> KEY_KP5
-slot_l = <super> KEY_LEFT | <super> KEY_KP4
-slot_r = <super> KEY_RIGHT | <super> KEY_KP6
+slot_c = <super> KEY_UP | <super> KEY_KP5 | <super> KEY_K
+slot_l = <super> KEY_LEFT | <super> KEY_KP4 | <super> KEY_H
+slot_r = <super> KEY_RIGHT | <super> KEY_KP6 | <super> KEY_L
 slot_t = <super> KEY_KP8
 slot_tl = <super> KEY_KP7
 slot_tr = <super> KEY_KP9
@@ -330,10 +330,10 @@ binding_last =
 binding_left = <alt> <ctrl> KEY_LEFT
 binding_right = <alt> <ctrl> KEY_RIGHT
 binding_up = <alt> <ctrl> KEY_UP
-binding_win_down = <alt> <ctrl> <shift> KEY_DOWN
-binding_win_left = <alt> <ctrl> <shift> KEY_LEFT
-binding_win_right = <alt> <ctrl> <shift> KEY_RIGHT
-binding_win_up = <alt> <ctrl> <shift> KEY_UP
+with_win_down = <alt> <ctrl> <shift> KEY_DOWN
+with_win_left = <alt> <ctrl> <shift> KEY_LEFT
+with_win_right = <alt> <ctrl> <shift> KEY_RIGHT
+with_win_up = <alt> <ctrl> <shift> KEY_UP
 duration = 300
 gap = 20
 send_win_down = 
@@ -341,11 +341,6 @@ send_win_last =
 send_win_left = 
 send_win_right = 
 send_win_up = 
-with_win_down = 
-with_win_last = 
-with_win_left = <alt> <shift> <super> KEY_LEFT
-with_win_right = <alt> <shift> <super> KEY_RIGHT
-with_win_up = <alt> <shift> <super> KEY_UP
 wraparound = false
 
 [wayfire-shell]