diff options
| -rw-r--r-- | machines/default.nix | 4 | ||||
| -rw-r--r-- | machines/labnet/labtop.nix | 19 |
2 files changed, 5 insertions, 18 deletions
diff --git a/machines/default.nix b/machines/default.nix index 11335a14..13cf8f6e 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -27,7 +27,9 @@ in { }; }; labnet = { - labtops = import ./labnet/labtop.nix { inherit (nixpkgs) lib; }; + labtops = callMachines ./labnet/labtop.nix { + extraConfig.vuizvui.user.openlab.labtops.enable = true; + }; }; profpatsch = { katara = callMachine ./profpatsch/katara.nix {}; diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop.nix index 099925fa..cee5c11b 100644 --- a/machines/labnet/labtop.nix +++ b/machines/labnet/labtop.nix @@ -1,15 +1,5 @@ -{ lib }: -let - callMachine = import ../../lib/call-machine.nix; - mkLabtop = hostname: config: { - imports = [ config ]; - vuizvui.user.openlab.labtops.enable = true; - networking.hostName = hostname; - }; - mkLabtops = lib.mapAttrs (name: cfg: callMachine (mkLabtop name cfg) {}); - +{ labtop = { - boot.kernelModules = [ "kvm-intel" ]; boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ata_piix" "firewire_ohci" "usb_storage" @@ -21,19 +11,14 @@ let networking.enableIntel3945ABGFirmware = true; - users.users.kevin = { isNormalUser = true; password = "kevin"; }; users.users.root.password = "root"; - }; - hannswurscht = { nixpkgs.system = "i686-linux"; }; - -in - mkLabtops { inherit labtop hannswurscht; } +} |