General improvements for Wayland (#105)

pjbgf · web-flow · commit 67a4cbcb3abe · 2025-10-05T22:10:31.000+01:00
Wayland environment variables are now exposed to the profile as well as the workloads for improved UX. The changes also introduces the headless subcommand, which seems to be a better fit when running on top of Wayland atm. But removes isolation/grouping of workloads. Now if the resolution can't be detected by running `xrand`, it will attempt `wlr-randr`. If that also fails, defaults to `1440x1080`, instead of silently failing. Relates to #2.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,5 +1,6 @@
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     - asasalint
     - asciicheck
@@ -22,13 +23,10 @@ linters:
     - gochecknoinits
     - gochecksumtype
     - goconst
-    - gofmt
     - goheader
-    - goimports
     - gomodguard
     - goprintffuncname
     - gosec
-    - gosimple
     - gosmopolitan
     - govet
     - grouper
@@ -53,18 +51,38 @@ linters:
     - sloglint
     - spancheck
     - sqlclosecheck
-    - stylecheck
+    - staticcheck
     - tagalign
     - tagliatelle
-    - tenv
     - testableexamples
     - thelper
     - tparallel
-    - typecheck
     - unconvert
     - unparam
     - unused
     - usestdlibvars
+    - usetesting
     - wastedassign
     - whitespace
     - zerologlint
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/cmd/cli/headless.go b/cmd/cli/headless.go
@@ -0,0 +1,55 @@
+package cli
+
+import (
+	"context"
+
+	"github.com/qubesome/cli/internal/qubesome"
+	"github.com/urfave/cli/v3"
+)
+
+var conf string
+
+func headlessCommand() *cli.Command {
+	cmd := &cli.Command{
+		Name:  "headless",
+		Usage: "execute workloads in headless mode",
+		Description: `Examples:
+
+qubesome headless -profile <path> <workload>
+qubesome headless -profile ~/git/dotfiles chrome
+`,
+		Arguments: []cli.Argument{
+			&cli.StringArg{
+				Name:        "workload",
+				Destination: &workload,
+			},
+		},
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:        "config",
+				Destination: &conf,
+			},
+			&cli.StringFlag{
+				Name:        "profile",
+				Destination: &targetProfile,
+			},
+			&cli.StringFlag{
+				Name:        "runner",
+				Destination: &runner,
+			},
+		},
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			cfg := config(conf)
+
+			return qubesome.Run(
+				qubesome.WithHeadless(),
+				qubesome.WithWorkload(workload),
+				qubesome.WithProfile(targetProfile),
+				qubesome.WithConfig(cfg),
+				qubesome.WithRunner(runner),
+				qubesome.WithExtraArgs(cmd.Args().Slice()),
+			)
+		},
+	}
+	return cmd
+}
diff --git a/cmd/cli/root.go b/cmd/cli/root.go
@@ -41,6 +41,7 @@ func RootCommand() *cli.Command {
 			completionCommand(),
 			hostRunCommand(),
 			flatpakCommand(),
+			headlessCommand(),
 		},
 	}
 
diff --git a/hack/base.mk b/hack/base.mk
@@ -1,5 +1,5 @@
-GOLANGCI_VERSION ?= v1.64.5
-PROTOC_VERSION ?= 29.3
+GOLANGCI_VERSION ?= v2.5.0
+PROTOC_VERSION ?= 32.1
 TOOLS_BIN := $(shell mkdir -p build/tools && realpath build/tools)
 
 ifneq ($(shell git status --porcelain --untracked-files=no),)
