diff options
author | Adrian Kummerlaender | 2020-04-23 16:19:25 +0200 |
---|---|---|
committer | Adrian Kummerlaender | 2020-04-23 16:19:25 +0200 |
commit | 7e33e2bf9b5cd3110e8022629aacb32e85174c11 (patch) | |
tree | acc20e0651ed02c7e5557689d55437f172b47754 | |
parent | 93e2032c3e521b9d84118bdeab4235cfbd522557 (diff) | |
download | nixos_system-7e33e2bf9b5cd3110e8022629aacb32e85174c11.tar nixos_system-7e33e2bf9b5cd3110e8022629aacb32e85174c11.tar.gz nixos_system-7e33e2bf9b5cd3110e8022629aacb32e85174c11.tar.bz2 nixos_system-7e33e2bf9b5cd3110e8022629aacb32e85174c11.tar.lz nixos_system-7e33e2bf9b5cd3110e8022629aacb32e85174c11.tar.xz nixos_system-7e33e2bf9b5cd3110e8022629aacb32e85174c11.tar.zst nixos_system-7e33e2bf9b5cd3110e8022629aacb32e85174c11.zip |
Update athena config to 20.03
-rw-r--r-- | host/athena.nix | 22 | ||||
-rw-r--r-- | host/hardware/athena.nix | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/host/athena.nix b/host/athena.nix index 211f155..b44fb67 100644 --- a/host/athena.nix +++ b/host/athena.nix @@ -12,12 +12,13 @@ efi.canTouchEfiVariables = true; }; - initrd.luks.devices = [ { - name = "encrypted"; - device = "/dev/nvme0n1p2"; - preLVM = true; - allowDiscards = true; - } ]; + initrd.luks.devices = { + encrypted = { + device = "/dev/nvme0n1p2"; + preLVM = true; + allowDiscards = true; + }; + }; }; networking = { @@ -92,10 +93,9 @@ powerManagement.powertop.enable = true; - i18n = { - consoleFont = "ter-132n"; - consolePackages = [ pkgs.terminus_font ]; + console = { + earlySetup = true; + font = "ter-132n"; + packages = [ pkgs.terminus_font ]; }; - - boot.earlyVconsoleSetup = true; } diff --git a/host/hardware/athena.nix b/host/hardware/athena.nix index 0682645..b0fb576 100644 --- a/host/hardware/athena.nix +++ b/host/hardware/athena.nix @@ -9,7 +9,7 @@ ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ "kvm-intel" "fuse" ]; boot.extraModulePackages = [ ]; fileSystems."/" = |