internal: relocate packages

Signed-off-by: Ophestra <cat@gensokyo.uk>

cmd/hakurei/command.go

@@ -17,10 +17,10 @@ import (
 	"hakurei.app/container/check"
 	"hakurei.app/container/fhs"
 	"hakurei.app/hst"
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/env"
 	"hakurei.app/internal/info"
 	"hakurei.app/internal/outcome"
-	"hakurei.app/internal/system/dbus"
 	"hakurei.app/message"
 )
 

internal/acl/acl_test.go

@@ -13,7 +13,7 @@ import (
 	"strconv"
 	"testing"
 
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
 )
 
 const testFileName = "acl.test"

internal/acl/perms_test.go

@@ -3,7 +3,7 @@ package acl_test
 import (
 	"testing"
 
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
 )
 
 func TestPerms(t *testing.T) {

internal/dbus/address_test.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"hakurei.app/internal/system/dbus"
+	"hakurei.app/internal/dbus"
 )
 
 func TestParse(t *testing.T) {

internal/dbus/config_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/dbus"
+	"hakurei.app/internal/dbus"
 )
 
 func TestConfigArgs(t *testing.T) {

internal/dbus/dbus_test.go

@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/helper"
-	"hakurei.app/internal/system/dbus"
 	"hakurei.app/message"
 )
 

internal/outcome/dispatcher.go

@@ -14,8 +14,8 @@ import (
 	"hakurei.app/container/check"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/info"
-	"hakurei.app/internal/system/dbus"
 	"hakurei.app/message"
 )
 

internal/outcome/outcome.go

@@ -9,9 +9,9 @@ import (
 	"hakurei.app/container"
 	"hakurei.app/container/check"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
 	"hakurei.app/internal/env"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
 	"hakurei.app/message"
 )
 

internal/outcome/run_test.go

@@ -21,9 +21,9 @@ import (
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/dbus"
 	"hakurei.app/message"
 )
 

internal/outcome/spcontainer.go

@@ -16,9 +16,9 @@ import (
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/dbus"
 	"hakurei.app/internal/validate"
 	"hakurei.app/message"
 )

internal/outcome/spcontainer_test.go

