diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-27 02:40:37 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-27 02:40:37 +0000 |
| commit | 75e61e2029997a59d14f0ad3f1bf9d39075fd8e7 (patch) | |
| tree | 7d4b96b26d0bdbbe1d331dbc0f072be549c0dfe0 | |
| parent | ed47589b54413e4cfff5ef359c51ee21e0c751b0 (diff) | |
| download | nixpkgs-75e61e2029997a59d14f0ad3f1bf9d39075fd8e7.tar nixpkgs-75e61e2029997a59d14f0ad3f1bf9d39075fd8e7.tar.gz nixpkgs-75e61e2029997a59d14f0ad3f1bf9d39075fd8e7.tar.bz2 nixpkgs-75e61e2029997a59d14f0ad3f1bf9d39075fd8e7.tar.lz nixpkgs-75e61e2029997a59d14f0ad3f1bf9d39075fd8e7.tar.xz nixpkgs-75e61e2029997a59d14f0ad3f1bf9d39075fd8e7.tar.zst nixpkgs-75e61e2029997a59d14f0ad3f1bf9d39075fd8e7.zip | |
start-vm.nix: run Weston Terminal inside Sway
| -rw-r--r-- | start-vm.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/start-vm.nix b/start-vm.nix index d6be290e858..90c270ac8dc 100644 --- a/start-vm.nix +++ b/start-vm.nix @@ -59,7 +59,7 @@ let makeStage1 = { run ? null, tapFD }: writeScript "init-stage1" '' #! ${execline}/bin/execlineb -P export PATH ${lib.makeBinPath - [ s6-linux-init s6-portable-utils s6-linux-utils s6 execline busybox ]} + [ s6-linux-init s6-portable-utils s6-linux-utils s6 execline busybox sway-unwrapped ]} ${s6}/bin/s6-setsid -qb -- umask 022 if { s6-mount -t tmpfs -o mode=0755 tmpfs /run } @@ -150,6 +150,11 @@ let ''; }; + swayConfig = writeText "sway-config" '' + xwayland disable + exec ${westonLite}/bin/weston-terminal --shell /bin/sh + ''; + waylandVM = makeVM { name = "wayland-vm"; services.getty.run = writeScript "getty-run" '' @@ -170,7 +175,7 @@ let env XDG_RUNTIME_DIR=/run/user/1000 ${sommelier}/bin/sommelier - ${westonLite}/bin/weston-terminal --shell /bin/sh + ${sway-unwrapped}/bin/sway -Vc ${swayConfig} ''; wayland = true; tapFD = 4; |