diff --git a/system/users/default.nix b/system/users/default.nix index 0b5dec8..08c8c23 100644 --- a/system/users/default.nix +++ b/system/users/default.nix @@ -128,7 +128,7 @@ (if let dir = builtins.readDir ./.; in dir ? ${x} && dir.${x} == "directory" then - import ./${x}/home-manager + import ../../homes/${x}/home-manager else {}) (if inputs ? ${x} then inputs.${x} else {}) diff --git a/system/virtualization/default.nix b/system/virtualization/default.nix index 69879f1..8c32d01 100644 --- a/system/virtualization/default.nix +++ b/system/virtualization/default.nix @@ -6,13 +6,4 @@ (file: (dir.${file} == "directory")) (builtins.attrNames dir) ); - - config = { - programs.virt-manager.enable = true; - - virtualisation.libvirtd.enable = true; - - virtualisation.spiceUSBRedirection.enable = true; - }; - } diff --git a/system/virtualization/virtual-machines/default.nix b/system/virtualization/virtual-machines/default.nix index c157af7..0ff3785 100644 --- a/system/virtualization/virtual-machines/default.nix +++ b/system/virtualization/virtual-machines/default.nix @@ -1 +1,17 @@ -{ ... }: {} +{ ... }: { + + imports = let + dir = builtins.readDir ./.; + in builtins.map (x: ./${x}) (builtins.filter + (file: (dir.${file} == "directory")) + (builtins.attrNames dir) + ); + + config = { + programs.virt-manager.enable = true; + + virtualisation.libvirtd.enable = true; + + virtualisation.spiceUSBRedirection.enable = true; + }; +}