Merge branch 'master' into machine/odin

i3/.config/i3/config

@@ -201,7 +201,7 @@ bar {
 }
 
 # Compton for smooth transistions
-exec_always --no-startup-id compton -f -D 4 --backend glx --vsync opengl
+exec_always --no-startup-id picom -f -D 4 --backend glx --vsync
 
 # Multimedia Keybindings
 set $mode_multimedia Volume: [=,+]up [-]down [m]ute output [r]mute input

i3/.config/i3status/config

@@ -14,32 +14,18 @@ general {
 # order += "ipv6"
 order += "disk /"
 order += "disk /home"
-order += "wireless _first_"
 order += "ethernet _first_"
-order += "battery all"
 order += "cpu_temperature 0"
 order += "volume master"
 order += "load"
 order += "tztime local"
 
-wireless _first_ {
-        format_up = "(%quality at %essid %bitrate) %ip"
-        format_down = "down"
-}
-
 ethernet _first_ {
         # if you use %speed, i3status requires root privileges
         format_up = "%ip (%speed)"
         format_down = "down"
 }
 
-battery all {
-        format = "%status %percentage %remaining"
-	status_full = "FULL"
-	status_bat = "BAT"
-	status_chr = "CHR"
-}
-
 tztime local {
 #        format = "%Y-%m-%d %H:%M:%S"
         format = "%a, %d %b %Y %T %z"
@@ -51,7 +37,7 @@ load {
 
 cpu_temperature 0 {
 	format = "%degrees °C"
-	path = "/sys/devices/platform/coretemp.0/hwmon/hwmon3/temp1_input"
+	path = "/sys/class/hwmon/hwmon3/temp1_input"
 }
 
 disk "/" {