From 17f255cd6be91dc8ed911c2b7e0d73f32f041913 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 3 May 2016 17:19:11 +0200 Subject: machines/labtops: Rename config expression file It doesn't list a single machine and the profile module also uses the pluralized version, so let's pluralize the file name as well. Signed-off-by: aszlig Cc: @Profpatsch --- machines/default.nix | 2 +- machines/labnet/labtop.nix | 24 ------------------------ machines/labnet/labtops.nix | 24 ++++++++++++++++++++++++ 3 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 machines/labnet/labtop.nix create mode 100644 machines/labnet/labtops.nix (limited to 'machines') diff --git a/machines/default.nix b/machines/default.nix index bbe03087..2e4c51cc 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -13,7 +13,7 @@ with import ../lib; }; }; labnet = { - labtops = callNetwork ./labnet/labtop.nix { + labtops = callNetwork ./labnet/labtops.nix { vuizvui.user.openlab.labtops.enable = true; }; }; diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop.nix deleted file mode 100644 index cee5c11b..00000000 --- a/machines/labnet/labtop.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - labtop = { - boot.kernelModules = [ "kvm-intel" ]; - boot.initrd.availableKernelModules = [ - "uhci_hcd" "ehci_pci" "ata_piix" "firewire_ohci" "usb_storage" - ]; - - vuizvui.hardware.thinkpad.enable = true; - - hardware.trackpoint.enable = false; - - networking.enableIntel3945ABGFirmware = true; - - users.users.kevin = { - isNormalUser = true; - password = "kevin"; - }; - users.users.root.password = "root"; - }; - - hannswurscht = { - nixpkgs.system = "i686-linux"; - }; -} diff --git a/machines/labnet/labtops.nix b/machines/labnet/labtops.nix new file mode 100644 index 00000000..cee5c11b --- /dev/null +++ b/machines/labnet/labtops.nix @@ -0,0 +1,24 @@ +{ + labtop = { + boot.kernelModules = [ "kvm-intel" ]; + boot.initrd.availableKernelModules = [ + "uhci_hcd" "ehci_pci" "ata_piix" "firewire_ohci" "usb_storage" + ]; + + vuizvui.hardware.thinkpad.enable = true; + + hardware.trackpoint.enable = false; + + networking.enableIntel3945ABGFirmware = true; + + users.users.kevin = { + isNormalUser = true; + password = "kevin"; + }; + users.users.root.password = "root"; + }; + + hannswurscht = { + nixpkgs.system = "i686-linux"; + }; +} -- cgit 1.4.1