inception: Ignore config and profile selection

Signed-off-by: Paulo Gomes <pjbgf@linux.com>

Author: pjbgf

cmd/cli/run.go

@@ -3,7 +3,9 @@ package cli
 import (
 	"context"
 
+	"github.com/qubesome/cli/internal/inception"
 	"github.com/qubesome/cli/internal/qubesome"
+	"github.com/qubesome/cli/internal/types"
 	"github.com/urfave/cli/v3"
 )
 
@@ -36,16 +38,29 @@ qubesome run -profile <profile> chrome     - Run the chrome workload on a specif
 			},
 		},
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			prof, err := profileOrActive(targetProfile)
-			if err != nil {
-				return err
-			}
+			var cfg *types.Config
+
+			// Commands that can be executed from within a profile
+			// (a.k.a. inception mode) should not check for profile
+			// names nor configs, as those are imposed by the inception
+			// server.
+			if !inception.Inside() {
+				prof, err := profileOrActive(targetProfile)
+				if err != nil {
+					return err
+				}
 
-			cfg := profileConfigOrDefault(prof.Name)
+				targetProfile = prof.Name
+				cfg = profileConfigOrDefault(targetProfile)
+
+				if runner == "" {
+					runner = prof.Runner
+				}
+			}
 
 			return qubesome.Run(
 				qubesome.WithWorkload(workload),
-				qubesome.WithProfile(prof.Name),
+				qubesome.WithProfile(targetProfile),
 				qubesome.WithConfig(cfg),
 				qubesome.WithRunner(runner),
 				qubesome.WithExtraArgs(cmd.Args().Slice()),

cmd/cli/xdg.go

@@ -3,7 +3,9 @@ package cli
 import (
 	"context"
 
+	"github.com/qubesome/cli/internal/inception"
 	"github.com/qubesome/cli/internal/qubesome"
+	"github.com/qubesome/cli/internal/types"
 	"github.com/urfave/cli/v3"
 )
 
@@ -28,12 +30,20 @@ qubesome xdg-open -profile <profile> https://github.com/qubesome    - Opens the
 			},
 		},
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			prof, err := profileOrActive(targetProfile)
-			if err != nil {
-				return err
-			}
+			var cfg *types.Config
+
+			// Commands that can be executed from within a profile
+			// (a.k.a. inception mode) should not check for profile
+			// names nor configs, as those are imposed by the inception
+			// server.
+			if !inception.Inside() {
+				prof, err := profileOrActive(targetProfile)
+				if err != nil {
+					return err
+				}
 
-			cfg := profileConfigOrDefault(prof.Name)
+				cfg = profileConfigOrDefault(prof.Name)
+			}
 
 			return qubesome.XdgRun(
 				qubesome.WithConfig(cfg),

internal/inception/inception.go

@@ -1,6 +1,7 @@
 package inception
 
 import (
+	"log/slog"
 	"os"
 
 	"github.com/qubesome/cli/internal/files"
@@ -9,5 +10,8 @@ import (
 func Inside() bool {
 	path := files.InProfileSocketPath()
 	_, err := os.Stat(path)
-	return (err == nil)
+	inside := (err == nil)
+
+	slog.Debug("inception check", "inside", inside)
+	return inside
 }

internal/profiles/profiles.go

@@ -157,6 +157,10 @@ func StartFromGit(runner, name, gitURL, path, local string) error {
 		return fmt.Errorf("cannot file profile %q in config %q", name, cfgPath)
 	}
 
+	if p.Runner != "" {
+		runner = p.Runner
+	}
+
 	// When sourcing from git, ensure profile path is relative to the git repository.
 	pp, err := securejoin.SecureJoin(filepath.Dir(cfgPath), p.Path)
 	if err != nil {
@@ -462,6 +466,9 @@ func createNewDisplay(bin string, profile *types.Profile, display string) error
 		dockerArgs = append(dockerArgs, "-v="+xdgRuntimeDir+":/run/user/1000")
 	}
 	if profile.HostAccess.Gpus != "" {
+		if strings.HasSuffix(bin, "podman") {
+			dockerArgs = append(dockerArgs, "--runtime=nvidia.com/gpu=all")
+		}
 		dockerArgs = append(dockerArgs, "--gpus", profile.HostAccess.Gpus)
 	}
 

internal/runners/podman/run.go

@@ -83,7 +83,6 @@ func Run(ew types.EffectiveWorkload) error {
 
 	if wl.HostAccess.Gpus != "" {
 		args = append(args, "--gpus", wl.HostAccess.Gpus)
-		args = append(args, "--runtime=nvidia")
 	}
 
 	for _, cap := range wl.HostAccess.CapsAdd {

internal/types/config.go

@@ -107,7 +107,7 @@ type Profile struct {
 	// config is being consumed. When sourcing from git, it descends
 	// from the git repository directory.
 	Path   string `yaml:"path"`
-	Runner string // TODO: Better name runner
+	Runner string `yaml:"runner"`
 
 	// HostAccess defines all the access request which are allowed for
 	// its workloads.