From 849c28764a6873e7da7603184101b49683f63a87 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 22 Apr 2020 13:35:59 +0200
Subject: Fix for NixOS 20.03 deprecations

---
 system/settings/hardware/systemd-boot.nix | 2 +-
 system/settings/programs/i3.nix           | 2 +-
 system/settings/services/xserver.nix      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/settings/hardware/systemd-boot.nix b/system/settings/hardware/systemd-boot.nix
index a1a41f35..9793cf66 100644
--- a/system/settings/hardware/systemd-boot.nix
+++ b/system/settings/hardware/systemd-boot.nix
@@ -5,5 +5,5 @@
     editor = false; # Don't allow modification
   };
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.earlyVconsoleSetup = true;
+  console.earlySetup = true;
 }
diff --git a/system/settings/programs/i3.nix b/system/settings/programs/i3.nix
index b0140cdb..ab1fcca4 100644
--- a/system/settings/programs/i3.nix
+++ b/system/settings/programs/i3.nix
@@ -1,7 +1,6 @@
 { config, pkgs, ... }:
 
 { services.xserver.windowManager = {
-    default = "i3";
     i3 = {
       enable = true;
       extraSessionCommands = ''
@@ -9,6 +8,7 @@
       '';
     };
   };
+  services.xserver.displayManager.defaultSession = "none+i3";
 
   environment.systemPackages = with pkgs; [
     i3status
diff --git a/system/settings/services/xserver.nix b/system/settings/services/xserver.nix
index 8c35da95..cddf5734 100644
--- a/system/settings/services/xserver.nix
+++ b/system/settings/services/xserver.nix
@@ -7,7 +7,7 @@ with lib;
     exportConfiguration = true;
   };
 
-  i18n.consoleUseXkbConfig = true;
+  console.useXkbConfig = true;
 
   xdg.sounds.enable = false;
 
-- 
cgit 1.4.1