From 77d1762d6932d2b335fca6d9a1400225c44ad585 Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Mon, 5 Aug 2019 11:19:23 +0200
Subject: [PATCH] [lxqt] switch to Matcha theme and overlay cleanup

---
 editions/lxqt                                  |  8 ++++----
 overlays/lxqt/etc/sddm.conf                    |  2 +-
 .../etc/skel/.config/Kvantum/kvantum.kvconfig  |  2 +-
 .../lxqt/etc/skel/.config/gtk-3.0/settings.ini |  2 +-
 .../etc/skel/.config/lximage-qt/settings.conf  | 13 -------------
 .../etc/skel/.config/lxqt/lxqt-runner.conf     |  2 --
 .../etc/skel/.config/lxqt/notifications.conf   |  2 --
 overlays/lxqt/etc/skel/.config/lxqt/power.conf |  2 --
 .../manjaro/manjaro-settings-manager.conf      |  6 ------
 .../lxqt/etc/skel/.config/octopi/octopi.conf   | 18 ------------------
 .../skel/.config/pcmanfm-qt/lxqt/settings.conf |  2 +-
 11 files changed, 8 insertions(+), 51 deletions(-)
 delete mode 100644 overlays/lxqt/etc/skel/.config/lximage-qt/settings.conf
 delete mode 100644 overlays/lxqt/etc/skel/.config/lxqt/lxqt-runner.conf
 delete mode 100644 overlays/lxqt/etc/skel/.config/lxqt/notifications.conf
 delete mode 100644 overlays/lxqt/etc/skel/.config/lxqt/power.conf
 delete mode 100644 overlays/lxqt/etc/skel/.config/manjaro/manjaro-settings-manager.conf
 delete mode 100644 overlays/lxqt/etc/skel/.config/octopi/octopi.conf

diff --git a/editions/lxqt b/editions/lxqt
index 576086d4..b8fdbe63 100644
--- a/editions/lxqt
+++ b/editions/lxqt
@@ -22,7 +22,7 @@ smplayer
 
 # Display Manager
 sddm
-sddm-qt-manjaro-theme
+matcha-dynamic-sddm
 
 # LXQT packages
 networkmanager-qt
@@ -54,11 +54,11 @@ unzip #to support zip file extraction
 
 # Themes
 kvantum-qt5
-kvantum-theme-adapta
 papirus-maia-icon-theme
-gtk-theme-breath
-breath-wallpaper
 xcursor-breeze
+matcha-gtk-theme
+kvantum-theme-matcha
+manjaro-arm-wallpapers
 manjaro-icons
 
 # Browser
diff --git a/overlays/lxqt/etc/sddm.conf b/overlays/lxqt/etc/sddm.conf
index 9d387959..3cde3266 100644
--- a/overlays/lxqt/etc/sddm.conf
+++ b/overlays/lxqt/etc/sddm.conf
@@ -23,7 +23,7 @@ RebootCommand=/usr/bin/systemctl reboot
 
 [Theme]
 # Current theme name
-Current=manjaro
+Current=matcha-dynamic-sddm
 
 # Cursor theme used in the greeter
 CursorTheme=Breeze
diff --git a/overlays/lxqt/etc/skel/.config/Kvantum/kvantum.kvconfig b/overlays/lxqt/etc/skel/.config/Kvantum/kvantum.kvconfig
index 48b2498a..53489e79 100644
--- a/overlays/lxqt/etc/skel/.config/Kvantum/kvantum.kvconfig
+++ b/overlays/lxqt/etc/skel/.config/Kvantum/kvantum.kvconfig
@@ -1,2 +1,2 @@
 [General]
-theme=KvAdaptaDark
+theme=Matcha-Dark
diff --git a/overlays/lxqt/etc/skel/.config/gtk-3.0/settings.ini b/overlays/lxqt/etc/skel/.config/gtk-3.0/settings.ini
index 626a5123..c39ed743 100644
--- a/overlays/lxqt/etc/skel/.config/gtk-3.0/settings.ini
+++ b/overlays/lxqt/etc/skel/.config/gtk-3.0/settings.ini
@@ -1,5 +1,5 @@
 [Settings]
-gtk-theme-name=Breath-Dark
+gtk-theme-name=Matcha-dark-sea
 gtk-icon-theme-name=Papirus-Dark-Maia
 gtk-font-name=Noto Sans 11
 gtk-cursor-theme-name=Breeze
