2 files changed, 69 insertions, 8 deletions

diff --git a/.config/i3status/config b/.config/i3status/config
index 2d5b443..0980fc6 100644
--- a/.config/i3status/config
+++ b/.config/i3status/config
@@ -5,24 +5,37 @@
 # The following line should contain a sharp s:
 # ß
 # If the above line is not correctly displayed, fix your editor first!
+# Some icon chars can be found at https://emojipedia.org/objects/
 
 general {
         colors = true
         interval = 5
 }
 
+order += "read_file hostname"
 #order += "ipv6"
 order += "wireless _first_"
 #order += "ethernet _first_"
 order += "battery all"
 order += "disk /"
-order += "load"
+#order += "disk /boot"
+order += "cpu_usage"
+#order += "load"
 order += "memory"
+order += "volume master"
+order += "cpu_temperature 0"
 order += "tztime local"
 
+read_file hostname {
+	format = "%content"
+	path = "/etc/hostname"
+}
+
 wireless _first_ {
-        format_up = "W: (%quality at %essid) %ip"
-        format_down = "W: down"
+        #format_up = "🌐 %essid %quality"
+        #format_up = "📶 %essid %quality"
+        format_up = "📡 %essid %signal %bitrate"
+        format_down = "📡 down"
 }
 
 ethernet _first_ {
@@ -30,24 +43,71 @@ ethernet _first_ {
         format_down = "E: down"
 }
 
+#
 battery all {
-        format = "%status %percentage %remaining"
+	last_full_capacity = true
+	integer_battery_capacity = true
+#	format = "%status %percentage %remaining"
+	format = "%status %percentage %remaining %consumption"
+	status_chr = "⚡🔋"
+        status_bat = "🔋"
+        status_unk = "? UNK"
+        status_full = "⚡🔋"
+	threshold_type = "percentage"
+	low_threshold = 10
 }
 
+#battery 0 {
+#	format = "%status %percentage %remaining %emptytime"
+#	format_down = "No battery"
+#	status_chr = "CHR"
+#	status_bat = "BAT"
+#	status_unk = "UNK"
+#	status_full = "FULL"
+#	path = "/sys/class/power_supply/BAT%d/uevent"
+#	low_threshold = 10
+#}
+
 disk "/" {
-        format = "%avail"
+        #format = "📀 %avail"
+        #format = "💽 %avail"
+        format = "/ %avail av."
+}
+
+disk "/boot" {
+        format = "/boot %avail"
+}
+
+cpu_usage {
+	format = "CPU %usage"
 }
 
 load {
-        format = "%1min"
+        format = "Load: %1min"
 }
 
 memory {
-        format = "%used | %available"
+        format = "Mem %available av."
         threshold_degraded = "1G"
         format_degraded = "MEMORY < %available"
 }
 
+cpu_temperature 0 {
+	format = "🌡%degrees °C"
+	#path = "/sys/class/hwmon/hwmon0/temp1_input"
+	#path = "/sys/class/hwmon/hwmon6/temp1_input"
+	#path = "/sys/class/hwmon/hwmon7/temp1_input"
+	#path = "/sys/class/hwmon/hwmon8/temp1_input"
+}
+
 tztime local {
-        format = "%Y-%m-%d %H:%M:%S"
+        #format = "%Y-%m-%d %H:%M:%S"
+        format = "%a %d %b %H:%M:%S"
+        #format = "📅 %a %d %b ⌚ %H:%M:%S"
+}
+
+volume master {
+        format = "🎜 %volume"
+        format_muted = "🎜 mute (%volume)"
+        device = "pulse:alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp__sink"
 }
diff --git a/.config/sway/config b/.config/sway/config
index 4f6c945..f924434 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -69,6 +69,7 @@ output * bg #103040 solid_color
 
 input type:keyboard {
 	xkb_layout "fr"
+	xkb_options caps:escape
 }
 
 input type:touchpad {