diff --git a/flake.nix b/flake.nix index 4602239..7326859 100644 --- a/flake.nix +++ b/flake.nix @@ -55,33 +55,7 @@ }; flake = { - nixosModules.sidebus-vm = - { ... }: - { - environment.sessionVariables.DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/sidebus.sock"; - systemd.sockets.sidebus-agent = { - # SocketMode= is 0666 by default - listenStreams = [ "/run/sidebus.sock" ]; - wantedBy = [ "sockets.target" ]; - documentation = [ "https://git.clan.lol/valpackett/sidebus" ]; - }; - systemd.services.sidebus-agent = { - # TODO: confinement (can do a lot) - serviceConfig = { - ExecStart = throw "sidebus-vm module requires setting systemd.services.sidebus-agent.serviceConfig.ExecStart to a sidebus-agent package"; - ImportCredential = "sidebus.*"; - }; - documentation = [ "https://git.clan.lol/valpackett/sidebus" ]; - }; - systemd.mounts = [ - { - type = "virtiofs"; - what = "vm-doc-portal"; - where = "/run/vm-doc-portal"; - wantedBy = [ "multi-user.target" ]; - } - ]; - }; + nixosModules.sidebus-vm = ./nixosModules/sidebus-vm.nix; }; }; } diff --git a/nixosModules/sidebus-vm.nix b/nixosModules/sidebus-vm.nix new file mode 100644 index 0000000..215d2b1 --- /dev/null +++ b/nixosModules/sidebus-vm.nix @@ -0,0 +1,25 @@ +{ + environment.sessionVariables.DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/sidebus.sock"; + systemd.sockets.sidebus-agent = { + # SocketMode= is 0666 by default + listenStreams = [ "/run/sidebus.sock" ]; + wantedBy = [ "sockets.target" ]; + documentation = [ "https://git.clan.lol/valpackett/sidebus" ]; + }; + systemd.services.sidebus-agent = { + # TODO: confinement (can do a lot) + serviceConfig = { + ExecStart = throw "sidebus-vm module requires setting systemd.services.sidebus-agent.serviceConfig.ExecStart to a sidebus-agent package"; + ImportCredential = "sidebus.*"; + }; + documentation = [ "https://git.clan.lol/valpackett/sidebus" ]; + }; + systemd.mounts = [ + { + type = "virtiofs"; + what = "vm-doc-portal"; + where = "/run/vm-doc-portal"; + wantedBy = [ "multi-user.target" ]; + } + ]; +}