misc: zed editor, try to get scream working, other small changes
This commit is contained in:
parent
ab001fac00
commit
8a928e8f58
6 changed files with 67 additions and 27 deletions
45
nixos/vm.nix
45
nixos/vm.nix
|
@ -90,22 +90,26 @@ in {
|
|||
|
||||
networking.dhcpcd.denyInterfaces = [ "winvm0" ];
|
||||
|
||||
# TODO: the below doesn't actually work, so I just
|
||||
# disable wait-online entirely.
|
||||
# ensure the bridge network doesn't cause us to wait
|
||||
# on boot
|
||||
systemd.network.wait-online.ignoredInterfaces = [ "eth0" "winvm0" ];
|
||||
# systemd.network.wait-online.ignoredInterfaces = [ "eth0" "winvm0" ];
|
||||
systemd.network.wait-online.anyInterface = true;
|
||||
boot.initrd.systemd.network.wait-online.ignoredInterfaces = [ "eth0" "winvm0" ];
|
||||
|
||||
# These are needed, since I'm not currently trying to
|
||||
# reserve a static IP for the bridge interface
|
||||
networking.defaultGateway = { address = "10.0.0.1"; interface = "eth0"; };
|
||||
networking.interfaces.winvm0 = {
|
||||
useDHCP = false;
|
||||
ipv4 = {
|
||||
addresses = [
|
||||
{ address = "10.0.5.1"; prefixLength = 16; }
|
||||
{ address = "10.0.5.1"; prefixLength = 24; }
|
||||
];
|
||||
routes = [{
|
||||
address = "10.0.0.0";
|
||||
prefixLength = 16;
|
||||
address = "10.0.5.1";
|
||||
prefixLength = 24;
|
||||
options = { scope = "link"; metric = "900"; };
|
||||
}];
|
||||
};
|
||||
|
@ -148,22 +152,25 @@ in {
|
|||
|
||||
# note that the VM needs 64 MB for the shmem in side the
|
||||
# xml for the full res of the FW laptop
|
||||
# systemd.tmpfiles.rules = [
|
||||
# "f /dev/shm/scream 0660 evar qemu-libvirtd -"
|
||||
# "f /dev/shm/looking-glass 0660 evar qemu-libvirtd -"
|
||||
# ];
|
||||
systemd.tmpfiles.rules = [
|
||||
"f /dev/shm/scream 0660 evar qemu-libvirtd -"
|
||||
];
|
||||
|
||||
# service for hooking up scream for audio
|
||||
# systemd.user.services.scream-ivshmem = {
|
||||
# enable = true;
|
||||
# description = "Scream IVSHMEM";
|
||||
# serviceConfig = {
|
||||
# ExecStart = "${pkgs.scream}/bin/scream-ivshmem-pulse /dev/shm/scream";
|
||||
# Restart = "always";
|
||||
# };
|
||||
# wantedBy = [ "multi-user.target" ];
|
||||
# requires = [ "pulseaudio.service" ];
|
||||
# };
|
||||
systemd.user.services.scream-ivshmem = {
|
||||
enable = true;
|
||||
description = "Scream";
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.scream}/bin/scream -v -n scream -o pulse -m /dev/shm/scream";
|
||||
Restart = "always";
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
requires = [
|
||||
"pipewire-pulse.service"
|
||||
"pipewire.service"
|
||||
"sound.target"
|
||||
];
|
||||
};
|
||||
|
||||
boot = {
|
||||
initrd.kernelModules = [
|
||||
|
@ -215,7 +222,7 @@ in {
|
|||
|
||||
"interfaces" = "virbr0";
|
||||
# note: localhost is the ipv6 localhost ::1
|
||||
"hosts allow" = "192.168.122.";
|
||||
"hosts allow" = "192.168.122. 100.64.0.0/10";
|
||||
# "hosts deny" = "0.0.0.0/0";
|
||||
"guest account" = "nobody";
|
||||
"map to guest" = "bad user";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue