From 9514df0df33e536825f2aa56491b8f885b5a5450 Mon Sep 17 00:00:00 2001
From: Daniel Napora <napcok@gmail.com>
Date: Tue, 19 Jul 2022 13:55:03 +0200
Subject: [PATCH] remove conky-sessionfiles

---
 common/wrappers/nitrogen                               | 10 ++++------
 lang/en/.config/blob/ArcDark/conky/conky-sessionfile   |  4 ----
 lang/en/.config/blob/Bunsen/conky/conky-sessionfile    |  5 -----
 .../blob/CyberPunk_Neon/conky/conky-sessionfile        |  4 ----
 lang/en/.config/blob/Dracula/conky/conky-sessionfile   |  5 -----
 .../.config/blob/Gruvbox-Mabox/conky/conky-sessionfile |  3 ---
 .../blob/Mabox-superdesk/conky/conky-sessionfile       |  4 ----
 lang/en/.config/blob/Nordic/conky/conky-sessionfile    |  3 ---
 lang/es/.config/blob/ArcDark/conky/conky-sessionfile   |  4 ----
 lang/es/.config/blob/Bunsen/conky/conky-sessionfile    |  5 -----
 .../blob/CyberPunk_Neon/conky/conky-sessionfile        |  5 -----
 lang/es/.config/blob/Dracula/conky/conky-sessionfile   |  5 -----
 .../.config/blob/Gruvbox-Mabox/conky/conky-sessionfile |  4 ----
 .../blob/Mabox-superdesk/conky/conky-sessionfile       |  3 ---
 lang/es/.config/blob/Nordic/conky/conky-sessionfile    |  3 ---
 lang/pl/.config/blob/ArcDark/conky/conky-sessionfile   |  4 ----
 lang/pl/.config/blob/Bunsen/conky/conky-sessionfile    |  5 -----
 .../blob/CyberPunk_Neon/conky/conky-sessionfile        |  5 -----
 lang/pl/.config/blob/Dracula/conky/conky-sessionfile   |  5 -----
 .../.config/blob/Gruvbox-Mabox/conky/conky-sessionfile |  3 ---
 .../blob/Mabox-superdesk/conky/conky-sessionfile       |  4 ----
 lang/pl/.config/blob/Nordic/conky/conky-sessionfile    |  3 ---
 22 files changed, 4 insertions(+), 92 deletions(-)
 delete mode 100644 lang/en/.config/blob/ArcDark/conky/conky-sessionfile
 delete mode 100644 lang/en/.config/blob/Bunsen/conky/conky-sessionfile
 delete mode 100644 lang/en/.config/blob/CyberPunk_Neon/conky/conky-sessionfile
 delete mode 100644 lang/en/.config/blob/Dracula/conky/conky-sessionfile
 delete mode 100644 lang/en/.config/blob/Gruvbox-Mabox/conky/conky-sessionfile
 delete mode 100644 lang/en/.config/blob/Mabox-superdesk/conky/conky-sessionfile
 delete mode 100644 lang/en/.config/blob/Nordic/conky/conky-sessionfile
 delete mode 100644 lang/es/.config/blob/ArcDark/conky/conky-sessionfile
 delete mode 100644 lang/es/.config/blob/Bunsen/conky/conky-sessionfile
 delete mode 100644 lang/es/.config/blob/CyberPunk_Neon/conky/conky-sessionfile
 delete mode 100644 lang/es/.config/blob/Dracula/conky/conky-sessionfile
 delete mode 100644 lang/es/.config/blob/Gruvbox-Mabox/conky/conky-sessionfile
 delete mode 100644 lang/es/.config/blob/Mabox-superdesk/conky/conky-sessionfile
 delete mode 100644 lang/es/.config/blob/Nordic/conky/conky-sessionfile
 delete mode 100644 lang/pl/.config/blob/ArcDark/conky/conky-sessionfile
 delete mode 100644 lang/pl/.config/blob/Bunsen/conky/conky-sessionfile
 delete mode 100644 lang/pl/.config/blob/CyberPunk_Neon/conky/conky-sessionfile
 delete mode 100644 lang/pl/.config/blob/Dracula/conky/conky-sessionfile
 delete mode 100644 lang/pl/.config/blob/Gruvbox-Mabox/conky/conky-sessionfile
 delete mode 100644 lang/pl/.config/blob/Mabox-superdesk/conky/conky-sessionfile
 delete mode 100644 lang/pl/.config/blob/Nordic/conky/conky-sessionfile

