From 7c49e939b39230fc9d5caa2c77dc57a78f2e0e18 Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Sun, 25 Aug 2019 19:29:39 +0000
Subject: [PATCH] Update configuration

---
 hardware/apu.nix | 4 ++--
 host/achiles.nix | 6 +++---
 role/base.nix    | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/hardware/apu.nix b/hardware/apu.nix
index d2eccaa..fa78da4 100644
--- a/hardware/apu.nix
+++ b/hardware/apu.nix
@@ -11,11 +11,11 @@
   boot.loader.grub.extraConfig = "
     serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
     terminal_input serial
-    terminal_output seriaL
+    terminal_output serial
   ";
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "ehci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ "kvm-amd" "virtio" "tun" ];
   boot.extraModulePackages = [ ];
   boot.kernelParams = [ "console=ttyS0,115200n8" ];
 
diff --git a/host/achiles.nix b/host/achiles.nix
index d178dd5..132f451 100644
--- a/host/achiles.nix
+++ b/host/achiles.nix
@@ -7,14 +7,14 @@
 {
   imports =
     [
-      ./hardware/apu.nix
-      ./role/base.nix
+      ../hardware/apu.nix
+      ../role/base.nix
     ];
 
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/360a6bc9-fc4e-4803-bd53-69320ac32ac5";
       fsType = "btrfs";
-      options = [ "subvol=nixos" ];
+      options = [ "defaults" "subvol=nixos" "noatime" ];
     };
 
   swapDevices =
diff --git a/role/base.nix b/role/base.nix
index b5f5b92..f776c3e 100644
--- a/role/base.nix
+++ b/role/base.nix
@@ -2,10 +2,12 @@
 { config, pkgs, ... }:
 
 {
+  system.autoUpgrade.enable = true;
+
   # Select internationalisation properties.
   i18n = {
     consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "us";
+    consoleKeyMap = "sg-latin1";
     defaultLocale = "en_US.UTF-8";
   };
   # List packages installed in system profile. To search, run: