From a55a5e16ed4275cd4022881249e3386bf57067cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Tue, 18 Feb 2020 19:26:04 +0000 Subject: [PATCH] remove deprecated style --- nixos/boxes/foureighty.nix | 58 +++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/nixos/boxes/foureighty.nix b/nixos/boxes/foureighty.nix index 5bd74050..3cbb70e4 100644 --- a/nixos/boxes/foureighty.nix +++ b/nixos/boxes/foureighty.nix @@ -5,40 +5,40 @@ boot = { kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest_hardened; - initrd.luks.devices = [ - { - name = "root"; + initrd.luks.devices = { + root = { device = "/dev/disk/by-uuid/a9e8a44f-15be-4844-a0a1-46892cc5e44e"; preLVM = true; allowDiscards = true; - }]; - loader.grub = { - device = "nodev"; - efiSupport = true; }; - loader.efi.canTouchEfiVariables = true; }; - - time.hardwareClockInLocalTime = true; - time.timeZone = "Europe/London"; - - hardware.trackpoint.enable = true; - services.hardware.bolt.enable = true; - services.fprintd = { - enable = true; - package = pkgs.fprintd-thinkpad; + loader.grub = { + device = "nodev"; + efiSupport = true; }; + loader.efi.canTouchEfiVariables = true; + }; - hardware.nvidiaOptimus.disable = true; - hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ]; + time.hardwareClockInLocalTime = true; + time.timeZone = "Europe/London"; - imports = [ - /etc/nixos/hardware-configuration.nix - ../boot.nix - ../common.nix - ../gfx-intel.nix - ../virtualbox.nix - ../zerotier.nix - ../i3/system.nix - ]; - } + hardware.trackpoint.enable = true; + services.hardware.bolt.enable = true; + services.fprintd = { + enable = true; + package = pkgs.fprintd-thinkpad; + }; + + hardware.nvidiaOptimus.disable = true; + hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ]; + + imports = [ + /etc/nixos/hardware-configuration.nix + ../boot.nix + ../common.nix + ../gfx-intel.nix + ../virtualbox.nix + ../zerotier.nix + ../i3/system.nix + ]; +}