From af26991d95b423fcd43858123189c01b8a310a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Fri, 16 Dec 2022 19:16:17 +0100 Subject: [PATCH] i3status-rust: Make it compatible with master/0.30 --- dotfiles.yml | 11 ++- i3/config.j2 | 2 +- .../config.toml} | 49 +++++----- i3/i3status-rust/icons/awesome.toml | 94 +++++++++++++++++++ i3/i3status-rust/themes/native.toml | 0 5 files changed, 128 insertions(+), 28 deletions(-) rename i3/{i3status-rs.toml => i3status-rust/config.toml} (73%) create mode 100644 i3/i3status-rust/icons/awesome.toml create mode 100644 i3/i3status-rust/themes/native.toml diff --git a/dotfiles.yml b/dotfiles.yml index 15bf13d..58281f1 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -9,6 +9,9 @@ empty_directories: - name: .config/gtk-3.0-overrides/bigger-font/ - name: .config/gtk-3.0-overrides/bigger-font/gtk-3.0 - name: .config/qt5ct + - name: .config/i3status-rust + - name: .config/i3status-rust/icons + - name: .config/i3status-rust/themes dotfiles: - from: git/gitconfig to: .gitconfig @@ -27,8 +30,12 @@ dotfiles: - from: i3/i3status.conf to: .i3/i3status.conf template: true - - from: i3/i3status-rs.toml - to: .i3/i3status-rs.toml + - from: i3/i3status-rust/config.toml + to: .config/i3status-rust/config.toml + - from: i3/i3status-rust/themes/native.toml + to: .config/i3status-rust/themes/native.toml + - from: i3/i3status-rust/icons/awesome.toml + to: .config/i3status-rust/icons/awesome.toml - from: i3/scripts to: .i3/scripts - from: tmux/tmux.conf diff --git a/i3/config.j2 b/i3/config.j2 index 87dfcbb..70086ab 100644 --- a/i3/config.j2 +++ b/i3/config.j2 @@ -371,5 +371,5 @@ bar { binding_mode #272822 #e5b567 #272822 } - status_command i3status-rs ~/.i3/i3status-rs.toml + status_command i3status-rs ~/.config/i3status-rust/config.toml } diff --git a/i3/i3status-rs.toml b/i3/i3status-rust/config.toml similarity index 73% rename from i3/i3status-rs.toml rename to i3/i3status-rust/config.toml index 6d55529..8de9add 100644 --- a/i3/i3status-rs.toml +++ b/i3/i3status-rust/config.toml @@ -1,12 +1,12 @@ -icons_format = " {icon} " +icons_format = "{icon}" [icons] -name = "awesome6" +icons = "awesome" [icons.overrides] [theme] -name = "native" +theme = "native" [theme.overrides] warning_fg = "#000000" @@ -17,52 +17,50 @@ critical_bg = "#F92672" [[block]] block = "music" player = "spotify" -buttons = ["prev", "play", "next"] -on_click = "exec $HOME/.i3/scripts/spotify-control toggle" separator = " — " -dynamic_width = true -max_width = 1024 +format = " $icon $combo $prev $play $next " [[block]] block = "sound" driver = "pulseaudio" max_vol = 100 +format = " $icon {$volume.eng(2) |}" [[block]] block = "sound" driver = "pulseaudio" device_kind = "source" +format = " $icon " +reverse_levels = true [[block]] -block = "networkmanager" -primary_only = true -ap_format = "{strength} {ssid}" -device_format = "{icon}{ap}" +block = "net" +format = " $signal_strength $ssid " [[block]] block = "load" -format = "{1m}" -warning = 8 +format = " $icon $1m.eng(4) " +warning = 4 critical = 1000 interval = 1 +[[block]] +block = "battery" +interval = 10 +format = " $percentage $time " +missing_format = "" +if_command = "test -e /sys/class/power_supply/BAT0" + [[block]] block = "toggle" -text = "  " +format = "  $icon " command_on = "$HOME/.i3/scripts/presentation-mode toggle ; pkill -SIGRTMIN+0 i3status-rs" command_off = "$HOME/.i3/scripts/presentation-mode toggle ; pkill -SIGRTMIN+0 i3status-rs" command_state = "[[ $($HOME/.i3/scripts/presentation-mode status) == off ]] || echo active" -[[block]] -block = "battery" -interval = 10 -format = "{percentage} {time}" -hide_missing = true -if_command = "test -e /sys/class/power_supply/BAT0" - [[block]] block = "toggle" -text = "  " +format = "  $icon " command_on = "systemctl --user start redshift" command_off = "systemctl --user stop redshift" command_state = "[[ $(systemctl --user is-active redshift) == active ]] && echo active" @@ -70,7 +68,7 @@ signal = 0 [[block]] block = "toggle" -text = "  " +format = "  $icon " command_on = "systemctl --user start spotify" command_off = "systemctl --user stop spotify" command_state = "[[ $(systemctl --user is-active spotify) == active ]] && echo active" @@ -78,7 +76,8 @@ signal = 0 [[block]] block = "custom" -command = "ping -n -q -w 2 -c 1 8.8.8.8 >/dev/null 2>/dev/null && echo || echo " +json = true +command = "ping -n -q -w 2 -c 1 8.8.8.8 >/dev/null 2>/dev/null && printf '{\"text\":\"\",\"state\":\"Info\"}' || printf '{\"text\":\"\",\"state\":\"Critical\"}'" [[block]] block = "custom" @@ -89,4 +88,4 @@ interval = 1800 block = "time" interval = 1 locale = "de_DE" -format = "[CW %V] %a %d.%m.%Y %H:%M:%S" +format = " [CW %V] %a %d.%m.%Y %H:%M:%S " diff --git a/i3/i3status-rust/icons/awesome.toml b/i3/i3status-rust/icons/awesome.toml new file mode 100644 index 0000000..40f08ea --- /dev/null +++ b/i3/i3status-rust/icons/awesome.toml @@ -0,0 +1,94 @@ +# FontAwesome 4: https://fontawesome.com/v4.7.0/cheatsheet/ +backlight_empty = "\U0001f315" +backlight_full = "\U0001f311" +backlight_1 = "\U0001f314" +backlight_2 = "\U0001f314" +backlight_3 = "\U0001f314" +backlight_4 = "\U0001f314" +backlight_5 = "\U0001f313" +backlight_6 = "\U0001f313" +backlight_7 = "\U0001f313" +backlight_8 = "\U0001f313" +backlight_9 = "\U0001f313" +backlight_10 = "\U0001f312" +backlight_11 = "\U0001f312" +backlight_12 = "\U0001f312" +backlight_13 = "\U0001f312" +bat_charging = "\uf1e6" # fa-plug +bat_discharging = "\uf242" # fa-battery-half +bat_10 = "\uf244" # fa-battery-empty +bat_20 = "\uf243" # fa-battery-quarter +bat_30 = "\uf243" # fa-battery-quarter +bat_40 = "\uf243" # fa-battery-quarter +bat_50 = "\uf242" # fa-battery-half +bat_60 = "\uf242" # fa-battery-half +bat_70 = "\uf241" # fa-battery-three-quarters +bat_80 = "\uf241" # fa-battery-three-quarters +bat_90 = "\uf241" # fa-battery-three-quarters +bat_full = "\uf240" # fa-battery-full +bat_not_available = "\uf244" # fa-battery-empty +bell = "\uf0f3" # fa-bell +bell-slash = "\uf1f7" # fa-bell-slash-o +bluetooth = "\uf294" # fa-bluetooth-b +calendar = "\uf073" # fa-calendar +cogs = "\uf085" # fa-cogs +cpu = "\uf0e4" # fa-dashboard +cpu_boost_off = "\uf204" # fa-toggle-off +cpu_boost_on = "\uf205" # fa-toggle-on +disk_drive = "\uf0a0" # fa-hdd-o +docker = "\uf21a" # fa-ship +github = "\uf09b" # fa-github +gpu = "\uf26c" # fa-television +headphones = "\uf025" # fa-headphones +joystick = "\uf11b" # fa-gamepad +keyboard = "\uf11c" # fa-keyboard-o +mail = "\uf0e0" # fa-envelope +memory_mem = "\uf2db" # fa-microchip +memory_swap = "\uf0a0" # fa-hdd-o +mouse = "\uf245" # fa-mouse-pointer +music = "\uf001" # fa-music +music_next = "\uf061" # fa-arrow-right +music_pause = "\uf04c" # fa-pause +music_play = "\uf04b" # fa-play +music_prev = "\uf060" # fa-arrow-left +net_bridge = "\uf0e8" # fa-sitemap +net_down = "\u2b07" +net_loopback = "LO" +net_modem = "\uf095" # fa-phone +net_up = "\u2b06" +net_vpn = "\uf023" # fa-lock +net_wired = "\uf0ac" # fa-globe +net_wireless = "\uf1eb" # fa-wifi +notification = "\uf0a2" # fa-bell-o +phone = "\uf10b" # fa-mobile +phone_disconnected = "\U0001f4f5" # https://unicode-table.com/en/1F4F5/ +ping = "\u21ba" +pomodoro = "\U0001f345" +pomodoro_break = "\uf0f4" # fa-coffee +pomodoro_paused = "\uf04c" # fa-pause +pomodoro_started = "\uf04b" # fa-play +pomodoro_stopped = "\uf04d" # fa-stop +resolution = "\uf096" # fa-square-o +tasks = "\uf0ae" # fa-tasks +thermometer = "\uf2c8" # fa-thermometer-3 +time = "\uf017" # fa-clock-o +toggle_off = "\uf204" # fa-toggle-off +toggle_on = "\uf205" # fa-toggle-on +unknown = "\uf128" # fa-question +update = "\uf062" # fa-arrow-up +uptime = "\uf017" # fa-clock-o +volume_empty = "\uf026" # fa-volume-off +volume_full = "\uf028" # fa-volume-up +volume_half = "\uf027" # fa-volume-down +volume_muted = "\uf026 \uf00d" +microphone_empty = "\uf130" # fa-microphone +microphone_full = "\uf130" # fa-microphone +microphone_half = "\uf130" # fa-microphone +microphone_muted = "\uf131" # fa-microphone-slash +weather_clouds = "\uf0c2" # fa-cloud +weather_default = "\uf0c2" # fa-cloud +weather_rain = "\uf043" # fa-tint +weather_snow = "\uf2dc" # fa-snowflake-o +weather_sun = "\uf185" # fa-sun-o +weather_thunder = "\uf0e7" # fa-bolt +xrandr = "\uf26c" # fa-television diff --git a/i3/i3status-rust/themes/native.toml b/i3/i3status-rust/themes/native.toml new file mode 100644 index 0000000..e69de29