1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-05-14 16:22:46 -04:00

dankinstall: fix gentoo parsing and use guru overlays for DMS/dgop

This commit is contained in:
bbedward
2026-05-14 10:13:37 -04:00
parent 79fe956058
commit 71438530a8
3 changed files with 20 additions and 6 deletions
+18 -4
View File
@@ -116,6 +116,20 @@ func (g *GentooDistribution) detectXDGPortal() deps.Dependency {
return g.detectPackage("xdg-desktop-portal-gtk", "Desktop integration portal for GTK", g.packageInstalled("sys-apps/xdg-desktop-portal-gtk"))
}
func (g *GentooDistribution) detectDMS() deps.Dependency {
dep := deps.Dependency{
Name: "dms (DankMaterialShell)",
Status: deps.StatusMissing,
Description: "Desktop Management System configuration",
Required: true,
CanToggle: false,
}
if g.packageInstalled("gui-apps/dankmaterialshell") {
dep.Status = deps.StatusInstalled
}
return dep
}
func (g *GentooDistribution) detectXwaylandSatellite() deps.Dependency {
return g.detectPackage("xwayland-satellite", "Xwayland support", g.packageInstalled("gui-apps/xwayland-satellite"))
}
@@ -150,8 +164,8 @@ func (g *GentooDistribution) GetPackageMappingWithVariants(wm deps.WindowManager
"quickshell": g.getQuickshellMapping(variants["quickshell"]),
"matugen": {Name: "x11-misc/matugen", Repository: RepoTypeGURU, AcceptKeywords: archKeyword},
"dms (DankMaterialShell)": g.getDmsMapping(variants["dms (DankMaterialShell)"]),
"dgop": {Name: "dgop", Repository: RepoTypeManual, BuildFunc: "installDgop"},
"dms (DankMaterialShell)": g.getDmsMapping(),
"dgop": {Name: "gui-apps/dgop", Repository: RepoTypeGURU, AcceptKeywords: archKeyword},
}
switch wm {
@@ -171,8 +185,8 @@ func (g *GentooDistribution) getQuickshellMapping(_ deps.PackageVariant) Package
return PackageMapping{Name: "gui-apps/quickshell", Repository: RepoTypeGURU, UseFlags: "breakpad jemalloc sockets wayland layer-shell session-lock toplevel-management screencopy X pipewire tray mpris pam hyprland hyprland-global-shortcuts hyprland-focus-grab i3 i3-ipc bluetooth", AcceptKeywords: "**"}
}
func (g *GentooDistribution) getDmsMapping(_ deps.PackageVariant) PackageMapping {
return PackageMapping{Name: "dms", Repository: RepoTypeManual, BuildFunc: "installDankMaterialShell"}
func (g *GentooDistribution) getDmsMapping() PackageMapping {
return PackageMapping{Name: "gui-apps/dankmaterialshell", Repository: RepoTypeGURU, AcceptKeywords: g.getArchKeyword()}
}
func (g *GentooDistribution) getHyprlandMapping(_ deps.PackageVariant) PackageMapping {
+1 -1
View File
@@ -56,7 +56,7 @@ func GetOSInfo() (*OSInfo, error) {
}
key := parts[0]
value := strings.Trim(parts[1], "\"")
value := strings.Trim(parts[1], "\"'")
switch key {
case "ID":
+1 -1
View File
@@ -156,7 +156,7 @@ func uninstallCommand(distroID string, dependencies []deps.Dependency) string {
return ""
}
if config.Family == distros.FamilyGentoo {
return "rm -rf ~/.config/quickshell/dms && sudo rm /usr/local/bin/dms"
return "sudo emerge --deselect gui-apps/dankmaterialshell && sudo emerge --depclean gui-apps/dankmaterialshell"
}
pkg := dmsPackageName(distroID, dependencies)
switch config.Family {