diff options
-rw-r--r-- | machines/labnet/labtop.nix | 12 | ||||
-rw-r--r-- | modules/user/openlab/labtops.nix | 5 |
2 files changed, 5 insertions, 12 deletions
diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop.nix index 4ac85b0e..38d24c2c 100644 --- a/machines/labnet/labtop.nix +++ b/machines/labnet/labtop.nix @@ -9,18 +9,12 @@ let mkLabtops = lib.mapAttrs (name: cfg: callMachine (mkLabtop name cfg) {}); labtop = { - boot.loader.grub.device = "/dev/sda"; boot.kernelModules = [ "kvm-intel" ]; boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ata_piix" "firewire_ohci" "usb_storage" ]; - fileSystems."/" = { - device = "/dev/sda1"; - fsType = "ext4"; - }; - vuizvui.hardware.thinkpad.enable = true; hardware.trackpoint.enable = false; @@ -39,12 +33,6 @@ let labhanns = { nixpkgs.system = "i686-linux"; - boot.loader.grub.device = "/dev/sda"; - - fileSystems."/" = { - device = "/dev/sda1"; - fsType = "ext4"; - }; }; in diff --git a/modules/user/openlab/labtops.nix b/modules/user/openlab/labtops.nix index 77c4ba04..9f7a5d0d 100644 --- a/modules/user/openlab/labtops.nix +++ b/modules/user/openlab/labtops.nix @@ -16,6 +16,11 @@ in config = mkIf cfg.enable { + boot.loader.grub.device = mkDefault "/dev/sda"; + fileSystems."/" = mkDefault { + device = "/dev/disk/by-label/labtop"; + fsType = "ext4"; + }; i18n = { consoleFont = "lat9w-16"; |