diff --git a/overlays/lxqt/etc/skel/.config/lximage-qt/settings.conf b/overlays/lxqt/etc/skel/.config/lximage-qt/settings.conf
deleted file mode 100644
index 2bc4e962..00000000
--- a/overlays/lxqt/etc/skel/.config/lximage-qt/settings.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[General]
-bgColor=@Variant(\0\0\0\x43\x1\xff\xff\xff\xff\xff\xff\xff\xff\0\0)
-fallbackIconTheme=oxygen
-fullScreenBgColor=@Variant(\0\0\0\x43\x1\xff\xff\0\0\0\0\0\0\0\0)
-slideShowInterval=5
-
-[Window]
-FixedHeight=480
-FixedWidth=640
-LastWindowHeight=968
-LastWindowMaximized=false
-LastWindowWidth=1550
-RememberWindowSize=true
diff --git a/overlays/lxqt/etc/skel/.config/lxqt/lxqt-runner.conf b/overlays/lxqt/etc/skel/.config/lxqt/lxqt-runner.conf
deleted file mode 100644
index 79b42c67..00000000
--- a/overlays/lxqt/etc/skel/.config/lxqt/lxqt-runner.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[General]
-__userfile__=true
diff --git a/overlays/lxqt/etc/skel/.config/lxqt/notifications.conf b/overlays/lxqt/etc/skel/.config/lxqt/notifications.conf
deleted file mode 100644
index 79b42c67..00000000
--- a/overlays/lxqt/etc/skel/.config/lxqt/notifications.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[General]
-__userfile__=true
diff --git a/overlays/lxqt/etc/skel/.config/lxqt/power.conf b/overlays/lxqt/etc/skel/.config/lxqt/power.conf
deleted file mode 100644
index 79b42c67..00000000
--- a/overlays/lxqt/etc/skel/.config/lxqt/power.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[General]
-__userfile__=true
diff --git a/overlays/lxqt/etc/skel/.config/manjaro/manjaro-settings-manager.conf b/overlays/lxqt/etc/skel/.config/manjaro/manjaro-settings-manager.conf
deleted file mode 100644
index 1eb4c597..00000000
--- a/overlays/lxqt/etc/skel/.config/manjaro/manjaro-settings-manager.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[mainwindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\x1\xf4\0\0\x1l\0\0\x4O\0\0\x3>\0\0\x1\xf6\0\0\x1\x85\0\0\x4M\0\0\x3<\0\0\0\0\0\0\0\0\x6@)
-maximized=false
-pos=@Point(500 364)
-savestate=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x2X\0\0\x1\xb8\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
-size=@Size(600 440)
diff --git a/overlays/lxqt/etc/skel/.config/octopi/octopi.conf b/overlays/lxqt/etc/skel/.config/octopi/octopi.conf
deleted file mode 100644
index 6550b1a2..00000000
--- a/overlays/lxqt/etc/skel/.config/octopi/octopi.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[General]
-Backend=pacman
-Current_Tab_Index=3
-Instant_Search=true
-LastSyncDbTime=@DateTime(\0\0\0\x10\0\0\0\0\0\0%\x82\xf6\x3\x89\x95\x1c\0)
-OptionalDeps_Window_Size=@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\x2\x4\0\0\x1X\0\0\x4\x33\0\0\x3\x1\0\0\x2\x4\0\0\x1p\0\0\x4\x33\0\0\x3\x1\0\0\0\0\0\0\0\0\x6@)
-PackageList_Ordered_Col=1
-PackageList_Sort_Order=0
-Package_Icon_Column_Width=47
-Package_Name_Column_Width=400
-Package_Repository_Column_Width=150
-Package_Version_Column_Width=260
-Show_Groups_Panel=1
-Splitter_Horizontal_State=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xc0\0\0\0\xeb\x1\xff\xff\xff\xff\x1\0\0\0\x2\0)
-Terminal=automatic
-Transaction_Window_Size=@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\x2'\0\0\x1l\0\0\x4\x10\0\0\x2\xed\0\0\x2'\0\0\x1\x84\0\0\x4\x10\0\0\x2\xed\0\0\0\0\0\0\0\0\x6@)
-Use_Default_App_Icon=1
-Window_Size=@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\x1\x84\0\0\x1\x36\0\0\x4\xb7\0\0\x3}\0\0\x1\x84\0\0\x1N\0\0\x4\xb7\0\0\x3}\0\0\0\0\0\0\0\0\x6@)
diff --git a/overlays/lxqt/etc/skel/.config/pcmanfm-qt/lxqt/settings.conf b/overlays/lxqt/etc/skel/.config/pcmanfm-qt/lxqt/settings.conf
index fb33f7b1..7eaa1527 100644
--- a/overlays/lxqt/etc/skel/.config/pcmanfm-qt/lxqt/settings.conf
+++ b/overlays/lxqt/etc/skel/.config/pcmanfm-qt/lxqt/settings.conf
@@ -24,7 +24,7 @@ SlideShowInterval=0
 SortColumn=name
 SortFolderFirst=true
 SortOrder=ascending
-Wallpaper=/usr/share/backgrounds/breath.png
+Wallpaper=/usr/share/wallpapers/manjaro-arm/generic/manjaro-arm.png
 WallpaperDirectory=
 WallpaperMode=fit
 WallpaperRandomize=false
-- 
GitLab