@@ -14,9 +14,9 @@ import (
 	"hakurei.app/container/std"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/dbus"
 )
 
 func TestSpParamsOp(t *testing.T) {

internal/outcome/spdbus.go

@@ -5,8 +5,8 @@ import (
 
 	"hakurei.app/container/fhs"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
-	"hakurei.app/internal/system/dbus"
+	"hakurei.app/internal/dbus"
 )
 
 func init() { gob.Register(new(spDBusOp)) }

internal/outcome/spdbus_test.go

@@ -7,10 +7,10 @@ import (
 	"hakurei.app/container"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/helper"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/dbus"
 	"hakurei.app/message"
 )
 

internal/outcome/sppulse_test.go

@@ -11,8 +11,8 @@ import (
 	"hakurei.app/container/check"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
 )
 
 func TestSpPulseOp(t *testing.T) {

internal/outcome/spruntime.go

@@ -7,8 +7,8 @@ import (
 	"hakurei.app/container/fhs"
 	"hakurei.app/container/std"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
 )
 
 const (

internal/outcome/spruntime_test.go

@@ -8,8 +8,8 @@ import (
 	"hakurei.app/container/std"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
 )
 
 func TestSpRuntimeOp(t *testing.T) {

internal/outcome/sptmpdir.go

@@ -7,8 +7,8 @@ import (
 	"hakurei.app/container/fhs"
 	"hakurei.app/container/std"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
 )
 
 func init() { gob.Register(spTmpdirOp{}) }

internal/outcome/sptmpdir_test.go

@@ -8,8 +8,8 @@ import (
 	"hakurei.app/container/std"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
 )
 
 func TestSpTmpdirOp(t *testing.T) {

internal/outcome/spwayland.go

@@ -5,8 +5,8 @@ import (
 
 	"hakurei.app/container/check"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
-	"hakurei.app/internal/system/wayland"
+	"hakurei.app/internal/wayland"
 )
 
 func init() { gob.Register(new(spWaylandOp)) }

internal/outcome/spwayland_test.go

@@ -6,9 +6,9 @@ import (
 	"hakurei.app/container"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/wayland"
-	"hakurei.app/internal/system/wayland"
 )
 
 func TestSpWaylandOp(t *testing.T) {

internal/outcome/spx11.go

@@ -11,7 +11,7 @@ import (
 	"hakurei.app/container/check"
 	"hakurei.app/container/fhs"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
 )
 
 var absX11SocketDir = fhs.AbsTmp.Append(".X11-unix")

internal/outcome/spx11_test.go

@@ -7,7 +7,7 @@ import (
 	"hakurei.app/container"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
 )
 
 func TestSpX11Op(t *testing.T) {

internal/system/acl.go

@@ -8,7 +8,7 @@ import (
 
 	"hakurei.app/container/check"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
 )
 
 // UpdatePerm calls UpdatePermType with the [Process] criteria.

internal/system/acl_test.go

@@ -7,7 +7,7 @@ import (
 
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
 )
 
 func TestACLUpdateOp(t *testing.T) {

internal/system/dbus.go

@@ -13,7 +13,7 @@ import (
 
 	"hakurei.app/container"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/dbus"
+	"hakurei.app/internal/dbus"
 )
 
 // ErrDBusConfig is returned when a required [hst.BusConfig] argument is nil.

internal/system/dbus_test.go

@@ -11,8 +11,8 @@ import (
 
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/helper"
-	"hakurei.app/internal/system/dbus"
 )
 
 func TestDBusProxyOp(t *testing.T) {

internal/system/dispatcher.go

@@ -7,9 +7,9 @@ import (
 	"os"
 
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
-	"hakurei.app/internal/system/dbus"
+	"hakurei.app/internal/dbus"
-	"hakurei.app/internal/system/xcb"
+	"hakurei.app/internal/xcb"
 )
 
 type osFile interface {

internal/system/dispatcher_test.go

@@ -10,9 +10,9 @@ import (
 
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
-	"hakurei.app/internal/system/dbus"
+	"hakurei.app/internal/dbus"
-	"hakurei.app/internal/system/xcb"
+	"hakurei.app/internal/xcb"
 )
 
 // call initialises a [stub.Call].

internal/system/system_test.go

@@ -11,7 +11,7 @@ import (
 	"hakurei.app/container/check"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/xcb"
+	"hakurei.app/internal/xcb"
 	"hakurei.app/message"
 )
 

internal/system/wayland.go

@@ -7,8 +7,8 @@ import (
 
 	"hakurei.app/container/check"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
-	"hakurei.app/internal/system/wayland"
+	"hakurei.app/internal/wayland"
 )
 
 type waylandConn interface {

internal/system/wayland_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"hakurei.app/container/stub"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
-	"hakurei.app/internal/system/wayland"
+	"hakurei.app/internal/wayland"
 )
 
 type stubWaylandConn struct {

internal/system/xhost.go

@@ -2,7 +2,7 @@ package system
 
 import (
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/xcb"
+	"hakurei.app/internal/xcb"
 )
 
 // ChangeHosts inserts the target user into X11 hosts and deletes it once its [Enablement] is no longer satisfied.

internal/system/xhost_test.go

@@ -5,7 +5,7 @@ import (
 
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/xcb"
+	"hakurei.app/internal/xcb"
 )
 
 func TestXHostOp(t *testing.T) {

system/acl/deprecated.go

@@ -1,4 +1,4 @@
-// Package acl exposes the internal/system/acl package.
+// Package acl exposes the internal/acl package.
 //
 // Deprecated: This package will be removed in 0.4.
 package acl
@@ -6,7 +6,7 @@ package acl
 import (
 	_ "unsafe" // for go:linkname
 
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
 )
 
 type Perm = acl.Perm
@@ -19,7 +19,7 @@ const (
 
 // Update replaces ACL_USER entry with qualifier uid.
 //
-//go:linkname Update hakurei.app/internal/system/acl.Update
+//go:linkname Update hakurei.app/internal/acl.Update
 func Update(name string, uid int, perms ...Perm) error
 
 type Perms = acl.Perms

system/dbus/deprecated.go

@@ -1,4 +1,4 @@
-// Package dbus exposes the internal/system/dbus package.
+// Package dbus exposes the internal/dbus package.
 //
 // Deprecated: This package will be removed in 0.4.
 package dbus
@@ -9,7 +9,7 @@ import (
 	_ "unsafe" // for go:linkname
 
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/dbus"
+	"hakurei.app/internal/dbus"
 	"hakurei.app/message"
 )
 
@@ -17,13 +17,13 @@ type AddrEntry = dbus.AddrEntry
 
 // EqualAddrEntries returns whether two slices of [AddrEntry] are equal.
 //
-//go:linkname EqualAddrEntries hakurei.app/internal/system/dbus.EqualAddrEntries
+//go:linkname EqualAddrEntries hakurei.app/internal/dbus.EqualAddrEntries
 func EqualAddrEntries(entries, target []AddrEntry) bool
 
 // Parse parses D-Bus address according to
 // https://dbus.freedesktop.org/doc/dbus-specification.html#addresses
 //
-//go:linkname Parse hakurei.app/internal/system/dbus.Parse
+//go:linkname Parse hakurei.app/internal/dbus.Parse
 func Parse(addr []byte) ([]AddrEntry, error)
 
 type ParseError = dbus.ParseError
@@ -46,12 +46,12 @@ type ProxyPair = dbus.ProxyPair
 
 // Args returns the xdg-dbus-proxy arguments equivalent of [hst.BusConfig].
 //
-//go:linkname Args hakurei.app/internal/system/dbus.Args
+//go:linkname Args hakurei.app/internal/dbus.Args
 func Args(c *hst.BusConfig, bus ProxyPair) (args []string)
 
 // NewConfig returns the address of a new [hst.BusConfig] with optional defaults.
 //
-//go:linkname NewConfig hakurei.app/internal/system/dbus.NewConfig
+//go:linkname NewConfig hakurei.app/internal/dbus.NewConfig
 func NewConfig(id string, defaults, mpris bool) *hst.BusConfig
 
 const (
@@ -89,13 +89,13 @@ const (
 // Address returns the session and system bus addresses copied from environment,
 // or appropriate fallback values if they are not set.
 //
-//go:linkname Address hakurei.app/internal/system/dbus.Address
+//go:linkname Address hakurei.app/internal/dbus.Address
 func Address() (session, system string)
 
 // ProxyName is the file name or path to the proxy program.
 // Overriding ProxyName will only affect Proxy instance created after the change.
 //
-//go:linkname ProxyName hakurei.app/internal/system/dbus.ProxyName
+//go:linkname ProxyName hakurei.app/internal/dbus.ProxyName
 var ProxyName string
 
 // Proxy holds the state of a xdg-dbus-proxy process, and should never be copied.
@@ -106,10 +106,10 @@ type Final = dbus.Final
 
 // Finalise creates a checked argument writer for [Proxy].
 //
-//go:linkname Finalise hakurei.app/internal/system/dbus.Finalise
+//go:linkname Finalise hakurei.app/internal/dbus.Finalise
 func Finalise(sessionBus, systemBus ProxyPair, session, system *hst.BusConfig) (final *Final, err error)
 
 // New returns a new instance of [Proxy].
 //
-//go:linkname New hakurei.app/internal/system/dbus.New
+//go:linkname New hakurei.app/internal/dbus.New
 func New(ctx context.Context, msg message.Msg, final *Final, output io.Writer) *Proxy

system/wayland/deprecated.go

@@ -1,4 +1,4 @@
-// Package wayland exposes the internal/system/wayland package.
+// Package wayland exposes the internal/wayland package.
 //
 // Deprecated: This package will be removed in 0.4.
 package wayland
@@ -6,7 +6,7 @@ package wayland
 import (
 	_ "unsafe" // for go:linkname
 
-	"hakurei.app/internal/system/wayland"
+	"hakurei.app/internal/wayland"
 )
 
 // Conn represents a connection to the wayland display server.