Merge remote-tracking branch 'origin/main'

common/fish/vars.fish

@@ -16,9 +16,11 @@ set --export --universal MANPAGER "less"
 if command --search --quiet hx
 	set --export --universal EDITOR hx
 	set --export --universal VISUAL hx
+	alias helix hx
 else if command --search --quiet helix
 	set --export --universal EDITOR helix
 	set --export --universal VISUAL helix
+	alias hx helix
 else if command --search --quiet nvim
 	set --export --universal EDITOR nvim
 	set --export --universal VISUAL nvim

host/laptop/sway/config

@@ -17,4 +17,6 @@ input type:touchpad {
 
 }
 
+gaps inner 0
+
 exec firefox

os/linux/eww/eww.scss

@@ -69,12 +69,12 @@ $rosewater: #f5e0dc;
   padding-right: 10px;
 }
 
-.vol .muted,
+.vol .live,
 .mic .live {
   color: #f38ba8;
 }
 
-.vol .live,
+.vol .muted,
 .mic .muted {
   color: #74c7ec;
 }

os/linux/eww/eww.yuck

@@ -33,7 +33,7 @@
     {" " + round(EWW_CPU["avg"], 0) + "%"}
     {" " + round(EWW_RAM["used_mem_perc"], 0) + "%"}
     {isDesktop == "true" ? "" : " " + brightness + "%"}
-    {isDesktop == "true" ? "" : "󱊣 " + EWW_BATTERY["BAT0"]["capacity"] + "%"}
+    {isDesktop == "true" ? "" : "󱊣 " + EWW_BATTERY["BAT0"]["capacity"] + "%/" + EWW_BATTERY["BAT1"]["capacity"] + "%"}
   ))
 
 (defwidget music []

os/linux/sway/config

@@ -32,7 +32,7 @@ input type:pointer {
 }
 
 input type:touchpad {
-	dwt enabled
+	dwt disabled
 	tap enabled
 	natural_scroll enabled
 	middle_emulation enabled