3 files changed, 36 insertions(+), 14 deletions(-)

M .config/i3status/config
M .config/sway/xdpw
M .xinitrc

@@ 12,19 12,25 @@ general {
 	interval = 5
 }
 
+order += "cpu_temperature 0"
+order += "ethernet _first_"
+order += "wireless _first_"
 order += "ipv6"
 order += "disk /"
-order += "wireless _first_"
-#order += "ethernet _first_"
-order += "volume master"
 order += "memory"
 order += "load"
+order += "volume master"
 #order += "tztime local"
 order += "tztime holder__jdate"
 order += "tztime tehran"
 order += "tztime vancouver"
 order += "battery 0"
 
+cpu_temperature 0 {
+	format = "CPU T: %degrees °C"
+	path = "/sys/class/hwmon/hwmon4/temp1_input"
+}
+
 wireless _first_ {
 	format_up = "W: (%quality at %essid) %ip"
 	format_down = "W: down"


@@ 38,7 44,7 @@ ethernet _first_ {
 
 battery 0 {
         format = "%status %percentage %remaining %emptytime"
-        format_down = "No battery"
+        format_down = ""
         status_chr = "⚡ CHR"
         status_bat = "🔋 BAT"
         status_unk = "? UNK"


@@ 47,16 53,26 @@ battery 0 {
         path = "/sys/class/power_supply/BAT%d/uevent"
 }
 
-tztime local {
-	format = "%Y-%m-%d %H:%M:%S"
+disk "/" {
+	format = "/: %avail"
 }
 
-load {
-	format = "%1min"
+memory {
+        format = "%used"
+        threshold_degraded = "10%"
+        format_degraded = "MEMORY: %free"
 }
 
-disk "/" {
-	format = "%avail"
+volume master {
+	format = "♪: %volume"
+	format_muted = "♪: muted (%volume)"
+	device = "default"
+	mixer = "Master"
+	mixer_idx = 0
+}
+
+tztime local {
+	format = "%Y-%m-%d %H:%M:%S"
 }
 
 tztime holder__jdate {

@@ 1,6 1,7 @@
 #!/bin/sh
 # Import the WAYLAND_DISPLAY env var from sway into the systemd user session.
-dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
+dbus-update-activation-environment --systemd \
+	XDG_SESSION_TYPE=wayland DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
 
 # Stop any services that are running, so that they receive the new env var when they restart.
 systemctl --user stop pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr

@@ 1,3 1,8 @@
-#!/bin/sh
-export DESKTOP_SESSION=plasma
-exec startplasma-x11
+#!/bin/bash
+case $(tty | cut -b9-) in
+	(2) exec xfce4-session;;
+	(4) exec i3;;
+	(5) exec openbox-session;;
+	(6) export DESKTOP_SESSION=plasma; exec startplasma-x11;;
+	(7) exec openbox-session;;
+esac