up

4 files changed, 76 insertions, 24 deletions

diff --git a/.config/conky/conkyrss b/.config/conky/conkyrss
index 8adfb40..c9e0d36 100644
--- a/.config/conky/conkyrss
+++ b/.config/conky/conkyrss
@@ -47,12 +47,5 @@ conky.config = {
 }
 
 conky.text = [[
-${color #ebdbb2}${font1}HACKER NEWS ${hr}${font2}${color #928374}
-${rss https://hnrss.org/frontpage 900 item_titles 10}
-
-${color #ebdbb2}${font1}BBC NEWS WORLD ${hr}${font2}${color #928374}
-${rss https://feeds.bbci.co.uk/news/rss.xml 900 item_titles 10}
-
-${color #ebdbb2}${font1}BBC NEWS EUROPE ${hr}${font2}${color #928374}
-${rss http://feeds.bbci.co.uk/news/world/europe/rss.xml 900 item_titles 10}
+	${execp ~/.local/bin/conky/rss.sh}
 ]]
diff --git a/.config/openbox/autostart b/.config/openbox/autostart
index fc6bee2..f80bc51 100755
--- a/.config/openbox/autostart
+++ b/.config/openbox/autostart
@@ -18,27 +18,25 @@
 
 # select OS
 
-os="$(uname)"
-
-case $os in
-	"Linux") grep "Artix" /etc/issue >/dev/null 2>&1 && os=1 || os=2 ;;
-	"FreeBSD") os=3 ;;
-esac
+os=$(cat /tmp/os)
 case $os in
 	1)
 		icon=" "
 		mpd="mpd"
 		xscr="xscreensaver --no-splash"
+		sleep="sleep 0.5"
 		;;
 	2)
 		icon=" "
 		mpd="mpd"
 		xscr="xscreensaver"
+		sleep="sleep 0.5"
 		;;
 	3)
 		icon=" "
 		mpd="musicpd"
 		xscr="xscreensaver --no-splash"
+		sleep="gsleep 0.5"
 		;;
 esac
 
@@ -47,7 +45,8 @@ startif() {
 }
 
 conkies() {
-	startif conky -d -c "$HOME"/.config/conky/conkyrc
+	conky -d -c "$HOME"/.config/conky/conkyrc
+	$sleep
 	conky -d -c "$HOME"/.config/conky/conkyrss
 }
 
@@ -66,9 +65,11 @@ xset -dpms
 # else
 # 	"$HOME"/.local/bin/dscr
 # fi
-conkies
 startif tint2
+$sleep
 startif plank
+$sleep
+conkies &
 cd "$HOME"
 xrdb "$HOME"/.config/x11/xresources
 notify-send -u normal 'Welcome' "$icon Welcome back, partner!"
diff --git a/.config/tint2/tint2rc b/.config/tint2/tint2rc
index 88cc488..9452d02 100755
--- a/.config/tint2/tint2rc
+++ b/.config/tint2/tint2rc
@@ -1,11 +1,16 @@
-#---- Generated by tint2conf 3ec6 ----
+#---- Generated by tint2conf 923d ----
 # See https://gitlab.com/o9000/tint2/wikis/Configure for 
 # full documentation of the configuration options.
 #-------------------------------------
+# Gradients
+#-------------------------------------
 # Backgrounds
 # Background 1: 
 rounded = 0
 border_width = 1
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
 background_color = #eeeeee 0
 border_color = #bbbbbb 10
 background_color_hover = #eeeeee 0
@@ -13,9 +18,12 @@ border_color_hover = #bbbbbb 10
 background_color_pressed = #eeeeee 0
 border_color_pressed = #bbbbbb 10
 
-# Background 2: Active taskbar
+# Background 2: Barre des tâches active
 rounded = 2
 border_width = 0
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
 background_color = #000000 0
 border_color = #cccccc 44
 background_color_hover = #eeeeee 22
@@ -23,9 +31,12 @@ border_color_hover = #eaeaea 44
 background_color_pressed = #dddddd 4
 border_color_pressed = #eaeaea 44
 
-# Background 3: Active task
+# Background 3: Tâche active
 rounded = 2
 border_width = 1
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
 background_color = #dddddd 4
 border_color = #dbdbdb 100
 background_color_hover = #eeeeee 22
@@ -33,9 +44,12 @@ border_color_hover = #999999 100
 background_color_pressed = #dddddd 4
 border_color_pressed = #999999 100
 
-# Background 4: Urgent task
+# Background 4: Tâche urgente
 rounded = 2
 border_width = 1
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
 background_color = #ffa348 100
 border_color = #aa7733 100
 background_color_hover = #ffa348 100
@@ -43,9 +57,12 @@ border_color_hover = #aa7733 100
 background_color_pressed = #ffa348 100
 border_color_pressed = #aa7733 100
 
-# Background 5: Tooltip
+# Background 5: Infobulle
 rounded = 2
 border_width = 1
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
 background_color = #ffffaa 100
 border_color = #999999 100
 background_color_hover = #ffffaa 100
@@ -53,9 +70,12 @@ border_color_hover = #999999 100
 background_color_pressed = #ffffaa 100
 border_color_pressed = #999999 100
 
-# Background 6: Inactive desktop name
+# Background 6: Nom du bureau inactif
 rounded = 2
 border_width = 1
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
 background_color = #eeeeee 4
 border_color = #cccccc 30
 background_color_hover = #eeeeee 22
@@ -66,6 +86,9 @@ border_color_pressed = #999999 30
 # Background 7: 
 rounded = 2
 border_width = 1
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
 background_color = #dddddd 3
 border_color = #999999 100
 background_color_hover = #dddddd 3
@@ -76,6 +99,9 @@ border_color_pressed = #999999 100
 # Background 8: Panel
 rounded = 0
 border_width = 1
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
 background_color = #eeeeee 4
 border_color = #cccccc 44
 background_color_hover = #eeeeee 22
@@ -83,9 +109,12 @@ border_color_hover = #eaeaea 44
 background_color_pressed = #dddddd 4
 border_color_pressed = #eaeaea 44
 
-# Background 9: Active desktop name, Default task, Iconified task
+# Background 9: Nom du bureau actif, Tâche icônifiée, Tâche par défaut
 rounded = 2
 border_width = 1
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
 background_color = #eeeeee 4
 border_color = #cccccc 44
 background_color_hover = #eeeeee 22
@@ -102,10 +131,11 @@ panel_padding = 4 2 4
 panel_background_id = 8
 wm_menu = 1
 panel_dock = 0
+panel_pivot_struts = 0
 panel_position = top center horizontal
 panel_layer = bottom
 panel_monitor = all
-primary_monitor_first = 0
+panel_shrink = 0
 autohide = 0
 autohide_show_timeout = 0
 autohide_hide_timeout = 0.5
@@ -117,16 +147,20 @@ mouse_effects = 1
 font_shadow = 0
 mouse_hover_icon_asb = 100 0 10
 mouse_pressed_icon_asb = 100 0 0
+scale_relative_to_dpi = 0
+scale_relative_to_screen_height = 0
 
 #-------------------------------------
 # Taskbar
 taskbar_mode = single_desktop
+taskbar_hide_if_empty = 0
 taskbar_padding = 1 0 2
 taskbar_background_id = 0
 taskbar_active_background_id = 2
 taskbar_name = 1
 taskbar_hide_inactive_tasks = 0
 taskbar_hide_different_monitor = 1
+taskbar_hide_different_desktop = 0
 taskbar_always_show_all_desktop_tasks = 0
 taskbar_name_padding = 6 3
 taskbar_name_background_id = 6
@@ -148,6 +182,8 @@ task_maximum_size = 180 40
 task_padding = 4 4 4
 task_font = Sans 9
 task_tooltip = 1
+task_thumbnail = 0
+task_thumbnail_size = 210
 task_font_color = #eeeeee 100
 task_active_font_color = #ffffff 100
 task_iconified_font_color = #ffffff 60
@@ -172,6 +208,7 @@ systray_sort = ascending
 systray_icon_size = 22
 systray_icon_asb = 100 0 0
 systray_monitor = 1
+systray_name_filter = 
 
 #-------------------------------------
 # Launcher
@@ -214,9 +251,12 @@ clock_dwheel_command =
 battery_tooltip = 1
 battery_low_status = 10
 battery_low_cmd = notify-send -u critical 'battery' "You're low, partner!"
+battery_full_cmd = notify-send -u low 'battery' "You're full, partner!"
 bat1_font = Sans Bold 10
 bat2_font = sans 6
 battery_font_color = #ffffff 100
+bat1_format = 
+bat2_format = 
 battery_padding = 1 0
 battery_background_id = 0
 battery_hide = 101
diff --git a/.local/bin/conky/rss.sh b/.local/bin/conky/rss.sh
new file mode 100755
index 0000000..1495035
--- /dev/null
+++ b/.local/bin/conky/rss.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+os=$(cat /tmp/os)
+
+case $os in
+	1) ping -c1 -w1 1.1.1.1 >/dev/null 2>&1 || exit ;;
+	2) ping -c1 -w1 1.1.1.1 >/dev/null 2>&1 || exit ;;
+	3) ping -c1 -t1 1.1.1.1 >/dev/null 2>&1 || exit ;;
+esac
+
+echo '${color #ebdbb2}${font1}HACKER NEWS ${hr}${font2}${color #928374}
+${rss https://hnrss.org/frontpage 900 item_titles 10}
+
+${color #ebdbb2}${font1}BBC NEWS WORLD ${hr}${font2}${color #928374}
+${rss https://feeds.bbci.co.uk/news/rss.xml 900 item_titles 10}
+
+${color #ebdbb2}${font1}BBC NEWS EUROPE ${hr}${font2}${color #928374}
+${rss http://feeds.bbci.co.uk/news/world/europe/rss.xml 900 item_titles 10}'