diff --git a/internal/files/binaries.go b/internal/files/binaries.go
@@ -10,6 +10,7 @@ const (
 	XclipBinary       = "/usr/bin/xclip"
 	FireCrackerBinary = "/usr/bin/firecracker"
 	XrandrBinary      = "/usr/bin/xrandr"
+	WlrRandrBinary    = "/usr/bin/wlr-randr"
 	DbusBinary        = "/usr/bin/dbus-send"
 	PodmanBinary      = "/usr/bin/podman"
 	DockerBinary      = "/usr/bin/docker"
diff --git a/internal/flatpak/flatpak.go b/internal/flatpak/flatpak.go
@@ -54,7 +54,7 @@ func Run(opts ...command.Option[Options]) error {
 	args := []string{"run", o.Name}
 	args = append(args, o.ExtraArgs...)
 
-	c := exec.Command("/usr/bin/flatpak", args...)
+	c := exec.CommandContext(context.TODO(), "/usr/bin/flatpak", args...)
 	c.Env = append(os.Environ(), fmt.Sprintf("DISPLAY=:%d", prof.Display))
 	out, err := c.CombinedOutput()
 	fmt.Println(string(out))
@@ -86,7 +86,7 @@ func Install(opts ...command.Option[Options]) error {
 		fmt.Println("installing Flatpak", name)
 		args := []string{"install", "flathub", name}
 
-		c := exec.Command("/usr/bin/flatpak", args...)
+		c := exec.CommandContext(context.TODO(), "/usr/bin/flatpak", args...)
 		c.Stdin = os.Stdin
 		c.Stdout = os.Stdout
 		c.Stderr = os.Stderr
diff --git a/internal/profiles/profiles.go b/internal/profiles/profiles.go
@@ -81,11 +81,12 @@ func Run(opts ...command.Option[Options]) error {
 	if err != nil {
 		return err
 	}
-	cfg.RootDir = filepath.Dir(path)
 
 	if cfg == nil {
 		return fmt.Errorf("cannot start profile: nil config")
 	}
+
+	cfg.RootDir = filepath.Dir(path)
 	profile, ok := cfg.Profile(o.Profile)
 	if !ok {
 		return fmt.Errorf("cannot start profile: profile %q not found", o.Profile)
@@ -336,6 +337,7 @@ func Start(runner string, profile *types.Profile, cfg *types.Config, interactive
 		creds.CA, creds.ClientPEM, creds.ClientKeyPEM,
 		profile, strconv.Itoa(int(profile.Display)), interactive, cfg)
 	if err != nil {
+		slog.Warn("failed to create display", "error", err)
 		return err
 	}
 
@@ -412,12 +414,13 @@ func createMagicCookie(profile *types.Profile) error {
 
 	xauthority := os.Getenv("XAUTHORITY")
 	if xauthority == "" {
-		return fmt.Errorf("XAUTHORITY not defined")
+		xauthority = os.ExpandEnv("${HOME}/.XAUTHORITY")
 	}
 
 	slog.Debug("opening parent xauthority", "path", xauthority)
 	parent, err := os.Open(xauthority)
 	if err != nil {
+		slog.Debug("failed to open parent xauthority", "error", err)
 		return err
 	}
 	defer parent.Close()
@@ -470,6 +473,7 @@ func createNewDisplay(bin string, ca, cert, key []byte, profile *types.Profile,
 			"-tst",
 			"-nolisten", "tcp",
 			"-auth", "/home/xorg-user/.Xserver",
+			"-verbose", "9",
 			"--",
 			strings.TrimPrefix(profile.WindowManager, "exec ")}
 	}
@@ -549,7 +553,6 @@ func createNewDisplay(bin string, ca, cert, key []byte, profile *types.Profile,
 		"--rm",
 		// rely on currently set DISPLAY.
 		"-e", "DISPLAY",
-		"-e", "XDG_SESSION_TYPE=X11",
 		"-e", "Q_MTLS_CA",
 		"-e", "Q_MTLS_CERT",
 		"-e", "Q_MTLS_KEY",
@@ -578,10 +581,20 @@ func createNewDisplay(bin string, ca, cert, key []byte, profile *types.Profile,
 		}
 
 		// TODO: Investigate ways to avoid sharing /run/user/1000 on Wayland.
-		dockerArgs = append(dockerArgs, "-e XDG_RUNTIME_DIR")
+		dockerArgs = append(dockerArgs, "-e", "XDG_RUNTIME_DIR")
+		dockerArgs = append(dockerArgs, "-e", "XDG_BACKEND")
+		dockerArgs = append(dockerArgs, "-e", "XDG_SEAT")
+		dockerArgs = append(dockerArgs, "-e", "XDG_SESSION_TYPE")
+		dockerArgs = append(dockerArgs, "-e", "XDG_SESSION_ID")
+		dockerArgs = append(dockerArgs, "-e", "XDG_SESSION_CLASS")
+		dockerArgs = append(dockerArgs, "-e", "XDG_SESSION_DESKTOP")
+		dockerArgs = append(dockerArgs, "-e", "WAYLAND_DISPLAY")
+		dockerArgs = append(dockerArgs, "-e", "HYPRLAND_INSTANCE_SIGNATURE")
 		dockerArgs = append(dockerArgs, "-v="+xdgRuntimeDir+":/run/user/1000")
+	} else {
+		dockerArgs = append(dockerArgs, "-e", "XDG_SESSION_TYPE=X11")
 	}
-	if profile.HostAccess.Gpus != "" {
+	if profile.Gpus != "" {
 		if gpus, ok := gpu.Supported(profile.Runner); ok {
 			dockerArgs = append(dockerArgs, gpus)
 		}
@@ -623,6 +636,7 @@ func createNewDisplay(bin string, ca, cert, key []byte, profile *types.Profile,
 
 	paths = append(paths, fmt.Sprintf("-v=%s:/dev/shm", filepath.Join(userDir, "shm")))
 	if profile.Dbus {
+		paths = append(paths, "-v=/run/dbus/system_bus_socket:/run/dbus/system_bus_socket")
 		paths = append(paths, "-v=/etc/machine-id:/etc/machine-id:ro")
 	} else {
 		paths = append(paths, fmt.Sprintf("-v=%s:/run/user/1000", userDir))
@@ -657,6 +671,8 @@ func createNewDisplay(bin string, ca, cert, key []byte, profile *types.Profile,
 
 	slog.Debug("exec: "+bin, "args", dockerArgs)
 	cmd := execabs.Command(bin, dockerArgs...)
+	cmd.Env = append(cmd.Env, os.Environ()...)
+
 	cmd.Env = append(os.Environ(), "Q_MTLS_CA="+string(ca))
 	cmd.Env = append(cmd.Env, "Q_MTLS_CERT="+string(cert))
 	cmd.Env = append(cmd.Env, "Q_MTLS_KEY="+string(key))
diff --git a/internal/qubesome/mime.go b/internal/qubesome/mime.go
@@ -31,7 +31,7 @@ func (q *Qubesome) HandleMime(in *WorkloadInfo, args []string, runnerOverride st
 			return fmt.Errorf("cannot handle schemeless mime type: default mime handler is not set")
 		}
 
-		return q.runner(q.defaultWorkload(in, args), runnerOverride)
+		return q.runner(q.defaultWorkload(in, args), runnerOverride, false)
 	}
 
 	if m, ok := in.Config.MimeHandlers[u.Scheme]; ok {
@@ -43,7 +43,7 @@ func (q *Qubesome) HandleMime(in *WorkloadInfo, args []string, runnerOverride st
 		}
 
 		q.overrideWithProfile(in, &wi)
-		return q.runner(wi, runnerOverride)
+		return q.runner(wi, runnerOverride, false)
 	}
 
 	if in.Config.DefaultMimeHandler == nil {
@@ -53,7 +53,7 @@ func (q *Qubesome) HandleMime(in *WorkloadInfo, args []string, runnerOverride st
 	slog.Debug("no scheme specific handler: falling back to default mime handler")
 
 	// falls back to default
-	return q.runner(q.defaultWorkload(in, args), runnerOverride)
+	return q.runner(q.defaultWorkload(in, args), runnerOverride, false)
 }
 
 func (q *Qubesome) overrideWithProfile(in *WorkloadInfo, wi *WorkloadInfo) {
diff --git a/internal/qubesome/mime_test.go b/internal/qubesome/mime_test.go
@@ -143,7 +143,7 @@ func Test_HandleMime(t *testing.T) {
 			called := 0
 
 			q := New()
-			q.runner = func(wi WorkloadInfo, _ string) error {
+			q.runner = func(wi WorkloadInfo, _ string, _ bool) error {
 				actual = &wi
 				called++
 				return nil
diff --git a/internal/qubesome/options.go b/internal/qubesome/options.go
@@ -13,6 +13,7 @@ type Options struct {
 	Profile   string
 	Runner    string
 	ExtraArgs []string
+	Headless  bool
 }
 
 func WithExtraArgs(args []string) command.Option[Options] {
@@ -44,6 +45,11 @@ func WithConfig(cfg *types.Config) command.Option[Options] {
 		o.Config = cfg
 	}
 }
+func WithHeadless() command.Option[Options] {
+	return func(o *Options) {
+		o.Headless = true
+	}
+}
 
 func (o *Options) Validate() error {
 	if o.Config == nil {
diff --git a/internal/qubesome/qubesome.go b/internal/qubesome/qubesome.go
@@ -17,7 +17,7 @@ var (
 )
 
 type Qubesome struct {
-	runner func(in WorkloadInfo, runnerOverride string) error
+	runner func(in WorkloadInfo, runnerOverride string, headless bool) error
 }
 
 func New() *Qubesome {
diff --git a/internal/qubesome/run.go b/internal/qubesome/run.go
@@ -78,10 +78,10 @@ func Run(opts ...command.Option[Options]) error {
 
 	// Wait for any background operation that is in-flight.
 	defer wg.Wait()
-	return runner(in, o.Runner)
+	return runner(in, o.Runner, o.Headless)
 }
 
-func runner(in WorkloadInfo, runnerOverride string) error {
+func runner(in WorkloadInfo, runnerOverride string, headless bool) error {
 	if err := in.Validate(); err != nil {
 		return err
 	}
@@ -190,6 +190,11 @@ func runner(in WorkloadInfo, runnerOverride string) error {
 		ew.Workload.Runner = runnerOverride
 	}
 
+	if headless {
+		// In headless mode, Mime handling is not supported.
+		ew.Workload.HostAccess.Mime = false
+	}
+
 	switch ew.Workload.Runner {
 	case "firecracker":
 		return firecracker.Run(ew)
diff --git a/internal/runners/docker/run.go b/internal/runners/docker/run.go
@@ -112,7 +112,17 @@ func Run(ew types.EffectiveWorkload) error {
 		}
 
 		// TODO: Investigate ways to avoid sharing /run/user/1000 on Wayland.
-		args = append(args, "-e XDG_RUNTIME_DIR")
+		args = append(args, "-e", "XDG_RUNTIME_DIR")
+		args = append(args, "-e", "XDG_BACKEND")
+		args = append(args, "-e", "XDG_SEAT")
+		args = append(args, "-e", "XDG_SESSION_TYPE")
+		args = append(args, "-e", "XDG_SESSION_ID")
+		args = append(args, "-e", "XDG_SESSION_CLASS")
+		args = append(args, "-e", "XDG_SESSION_DESKTOP")
+		args = append(args, "-e", "WAYLAND_DISPLAY")
+		args = append(args, "-e", "HYPRLAND_INSTANCE_SIGNATURE")
+		args = append(args, "-e", "DBUS_SESSION_BUS_ADDRESS")
+
 		args = append(args, "-v="+xdgRuntimeDir+":/run/user/1000")
 	} else {
 		if wl.HostAccess.Dbus || wl.HostAccess.Bluetooth || wl.HostAccess.VarRunUser {
@@ -164,6 +174,11 @@ func Run(ew types.EffectiveWorkload) error {
 			return err
 		}
 
+		err = os.MkdirAll(pdir, files.DirMode)
+		if err != nil {
+			return fmt.Errorf("failed to ensure profile dir: %w", err)
+		}
+
 		srcMimeList := filepath.Join(pdir, "mimeapps.list")
 		dstMimeList := filepath.Join(homedir, ".local", "share", "applications", "mimeapps.list")
 		err = os.WriteFile(srcMimeList, []byte(mime.MimesList), files.FileMode)
diff --git a/internal/types/workload.go b/internal/types/workload.go
diff --git a/internal/util/resolution/resolution.go b/internal/util/resolution/resolution.go
diff --git a/pkg/inception/server.go b/pkg/inception/server.go

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ func RootCommand() *cli.Command {`
`41`	`41`	`completionCommand(),`
`42`	`42`	`hostRunCommand(),`
`43`	`43`	`flatpakCommand(),`
	`44`	`+ headlessCommand(),`
`44`	`45`	`},`
`45`	`46`	`}`
`46`	`47`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ func (q Qubesome) HandleMime(in WorkloadInfo, args []string, runnerOverride st`
`31`	`31`	`return fmt.Errorf("cannot handle schemeless mime type: default mime handler is not set")`
`32`	`32`	`}`
`33`	`33`
`34`		`- return q.runner(q.defaultWorkload(in, args), runnerOverride)`
	`34`	`+ return q.runner(q.defaultWorkload(in, args), runnerOverride, false)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`if m, ok := in.Config.MimeHandlers[u.Scheme]; ok {`
`@@ -43,7 +43,7 @@ func (q Qubesome) HandleMime(in WorkloadInfo, args []string, runnerOverride st`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`q.overrideWithProfile(in, &wi)`
`46`		`- return q.runner(wi, runnerOverride)`
	`46`	`+ return q.runner(wi, runnerOverride, false)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`if in.Config.DefaultMimeHandler == nil {`
`@@ -53,7 +53,7 @@ func (q Qubesome) HandleMime(in WorkloadInfo, args []string, runnerOverride st`
`53`	`53`	`slog.Debug("no scheme specific handler: falling back to default mime handler")`
`54`	`54`
`55`	`55`	`// falls back to default`
`56`		`- return q.runner(q.defaultWorkload(in, args), runnerOverride)`
	`56`	`+ return q.runner(q.defaultWorkload(in, args), runnerOverride, false)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`func (q Qubesome) overrideWithProfile(in WorkloadInfo, wi *WorkloadInfo) {`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ type Options struct {`
`13`	`13`	`Profile string`
`14`	`14`	`Runner string`
`15`	`15`	`ExtraArgs []string`
	`16`	`+ Headless bool`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`func WithExtraArgs(args []string) command.Option[Options] {`
`@@ -44,6 +45,11 @@ func WithConfig(cfg *types.Config) command.Option[Options] {`
`44`	`45`	`o.Config = cfg`
`45`	`46`	`}`
`46`	`47`	`}`
	`48`	`+func WithHeadless() command.Option[Options] {`
	`49`	`+ return func(o *Options) {`
	`50`	`+ o.Headless = true`
	`51`	`+ }`
	`52`	`+}`
`47`	`53`
`48`	`54`	`func (o *Options) Validate() error {`
`49`	`55`	`if o.Config == nil {`