From 7e33e2bf9b5cd3110e8022629aacb32e85174c11 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Thu, 23 Apr 2020 16:19:25 +0200
Subject: Update athena config to 20.03

---
 host/athena.nix          | 22 +++++++++++-----------
 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."/" =
-- 
cgit v1.2.3