diff options
Diffstat (limited to 'hst/hst.go')
| -rw-r--r-- | hst/hst.go | 60 |
1 files changed, 48 insertions, 12 deletions
@@ -44,11 +44,13 @@ func (e *AppError) Message() string { type Paths struct { // Temporary directory returned by [os.TempDir], usually equivalent to [fhs.AbsTmp]. TempDir *check.Absolute `json:"temp_dir"` - // Shared directory specific to the hsu userid, usually (`/tmp/hakurei.%d`, [Info.User]). + // Shared directory specific to the hsu userid, usually + // (`/tmp/hakurei.%d`, [Info.User]). SharePath *check.Absolute `json:"share_path"` // Checked XDG_RUNTIME_DIR value, usually (`/run/user/%d`, uid). RuntimePath *check.Absolute `json:"runtime_path"` - // Shared directory specific to the hsu userid located in RuntimePath, usually (`/run/user/%d/hakurei`, uid). + // Shared directory specific to the hsu userid located in RuntimePath, + // usually (`/run/user/%d/hakurei`, uid). RunDirPath *check.Absolute `json:"run_dir_path"` } @@ -74,10 +76,23 @@ func Template() *Config { SessionBus: &BusConfig{ See: nil, - Talk: []string{"org.freedesktop.Notifications", "org.freedesktop.FileManager1", "org.freedesktop.ScreenSaver", - "org.freedesktop.secrets", "org.kde.kwalletd5", "org.kde.kwalletd6", "org.gnome.SessionManager"}, - Own: []string{"org.chromium.Chromium.*", "org.mpris.MediaPlayer2.org.chromium.Chromium.*", - "org.mpris.MediaPlayer2.chromium.*"}, + Talk: []string{ + "org.freedesktop.Notifications", + "org.freedesktop.FileManager1", + "org.freedesktop.ScreenSaver", + "org.freedesktop.secrets", + + "org.kde.kwalletd5", + "org.kde.kwalletd6", + + "org.gnome.SessionManager", + }, + Own: []string{ + "org.chromium.Chromium.*", + + "org.mpris.MediaPlayer2.org.chromium.Chromium.*", + "org.mpris.MediaPlayer2.chromium.*", + }, Call: map[string]string{"org.freedesktop.portal.*": "*"}, Broadcast: map[string]string{"org.freedesktop.portal.*": "@/org/freedesktop/portal/*"}, Log: false, @@ -112,7 +127,12 @@ func Template() *Config { "GOOGLE_DEFAULT_CLIENT_SECRET": "OTJgUOQcT7lO7GsGZq2G4IlT", }, Filesystem: []FilesystemConfigJSON{ - {&FSBind{Target: fhs.AbsRoot, Source: fhs.AbsVarLib.Append("hakurei/base/org.debian"), Write: true, Special: true}}, + {&FSBind{ + Target: fhs.AbsRoot, + Source: fhs.AbsVarLib.Append("hakurei/base/org.debian"), + Write: true, + Special: true, + }}, {&FSBind{Target: fhs.AbsEtc, Source: fhs.AbsEtc, Special: true}}, {&FSEphemeral{Target: fhs.AbsTmp, Write: true, Perm: 0755}}, {&FSOverlay{ @@ -121,11 +141,27 @@ func Template() *Config { Upper: fhs.AbsVarLib.Append("hakurei/nix/u0/org.chromium.Chromium/rw-store/upper"), Work: fhs.AbsVarLib.Append("hakurei/nix/u0/org.chromium.Chromium/rw-store/work"), }}, - {&FSLink{Target: fhs.AbsRun.Append("current-system"), Linkname: "/run/current-system", Dereference: true}}, - {&FSLink{Target: fhs.AbsRun.Append("opengl-driver"), Linkname: "/run/opengl-driver", Dereference: true}}, - {&FSBind{Source: fhs.AbsVarLib.Append("hakurei/u0/org.chromium.Chromium"), - Target: check.MustAbs("/data/data/org.chromium.Chromium"), Write: true, Ensure: true}}, - {&FSBind{Source: fhs.AbsDev.Append("dri"), Device: true, Optional: true}}, + {&FSLink{ + Target: fhs.AbsRun.Append("current-system"), + Linkname: "/run/current-system", + Dereference: true, + }}, + {&FSLink{ + Target: fhs.AbsRun.Append("opengl-driver"), + Linkname: "/run/opengl-driver", + Dereference: true, + }}, + {&FSBind{ + Source: fhs.AbsVarLib.Append("hakurei/u0/org.chromium.Chromium"), + Target: check.MustAbs("/data/data/org.chromium.Chromium"), + Write: true, + Ensure: true, + }}, + {&FSBind{ + Source: fhs.AbsDev.Append("dri"), + Device: true, + Optional: true, + }}, }, Username: "chronos", |