feat: matugen detects flatpak installations of zenbrowser and vesktop

.github/workflows/prek.yml

@@ -11,5 +11,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Install flatpak
+        run: sudo apt update && sudo apt install -y flatpak
+
+      - name: Add flathub
+        run: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+
+      - name: Add a flatpak that mutagen could support
+        run: sudo flatpak install -y org.freedesktop.Platform/x86_64/24.08 app.zen_browser.zen
+
       - name: run pre-commit hooks
         uses: j178/prek-action@v1

core/internal/matugen/matugen.go

@@ -250,61 +250,61 @@ output_path = '%s'
 	if !opts.ShouldSkipTemplate("gtk") {
 		switch opts.Mode {
 		case "light":
-			appendConfig(opts, cfgFile, nil, "gtk3-light.toml")
+			appendConfig(opts, cfgFile, nil, nil, "gtk3-light.toml")
 		default:
-			appendConfig(opts, cfgFile, nil, "gtk3-dark.toml")
+			appendConfig(opts, cfgFile, nil, nil, "gtk3-dark.toml")
 		}
 	}
 
 	if !opts.ShouldSkipTemplate("niri") {
-		appendConfig(opts, cfgFile, []string{"niri"}, "niri.toml")
+		appendConfig(opts, cfgFile, []string{"niri"}, nil, "niri.toml")
 	}
 	if !opts.ShouldSkipTemplate("qt5ct") {
-		appendConfig(opts, cfgFile, []string{"qt5ct"}, "qt5ct.toml")
+		appendConfig(opts, cfgFile, []string{"qt5ct"}, nil, "qt5ct.toml")
 	}
 	if !opts.ShouldSkipTemplate("qt6ct") {
-		appendConfig(opts, cfgFile, []string{"qt6ct"}, "qt6ct.toml")
+		appendConfig(opts, cfgFile, []string{"qt6ct"}, nil, "qt6ct.toml")
 	}
 	if !opts.ShouldSkipTemplate("firefox") {
-		appendConfig(opts, cfgFile, []string{"firefox"}, "firefox.toml")
+		appendConfig(opts, cfgFile, []string{"firefox"}, nil, "firefox.toml")
 	}
 	if !opts.ShouldSkipTemplate("pywalfox") {
-		appendConfig(opts, cfgFile, []string{"pywalfox"}, "pywalfox.toml")
+		appendConfig(opts, cfgFile, []string{"pywalfox"}, nil, "pywalfox.toml")
 	}
 	if !opts.ShouldSkipTemplate("zenbrowser") {
-		appendConfig(opts, cfgFile, []string{"zen", "zen-browser"}, "zenbrowser.toml")
+		appendConfig(opts, cfgFile, []string{"zen", "zen-browser"}, []string{"app.zen_browser.zen"}, "zenbrowser.toml")
 	}
 	if !opts.ShouldSkipTemplate("vesktop") {
-		appendConfig(opts, cfgFile, []string{"vesktop"}, "vesktop.toml")
+		appendConfig(opts, cfgFile, []string{"vesktop"}, []string{"dev.vencord.Vesktop"}, "vesktop.toml")
 	}
 	if !opts.ShouldSkipTemplate("equibop") {
-		appendConfig(opts, cfgFile, []string{"equibop"}, "equibop.toml")
+		appendConfig(opts, cfgFile, []string{"equibop"}, nil, "equibop.toml")
 	}
 	if !opts.ShouldSkipTemplate("ghostty") {
-		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"ghostty"}, "ghostty.toml")
+		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"ghostty"}, nil, "ghostty.toml")
 	}
 	if !opts.ShouldSkipTemplate("kitty") {
-		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"kitty"}, "kitty.toml")
+		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"kitty"}, nil, "kitty.toml")
 	}
 	if !opts.ShouldSkipTemplate("foot") {
-		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"foot"}, "foot.toml")
+		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"foot"}, nil, "foot.toml")
 	}
 	if !opts.ShouldSkipTemplate("alacritty") {
-		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"alacritty"}, "alacritty.toml")
+		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"alacritty"}, nil, "alacritty.toml")
 	}
 	if !opts.ShouldSkipTemplate("wezterm") {
-		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"wezterm"}, "wezterm.toml")
+		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"wezterm"}, nil, "wezterm.toml")
 	}
 	if !opts.ShouldSkipTemplate("nvim") {
-		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"nvim"}, "neovim.toml")
+		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"nvim"}, nil, "neovim.toml")
 	}
 
 	if !opts.ShouldSkipTemplate("dgop") {
-		appendConfig(opts, cfgFile, []string{"dgop"}, "dgop.toml")
+		appendConfig(opts, cfgFile, []string{"dgop"}, nil, "dgop.toml")
 	}
 
 	if !opts.ShouldSkipTemplate("kcolorscheme") {
-		appendConfig(opts, cfgFile, nil, "kcolorscheme.toml")
+		appendConfig(opts, cfgFile, nil, nil, "kcolorscheme.toml")
 	}
 
 	if !opts.ShouldSkipTemplate("vscode") {
@@ -342,12 +342,21 @@ output_path = '%s'
 	return nil
 }
 
-func appendConfig(opts *Options, cfgFile *os.File, checkCmd []string, fileName string) {
+func appendConfig(
+	opts *Options,
+	cfgFile *os.File,
+	checkCmd []string,
+	checkFlatpaks []string,
+	fileName string,
+) {
 	configPath := filepath.Join(opts.ShellDir, "matugen", "configs", fileName)
 	if _, err := os.Stat(configPath); err != nil {
 		return
 	}
-	if len(checkCmd) > 0 && !utils.AnyCommandExists(checkCmd...) {
+	cmdExists := checkCmd == nil || utils.AnyCommandExists(checkCmd...)
+	flatpakExists := checkFlatpaks == nil || utils.AnyFlatpakExists(checkFlatpaks...)
+
+	if !cmdExists && !flatpakExists {
 		return
 	}
 	data, err := os.ReadFile(configPath)
@@ -358,12 +367,15 @@ func appendConfig(opts *Options, cfgFile *os.File, checkCmd []string, fileName s
 	cfgFile.WriteString("\n")
 }
 
-func appendTerminalConfig(opts *Options, cfgFile *os.File, tmpDir string, checkCmd []string, fileName string) {
+func appendTerminalConfig(opts *Options, cfgFile *os.File, tmpDir string, checkCmd []string, checkFlatpaks []string, fileName string) {
 	configPath := filepath.Join(opts.ShellDir, "matugen", "configs", fileName)
 	if _, err := os.Stat(configPath); err != nil {
 		return
 	}
-	if len(checkCmd) > 0 && !utils.AnyCommandExists(checkCmd...) {
+	cmdExists := checkCmd == nil || utils.AnyCommandExists(checkCmd...)
+	flatpakExists := checkFlatpaks == nil || utils.AnyFlatpakExists(checkFlatpaks...)
+
+	if !cmdExists && !flatpakExists {
 		return
 	}
 	data, err := os.ReadFile(configPath)