From cda6be3a443311447de5a37fce5e888b97cd76a9 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 15 Feb 2020 11:48:00 +0100
Subject: [PATCH] Boot options

---
 profiles/common/default.nix    |  3 +++
 profiles/graphical/default.nix | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/profiles/common/default.nix b/profiles/common/default.nix
index 0a055551..f7261653 100644
--- a/profiles/common/default.nix
+++ b/profiles/common/default.nix
@@ -10,6 +10,9 @@
     ../../programs/zsh/default.nix
   ];
 
+  # Use latest kernel
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
   i18n = {
     defaultLocale = "en_IE.UTF-8";
     extraLocaleSettings = {
diff --git a/profiles/graphical/default.nix b/profiles/graphical/default.nix
index 5be661db..b869fcd4 100644
--- a/profiles/graphical/default.nix
+++ b/profiles/graphical/default.nix
@@ -10,14 +10,14 @@
     ../../programs/sway/default.nix
   ];
 
-  # Use LTS kernel until intel driver hangs are fixed
-  boot.kernelPackages = pkgs.linuxPackages_4_19;
-
   services.pcscd = {
     enable = true;
     plugins = [ pkgs.ccid ];
   };
 
+  # Early KMS start
+  boot.initrd.kernelModules = [ "i915" ];
+
   sound.enable = true;
   hardware.pulseaudio.enable = true;
 
@@ -69,6 +69,7 @@
         vanilla-dmz
         wf-recorder
         wl-clipboard
+        xdg-user-dirs
       ];
       file = {
         ".icons/default/index.theme".text = ''
@@ -79,6 +80,11 @@
         '';
       };
     };
+    programs.zsh.loginExtra = ''
+      if [[ -z "$DISPLAY" ]] && [[ $(tty) = "/dev/tty1" ]]; then
+        exec sway
+      fi
+    '';
     dconf.settings = {
       "org/gnome/desktop/interface" = {
         gtk-theme = "Arc";