From d911aabfadac1a0d82fb4f62e33d68bf445daf88 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Wed, 22 Feb 2023 17:58:29 -0500 Subject: [PATCH] use tmpfile.d to symlink vfio things --- modules/DE/dwm.nix | 1 + systems/gerg-desktop/vfio.nix | 16 +++++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/modules/DE/dwm.nix b/modules/DE/dwm.nix index 43aef74..cd3667c 100644 --- a/modules/DE/dwm.nix +++ b/modules/DE/dwm.nix @@ -25,6 +25,7 @@ in { displayManager = { sessionCommands = '' ${pkgs.feh}/bin/feh --bg-scale ${self + /misc/recursion.png} + ${pkgs.numlockx}/bin/numlockx ''; defaultSession = "none+dwm"; }; diff --git a/systems/gerg-desktop/vfio.nix b/systems/gerg-desktop/vfio.nix index 93216b6..05dbffa 100644 --- a/systems/gerg-desktop/vfio.nix +++ b/systems/gerg-desktop/vfio.nix @@ -36,7 +36,7 @@ _: { users.users."${settings.username}".extraGroups = ["kvm" "libvirtd"]; - systemd.services.libvirtd.preStart = let + systemd.tmpfiles.rules = let xml = pkgs.writeText "Windows.xml" (builtins.readFile "${self}/misc/Windows.xml"); qemuHook = pkgs.writeScript "qemu-hook" '' #!${pkgs.stdenv.shell} @@ -58,14 +58,8 @@ _: { fi fi ''; - in '' - mkdir -p /var/lib/libvirt/hooks - chmod 755 /var/lib/libvirt/hooks - - # Copy hook files - ln -sf ${qemuHook} /var/lib/libvirt/hooks/qemu - - mkdir -p /var/lib/libvirt/qemu/ - ln -sf ${xml} /var/lib/libvirt/qemu/Windows.xml - ''; + in [ + "L+ /var/lib/libvirt/hooks/ - - - - ${qemuHook}" + "L+ /var/lib/libvirt/qemu/Windows.xml - - - - ${xml}" + ]; }