diff --git a/core/internal/distros/debian.go b/core/internal/distros/debian.go index 14ce246c..74f4bf37 100644 --- a/core/internal/distros/debian.go +++ b/core/internal/distros/debian.go @@ -506,7 +506,7 @@ func (d *DebianDistribution) installAPTPackages(ctx context.Context, packages [] d.log(fmt.Sprintf("Installing APT packages: %s", strings.Join(packages, ", "))) - args := []string{"apt-get", "install", "-y"} + args := []string{"DEBIAN_FRONTEND=noninteractive", "apt-get", "install", "-y"} args = append(args, packages...) progressChan <- InstallProgressMsg{ diff --git a/quickshell/Common/Theme.qml b/quickshell/Common/Theme.qml index 377b0458..68f885b9 100644 --- a/quickshell/Common/Theme.qml +++ b/quickshell/Common/Theme.qml @@ -128,21 +128,13 @@ Singleton { setDesiredTheme("image", rawWallpaperPath, isLight, iconTheme, selectedMatugenType); } } - } else { - let primaryColor; - let matugenType; - if (currentTheme === "custom") { - if (customThemeData && customThemeData.primary) { - primaryColor = customThemeData.primary; - matugenType = customThemeData.matugen_type; - } - } else { - primaryColor = currentThemeData.primary; - matugenType = currentThemeData.matugen_type; - } - - if (primaryColor) { - setDesiredTheme("hex", primaryColor, isLight, iconTheme, matugenType); + } else if (currentTheme !== "custom") { + const darkTheme = StockThemes.getThemeByName(currentTheme, false); + const lightTheme = StockThemes.getThemeByName(currentTheme, true); + if (darkTheme && darkTheme.primary) { + const stockColors = buildMatugenColorsFromTheme(darkTheme, lightTheme); + const themeData = isLight ? lightTheme : darkTheme; + setDesiredTheme("hex", themeData.primary, isLight, iconTheme, themeData.matugen_type, stockColors); } } }, 0);