diff --git a/common/wrappers/nitrogen b/common/wrappers/nitrogen
index 4565af8..b097505 100755
--- a/common/wrappers/nitrogen
+++ b/common/wrappers/nitrogen
@@ -45,10 +45,10 @@ fi
 if command -v w2theme &> /dev/null
 then
 ## Generate Conkys, Menu themes from wallpaper colors
-source ~/.config/mabox/mabox.conf
+source ~/.config/colorizer/colorizer.conf
 
     # if enabled
-    if [[ "$wall2themes" == "true" ]];then
+    if [[ "$wall2themes" == "yes" ]];then
     #if not invoked by mb-obthemes
     #notify-send.sh "Theme generation" "Enabled"
     LOCKED=${wall2themeslock:-false}
@@ -74,14 +74,12 @@ source ~/.config/mabox/mabox.conf
         mapfile -t w < "$WALLPALDIR/$WALLPAPER.clr"
         case "$wall2themes_accent" in
         dark) 
-        #TODO: SWITCH TO MBCOLORS theme
         obtctl theme MBcolors
-        obtctl clractivebg ${w[1]}
+        w2theme accent ${w[1]}
         ;;
         light)
-        #TODO: SWITCH TO MBCOLORS theme
         obtctl theme MBcolors
-        obtctl clractivebg ${w[-1]}
+        w2theme accent ${w[-1]}
         ;;
         *)
         :
