From 049f75ca5ca324fd2e749fd8b6ad6d2cf54188f5 Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Mon, 11 Apr 2022 18:21:32 +0200
Subject: [PATCH] Move i3-status-rs config and update

---
 .config/i3/config                                 |  4 ++--
 .../status-rs.toml => i3status-rust/config.toml}  | 15 ++++++++-------
 .../secondary.toml}                               |  8 ++++----
 .gitignore.d/i3                                   | 11 +++--------
 4 files changed, 17 insertions(+), 21 deletions(-)
 rename .config/{i3/status-rs.toml => i3status-rust/config.toml} (80%)
 rename .config/{i3/status-rs_sec.toml => i3status-rust/secondary.toml} (83%)

diff --git a/.config/i3/config b/.config/i3/config
index 24af527..b393390 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -206,7 +206,7 @@ set $screen1 "HDMI-2"
 # Start i3bar to display a workspace bar (plus the system information
 # i3status-rust finds out, if available)
 bar {
-        status_command i3status-rs ~/.config/i3/status-rs.toml
+        status_command i3status-rs
         font pango:DejaVu Sans Mono, forkawesome 8
         position top
         tray_output primary
@@ -223,7 +223,7 @@ bar {
         }
 }
 bar {
-        status_command i3status-rs ~/.config/i3/status-rs_sec.toml
+        status_command i3status-rs ~/.config/i3status-rust/secondary.toml
         font pango:DejaVu Sans Mono, forkawesome 8
         position top
         tray_output primary
diff --git a/.config/i3/status-rs.toml b/.config/i3status-rust/config.toml
similarity index 80%
rename from .config/i3/status-rs.toml
rename to .config/i3status-rust/config.toml
index 9379fe2..a722b09 100644
--- a/.config/i3/status-rs.toml
+++ b/.config/i3status-rust/config.toml
@@ -13,12 +13,12 @@ separator_bg = "#222222"
 [[block]]
 block = "maildir"
 interval = 15
-inboxes = ["/home/finga/mail/onders.org/Inbox"]
+inboxes = ["/home/finga/mail/onders.org/Inbox", "/home/finga/mail/chaostreff.at/Inbox"]
 display_type = "new"
 
 [[block]]
 block = "weather"
-format = "{weather} {temp}°, {humidity}%, {wind}m/s {direction}"
+format = "{weather} {temp}, {humidity}%, {wind}m/s {direction}"
 service = { name = "openweathermap", api_key = "8271cc3c23dbae82eda2123c55c050be", city_id = "2766824", units = "metric" }
 
 [[block]]
@@ -26,9 +26,10 @@ block = "sound"
 
 [[block]]
 block = "music"
-marquee_interval = 0
+marquee_interval = 1
 marquee_speed = 0.3
 max_width = 35
+player = "mpd"
 buttons = ["play"]
 
 [[block]]
@@ -64,24 +65,24 @@ format = "{ip} {graph_down} {speed_down} {graph_up} {speed_up}"
 [[block]]
 block = "memory"
 display_type = "memory"
-format_mem = "{Mup}%"
+format_mem = "{mem_total_used_percents}"
 clickable = false
 
 [[block]]
 block = "memory"
 display_type = "swap"
-format_swap = "{SUp}%"
+format_swap = "{swap_used_percents}"
 clickable = false
 
 [[block]]
 block = "cpu"
 interval = 1
-format = "{barchart} {utilization}% {frequency}GHz"
+format = "{barchart} {utilization} {frequency}"
 
 [[block]]
 block = "temperature"
 collapsed = false
-format = "{min}° min, {max}° max, {average}° avg"
+format = "{min} min, {max} max, {average} avg"
 chip = "*-isa-*"
 
 [[block]]
diff --git a/.config/i3/status-rs_sec.toml b/.config/i3status-rust/secondary.toml
similarity index 83%
rename from .config/i3/status-rs_sec.toml
rename to .config/i3status-rust/secondary.toml
index 90fd033..9c31533 100644
--- a/.config/i3/status-rs_sec.toml
+++ b/.config/i3status-rust/secondary.toml
@@ -19,25 +19,25 @@ block = "uptime"
 [[block]]
 block = "memory"
 display_type = "memory"
-format_mem = "{Mup}%"
+format_mem = "{mem_total_used_percents}"
 clickable = false
 
 [[block]]
 block = "memory"
 display_type = "swap"
-format_swap = "{SUp}%"
+format_swap = "{swap_used_percents}"
 clickable = false
 
 [[block]]
 block = "cpu"
-frequency = true
 interval = 1
+format = "{frequency}"
 
 [[block]]
 block = "temperature"
 collapsed = false
 interval = 10
-format = "{min}° min, {max}° max, {average}° avg"
+format = "{min} min, {max} max, {average} avg"
 chip = "*-isa-*"
 
 [[block]]
diff --git a/.gitignore.d/i3 b/.gitignore.d/i3
index cb6f044..9cae4fa 100644
--- a/.gitignore.d/i3
+++ b/.gitignore.d/i3
@@ -1,12 +1,7 @@
 *
-!/.config
-!/.config/i3
-!/.config/i3/*
-!/.config/i3status
-!/.config/i3status/*
-!/.gitignore.d
+!/.config/i3/config
+!/.config/i3status-rust/config.toml
+!/.config/i3status-rust/secondary.toml
 !/.gitignore.d/i3
-!/.local
-!/.local/bin
 !/.local/bin/fuzzy-i3lock
 !/.local/bin/i3-run