Finish Auto-Install, Fix the bar's Icon size, make the icons round as in the video, update dependencies, fix css loading, fix user info in the main menu

Author: Labfox

bar.go

@@ -213,7 +213,12 @@ func createWorkspaces() *gtk.Box {
 
 		pathn, err := foreignToplevel.GetIconFromToplevel(k, 16, 1)
 		if err == nil {
-			img, _ := gtk.ImageNewFromFile(pathn)
+
+			pixb, _ := gdk.PixbufNewFromFile(pathn)
+
+			pixbuf, _ := pixb.ScaleSimple(16, 16, gdk.INTERP_BILINEAR)
+
+			img, _ := gtk.ImageNewFromPixbuf(pixbuf)
 			imgButton.Add(img)
 		}
 

desktop.css

@@ -228,12 +228,13 @@
   .app {
     transition: all 1s;
     background: rgba(255, 255, 255, 0.25);
-    padding: 5px;
+    padding: 12px;
     border-radius: 20000px;
     padding-top: 8px;
     padding-bottom: 8px;
     margin-left: 5px;
     margin-right: 5px;
+
   }
 
   .clock-text {
@@ -284,3 +285,4 @@
   .workspaces * {
     margin: 0px;
   }
+

go.mod

@@ -4,15 +4,16 @@ go 1.24.0
 
 require (
 	github.com/MiracleOS-Team/desktoplib v0.0.0-20250223152628-950d1d75967b
-	github.com/MiracleOS-Team/libxdg-go v0.0.0-20250301094649-51ce3be1ff64
+	github.com/MiracleOS-Team/libxdg-go v0.0.0-20250406103953-9a3b3570154b
 	github.com/dlasky/gotk3-layershell v0.0.0-20240515133811-5c5115f0d774
+	github.com/go-git/go-git/v5 v5.14.0
 	github.com/gotk3/gotk3 v0.6.5-0.20240618185848-ff349ae13f56
 )
 
 require (
-	dario.cat/mergo v1.0.0 // indirect
+	dario.cat/mergo v1.0.1 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/ProtonMail/go-crypto v1.1.5 // indirect
+	github.com/ProtonMail/go-crypto v1.1.6 // indirect
 	github.com/cli/safeexec v1.0.1 // indirect
 	github.com/cloudflare/circl v1.6.0 // indirect
 	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
@@ -23,7 +24,6 @@ require (
 	github.com/gek64/displayController v1.0.2 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.6.2 // indirect
-	github.com/go-git/go-git/v5 v5.14.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
@@ -38,10 +38,10 @@ require (
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/skeema/knownhosts v1.3.1 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	golang.org/x/crypto v0.35.0 // indirect
-	golang.org/x/net v0.35.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/crypto v0.36.0 // indirect
+	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
 	google.golang.org/protobuf v1.36.4 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect

go.sum

@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
+dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
@@ -39,8 +41,12 @@ github.com/MiracleOS-Team/libxdg-go v0.0.0-20250301093905-6732d62f3069 h1:orQKUC
 github.com/MiracleOS-Team/libxdg-go v0.0.0-20250301093905-6732d62f3069/go.mod h1:GA/p+ukjyXCsrcpGvs0/gFp1NeHAMtJG/sYT0JcImfE=
 github.com/MiracleOS-Team/libxdg-go v0.0.0-20250301094649-51ce3be1ff64 h1:e3W++m1e0wH5RQoS85VSALnurUYkUM1hyktvZ4z9glg=
 github.com/MiracleOS-Team/libxdg-go v0.0.0-20250301094649-51ce3be1ff64/go.mod h1:GA/p+ukjyXCsrcpGvs0/gFp1NeHAMtJG/sYT0JcImfE=
+github.com/MiracleOS-Team/libxdg-go v0.0.0-20250406103953-9a3b3570154b h1:9rDnd3Y2/1HAP96ivsiuJ+Eerk8+sYiPjGvL1sFBbQc=
+github.com/MiracleOS-Team/libxdg-go v0.0.0-20250406103953-9a3b3570154b/go.mod h1:GA/p+ukjyXCsrcpGvs0/gFp1NeHAMtJG/sYT0JcImfE=
 github.com/ProtonMail/go-crypto v1.1.5 h1:eoAQfK2dwL+tFSFpr7TbOaPNUbPiJj4fLYwwGE1FQO4=
 github.com/ProtonMail/go-crypto v1.1.5/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
+github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
+github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
 github.com/bep/godartsass v1.2.0 h1:E2VvQrxAHAFwbjyOIExAMmogTItSKodoKuijNrGm5yU=
 github.com/bep/godartsass v1.2.0/go.mod h1:6LvK9RftsXMxGfsA0LDV12AGc4Jylnu6NgHL+Q5/pE8=
 github.com/bep/godartsass/v2 v2.3.2 h1:meuc76J1C1soSCAnlnJRdGqJ5S4m6/GW+8hmOe9tOog=
@@ -154,6 +160,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
 golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -165,6 +173,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
 golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -185,13 +195,17 @@ golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
 golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
 golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

installation.go

@@ -4,6 +4,7 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"os/exec"
 
 	"github.com/MiracleOS-Team/desktoplib/foreignToplevel"
 	basedir "github.com/MiracleOS-Team/libxdg-go/baseDir"
@@ -18,6 +19,13 @@ func checkRequiredDirectoriesAndCreate() error {
 		return err
 	}
 
+	_, deskData := os.Stat("/opt/miracleos-software/desk-data")
+
+	if os.IsNotExist(deskData) {
+		err := os.Mkdir("/opt/miracleos-software/desk-data", os.ModePerm)
+		return err
+	}
+
 	_, labWCConf := os.Stat(basedir.GetXDGDirectory("config").(string) + "/labwc")
 	if os.IsNotExist(labWCConf) {
 		err := os.Mkdir(basedir.GetXDGDirectory("config").(string)+"/labwc", os.ModePerm)
@@ -65,6 +73,33 @@ func checkRequiredReposAndDownload() error {
 		return err
 	}
 
+	_, mosIcons := os.Stat("/opt/miracleos-software/Icons")
+
+	if os.IsNotExist(mosIcons) {
+		_, err := git.PlainClone("/opt/miracleos-software/Icons", false, &git.CloneOptions{
+			URL:      "https://github.com/MiracleOS-Team/Icons",
+			Progress: os.Stdout,
+		})
+		return err
+	}
+
+	_, mosIconsInstall := os.Stat("/usr/share/icons/MiracleOSIcons")
+
+	if os.IsNotExist(mosIconsInstall) {
+		err := os.CopyFS("/usr/share/icons/MiracleOSIcons", os.DirFS("/opt/miracleos-software/Icons/MiracleOSIcons"))
+		return err
+	}
+
+	_, appIconsAlias := os.Stat("/opt/miracleos-software/desk-data/app-icons-alias.json")
+	if os.IsNotExist(appIconsAlias) {
+		downloadFile("https://github.com/MiracleOS-Team/desktoplib/raw/refs/heads/main/app-icons-alias.json", "/opt/miracleos-software/desk-data/app-icons-alias.json")
+	}
+
+	_, wallpaperDark := os.Stat("/usr/share/backgrounds/miracleos_dark_default.jpg")
+	if os.IsNotExist(wallpaperDark) {
+		downloadFile("https://raw.githubusercontent.com/MiracleOS-Team/miracleos-team.github.io/refs/heads/main/brand/wallpaper.jpg", "/usr/share/backgrounds/miracleos_dark_default.jpg")
+	}
+
 	// download labwc data
 
 	_, autostartFile := os.Stat(basedir.GetXDGDirectory("config").(string) + "/labwc/autostart")
@@ -92,7 +127,21 @@ func checkRequiredReposAndDownload() error {
 
 func checkRequiredSoftwareAndInstall() error {
 	_, err := foreignToplevel.ListToplevels()
-	return err
+	if err != nil {
+		return err
+	}
+
+	_, err = exec.LookPath("swww")
+	if err != nil {
+		return err
+	}
+
+	_, err = exec.LookPath("mpvpaper")
+	if err != nil {
+		return err
+	}
+
+	return nil
 }
 
 func EnsureInstallation() error {

main.go

@@ -13,11 +13,14 @@ func loadCSS() {
 	// Load CSS into GTK
 	provider, _ := gtk.CssProviderNew()
 	//err = provider.LoadFromData(css)
-	err := provider.LoadFromPath("/opt/miracleos-software/desktop/desktop.css")
-	//err := provider.LoadFromPath("desktop.css")
+
+	err := provider.LoadFromPath("desktop.css")
 	if err != nil {
-		log.Println("Failed to load CSS into GTK:", err)
-		return
+		err = provider.LoadFromPath("/opt/miracleos-software/desktop/desktop.css")
+		if err != nil {
+			log.Println("Failed to load CSS into GTK:", err)
+			return
+		}
 	}
 
 	display, err := gdk.DisplayGetDefault()

mainMenu.go

@@ -3,12 +3,15 @@ package main
 import (
 	"fmt"
 	"os"
+	"os/user"
 	"sort"
 
 	"github.com/MiracleOS-Team/libxdg-go/desktopFiles"
 	"github.com/dlasky/gotk3-layershell/layershell"
 	"github.com/gotk3/gotk3/gdk"
 	"github.com/gotk3/gotk3/gtk"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 )
 
 func createAppGroup(apps []desktopFiles.DesktopFile) *gtk.Box {
@@ -109,12 +112,47 @@ func createAppList() *gtk.ScrolledWindow {
 }
 
 func createUserInfo() *gtk.Box {
+	userObject, err := user.Current()
+	if err != nil {
+		panic(err)
+	}
+
+	subtitle := "Standard User"
+
+	groups, err := userObject.GroupIds()
+	if err == nil {
+		for _, groupId := range groups {
+			gp, err := user.LookupGroupId(groupId)
+			if err != nil {
+				continue
+			}
+			if gp.Name == "sudo" {
+				subtitle = "Administrator"
+			}
+			if gp.Name == "wheel" {
+				subtitle = "Administrator"
+			}
+
+		}
+
+	}
+
 	userBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 10)
 	userImage, _ := gtk.ImageNewFromFile("images/pp.png")
-	userLabel, _ := gtk.LabelNew("Abdi\nanonymous@gmail.com")
-	userLabel.SetXAlign(0)
+	userNameBox, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 0)
+
+	userNameLabel, _ := gtk.LabelNew(cases.Title(language.English, cases.Compact).String(userObject.Username))
+	userNameLabel.SetXAlign(0)
+	sc, _ := userNameLabel.GetStyleContext()
+	sc.AddClass("h2")
+
+	userSubtitleLabel, _ := gtk.LabelNew(subtitle)
+	userSubtitleLabel.SetXAlign(0)
+
+	userNameBox.PackStart(userNameLabel, false, false, 0)
+	userNameBox.PackEnd(userSubtitleLabel, false, false, 0)
 	userBox.PackStart(userImage, false, false, 5)
-	userBox.PackStart(userLabel, false, false, 5)
+	userBox.PackStart(userNameBox, false, false, 5)
 	return userBox
 }