diff --git a/lang/en/.config/blob/ArcDark/conky/conky-sessionfile b/lang/en/.config/blob/ArcDark/conky/conky-sessionfile
deleted file mode 100644
index af3d728..0000000
--- a/lang/en/.config/blob/ArcDark/conky/conky-sessionfile
+++ /dev/null
@@ -1,4 +0,0 @@
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/quoter_mbcolor.conkyrc & sleep .5
diff --git a/lang/en/.config/blob/Bunsen/conky/conky-sessionfile b/lang/en/.config/blob/Bunsen/conky/conky-sessionfile
deleted file mode 100644
index 6fb5baf..0000000
--- a/lang/en/.config/blob/Bunsen/conky/conky-sessionfile
+++ /dev/null
@@ -1,5 +0,0 @@
-conky -c /home/dn/.config/conky/logo_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/clock_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_graph_mbcolor.conkyrc & sleep .5
diff --git a/lang/en/.config/blob/CyberPunk_Neon/conky/conky-sessionfile b/lang/en/.config/blob/CyberPunk_Neon/conky/conky-sessionfile
deleted file mode 100644
index af3d728..0000000
--- a/lang/en/.config/blob/CyberPunk_Neon/conky/conky-sessionfile
+++ /dev/null
@@ -1,4 +0,0 @@
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/quoter_mbcolor.conkyrc & sleep .5
diff --git a/lang/en/.config/blob/Dracula/conky/conky-sessionfile b/lang/en/.config/blob/Dracula/conky/conky-sessionfile
deleted file mode 100644
index 4f03542..0000000
--- a/lang/en/.config/blob/Dracula/conky/conky-sessionfile
+++ /dev/null
@@ -1,5 +0,0 @@
-conky -c ~/.config/conky/logo_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/mabox_tools_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/shortcuts_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/sysinfo_mbcolor.conkyrc & sleep 1s
-
diff --git a/lang/en/.config/blob/Gruvbox-Mabox/conky/conky-sessionfile b/lang/en/.config/blob/Gruvbox-Mabox/conky/conky-sessionfile
deleted file mode 100644
index 45c1a5d..0000000
--- a/lang/en/.config/blob/Gruvbox-Mabox/conky/conky-sessionfile
+++ /dev/null
@@ -1,3 +0,0 @@
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_mbcolor.conkyrc & sleep .5
diff --git a/lang/en/.config/blob/Mabox-superdesk/conky/conky-sessionfile b/lang/en/.config/blob/Mabox-superdesk/conky/conky-sessionfile
deleted file mode 100644
index af3d728..0000000
--- a/lang/en/.config/blob/Mabox-superdesk/conky/conky-sessionfile
+++ /dev/null
@@ -1,4 +0,0 @@
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/quoter_mbcolor.conkyrc & sleep .5
diff --git a/lang/en/.config/blob/Nordic/conky/conky-sessionfile b/lang/en/.config/blob/Nordic/conky/conky-sessionfile
deleted file mode 100644
index 45c1a5d..0000000
--- a/lang/en/.config/blob/Nordic/conky/conky-sessionfile
+++ /dev/null
@@ -1,3 +0,0 @@
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_mbcolor.conkyrc & sleep .5
diff --git a/lang/es/.config/blob/ArcDark/conky/conky-sessionfile b/lang/es/.config/blob/ArcDark/conky/conky-sessionfile
deleted file mode 100644
index af3d728..0000000
--- a/lang/es/.config/blob/ArcDark/conky/conky-sessionfile
+++ /dev/null
@@ -1,4 +0,0 @@
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/quoter_mbcolor.conkyrc & sleep .5
diff --git a/lang/es/.config/blob/Bunsen/conky/conky-sessionfile b/lang/es/.config/blob/Bunsen/conky/conky-sessionfile
deleted file mode 100644
index 6fb5baf..0000000
--- a/lang/es/.config/blob/Bunsen/conky/conky-sessionfile
+++ /dev/null
@@ -1,5 +0,0 @@
-conky -c /home/dn/.config/conky/logo_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/clock_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_graph_mbcolor.conkyrc & sleep .5
diff --git a/lang/es/.config/blob/CyberPunk_Neon/conky/conky-sessionfile b/lang/es/.config/blob/CyberPunk_Neon/conky/conky-sessionfile
deleted file mode 100644
index 4f03542..0000000
--- a/lang/es/.config/blob/CyberPunk_Neon/conky/conky-sessionfile
+++ /dev/null
@@ -1,5 +0,0 @@
-conky -c ~/.config/conky/logo_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/mabox_tools_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/shortcuts_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/sysinfo_mbcolor.conkyrc & sleep 1s
-
diff --git a/lang/es/.config/blob/Dracula/conky/conky-sessionfile b/lang/es/.config/blob/Dracula/conky/conky-sessionfile
deleted file mode 100644
index 4f03542..0000000
--- a/lang/es/.config/blob/Dracula/conky/conky-sessionfile
+++ /dev/null
@@ -1,5 +0,0 @@
-conky -c ~/.config/conky/logo_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/mabox_tools_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/shortcuts_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/sysinfo_mbcolor.conkyrc & sleep 1s
-
diff --git a/lang/es/.config/blob/Gruvbox-Mabox/conky/conky-sessionfile b/lang/es/.config/blob/Gruvbox-Mabox/conky/conky-sessionfile
deleted file mode 100644
index 6c86c84..0000000
--- a/lang/es/.config/blob/Gruvbox-Mabox/conky/conky-sessionfile
+++ /dev/null
@@ -1,4 +0,0 @@
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/logo_mbcolor.conkyrc & sleep .5
diff --git a/lang/es/.config/blob/Mabox-superdesk/conky/conky-sessionfile b/lang/es/.config/blob/Mabox-superdesk/conky/conky-sessionfile
deleted file mode 100644
index e28ac65..0000000
--- a/lang/es/.config/blob/Mabox-superdesk/conky/conky-sessionfile
+++ /dev/null
@@ -1,3 +0,0 @@
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/quoter_mbcolor.conkyrc & sleep .5
diff --git a/lang/es/.config/blob/Nordic/conky/conky-sessionfile b/lang/es/.config/blob/Nordic/conky/conky-sessionfile
deleted file mode 100644
index dbdc8b9..0000000
--- a/lang/es/.config/blob/Nordic/conky/conky-sessionfile
+++ /dev/null
@@ -1,3 +0,0 @@
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_graph_mbcolor.conkyrc & sleep .5
diff --git a/lang/pl/.config/blob/ArcDark/conky/conky-sessionfile b/lang/pl/.config/blob/ArcDark/conky/conky-sessionfile
deleted file mode 100644
index af3d728..0000000
--- a/lang/pl/.config/blob/ArcDark/conky/conky-sessionfile
+++ /dev/null
@@ -1,4 +0,0 @@
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/quoter_mbcolor.conkyrc & sleep .5
diff --git a/lang/pl/.config/blob/Bunsen/conky/conky-sessionfile b/lang/pl/.config/blob/Bunsen/conky/conky-sessionfile
deleted file mode 100644
index 6fb5baf..0000000
--- a/lang/pl/.config/blob/Bunsen/conky/conky-sessionfile
+++ /dev/null
@@ -1,5 +0,0 @@
-conky -c /home/dn/.config/conky/logo_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/clock_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_graph_mbcolor.conkyrc & sleep .5
diff --git a/lang/pl/.config/blob/CyberPunk_Neon/conky/conky-sessionfile b/lang/pl/.config/blob/CyberPunk_Neon/conky/conky-sessionfile
deleted file mode 100644
index 4f03542..0000000
--- a/lang/pl/.config/blob/CyberPunk_Neon/conky/conky-sessionfile
+++ /dev/null
@@ -1,5 +0,0 @@
-conky -c ~/.config/conky/logo_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/mabox_tools_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/shortcuts_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/sysinfo_mbcolor.conkyrc & sleep 1s
-
diff --git a/lang/pl/.config/blob/Dracula/conky/conky-sessionfile b/lang/pl/.config/blob/Dracula/conky/conky-sessionfile
deleted file mode 100644
index 4f03542..0000000
--- a/lang/pl/.config/blob/Dracula/conky/conky-sessionfile
+++ /dev/null
@@ -1,5 +0,0 @@
-conky -c ~/.config/conky/logo_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/mabox_tools_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/shortcuts_mbcolor.conkyrc & sleep 1s
- conky -c ~/.config/conky/sysinfo_mbcolor.conkyrc & sleep 1s
-
diff --git a/lang/pl/.config/blob/Gruvbox-Mabox/conky/conky-sessionfile b/lang/pl/.config/blob/Gruvbox-Mabox/conky/conky-sessionfile
deleted file mode 100644
index 45c1a5d..0000000
--- a/lang/pl/.config/blob/Gruvbox-Mabox/conky/conky-sessionfile
+++ /dev/null
@@ -1,3 +0,0 @@
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_mbcolor.conkyrc & sleep .5
diff --git a/lang/pl/.config/blob/Mabox-superdesk/conky/conky-sessionfile b/lang/pl/.config/blob/Mabox-superdesk/conky/conky-sessionfile
deleted file mode 100644
index af3d728..0000000
--- a/lang/pl/.config/blob/Mabox-superdesk/conky/conky-sessionfile
+++ /dev/null
@@ -1,4 +0,0 @@
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/quoter_mbcolor.conkyrc & sleep .5
diff --git a/lang/pl/.config/blob/Nordic/conky/conky-sessionfile b/lang/pl/.config/blob/Nordic/conky/conky-sessionfile
deleted file mode 100644
index 45c1a5d..0000000
--- a/lang/pl/.config/blob/Nordic/conky/conky-sessionfile
+++ /dev/null
@@ -1,3 +0,0 @@
-conky -c /home/dn/.config/conky/mabox_tools_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/shortcuts_mbcolor.conkyrc & sleep .5
-conky -c /home/dn/.config/conky/sysinfo_mbcolor.conkyrc & sleep .5