From e9da2bdac9dd61d29e85bb30bd7c953cc2a85474 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Wed, 22 Apr 2020 14:22:39 +0200
Subject: Adapt to 20.03 update

---
 configuration.nix                 |  5 ++++-
 host/obelix.nix                   | 15 ++++++++-------
 host/software/desktop/default.nix | 10 +++++-----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 62cb1ae..e9e20d6 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -12,8 +12,9 @@ in {
     ./user/common.nix
   ];
 
+  console.keyMap = "de";
+
   i18n = {
-    consoleKeyMap = "de";
     defaultLocale = "en_US.UTF-8";
   };
 
@@ -21,6 +22,8 @@ in {
 
   nixpkgs.config.allowUnfree = true;
 
+  nix.allowedUsers = [ "common" ];
+
   networking.nameservers = [
     "1.1.1.1"
     "2606:4700:4700::1111"
diff --git a/host/obelix.nix b/host/obelix.nix
index c922cea..583fbde 100644
--- a/host/obelix.nix
+++ b/host/obelix.nix
@@ -10,18 +10,19 @@
     loader.grub = {
       enable  = true;
       version = 2;
-      device  = "/dev/sdb";
+      device  = "/dev/sda";
       extraConfig = ''
         set gfxpayload=1920x1200x32
       '';
     };
 
-    initrd.luks.devices = [ {
-      name   = "root";
-      device = "/dev/disk/by-uuid/6205da24-b1b2-402c-b175-4036e678dea9";
-      preLVM        = true;
-      allowDiscards = true;
-    } ];
+    initrd.luks.devices = {
+      root = {
+        device = "/dev/disk/by-uuid/6205da24-b1b2-402c-b175-4036e678dea9";
+        preLVM        = true;
+        allowDiscards = true;
+      };
+    };
   };
 
   networking = {
diff --git a/host/software/desktop/default.nix b/host/software/desktop/default.nix
index 030e1b1..f18d3fa 100644
--- a/host/software/desktop/default.nix
+++ b/host/software/desktop/default.nix
@@ -30,13 +30,13 @@
       layout = "de";
       xkbOptions = "caps:escape";
 
-      displayManager.slim = {
+      displayManager.lightdm = {
         enable = true;
-        autoLogin = true;
-        defaultUser = "common";
+        autoLogin = {
+          enable = true;
+          user   = "common";
+        };
       };
-
-      desktopManager.default = "none";
     };
   };
 
-- 
cgit v1.2.3