From e633b8fcafbe074f90ecc9fa7fc1a8b06a7b3cb9 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 18 Jan 2017 16:07:47 +0100
Subject: [PATCH] steveej-laptop: new hardware!

* bootloader
  * use EFI
* hardware drivers
  * different kernele modules
* GPU driver problem related
  * switch to modesetting GPU driver
  * switch to sddm
* new FS UUIDs
---
 nixos-configuration/steveej-laptop/hw.nix     | 47 ++++++++++---------
 nixos-configuration/steveej-laptop/system.nix | 14 +-----
 2 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/nixos-configuration/steveej-laptop/hw.nix b/nixos-configuration/steveej-laptop/hw.nix
index 3fb8d9f..3d916c1 100644
--- a/nixos-configuration/steveej-laptop/hw.nix
+++ b/nixos-configuration/steveej-laptop/hw.nix
@@ -9,27 +9,28 @@
     hardware.enableAllFirmware = true;
     hardware.trackpoint.emulateWheel = true;
 
-    boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" ];
+    boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
     boot.kernelModules = [ "kvm-intel" ];
     boot.extraModulePackages = [ ];
 
-    fileSystems."/" = { device = "/dev/disk/by-uuid/be9be32e-1fb0-45c3-9714-390ee2e6c184";
-        fsType = "btrfs";
-        options = [
-          "defaults"
-          "compress=lzo"
-          "discard"
-          "subvol=nixos"
-        ];
+    boot.loader.systemd-boot.enable = true;
+    boot.loader.efi.canTouchEfiVariables = true;
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/8567-6D0C";
+      fsType = "vfat";
     };
-    fileSystems."/home" = { device = "/dev/disk/by-uuid/be9be32e-1fb0-45c3-9714-390ee2e6c184";
+
+    fileSystems."/" = {
+        device = "/dev/disk/by-uuid/948e84dc-5c4f-4051-8a13-efb30155839f";
         fsType = "btrfs";
-        options = [
-          "defaults"
-          "compress=lzo"
-          "discard"
-          "subvol=home"
-        ];
+        options = [ "subvol=nixos" ];
+    };
+
+    fileSystems."/home" = {
+        device = "/dev/disk/by-uuid/948e84dc-5c4f-4051-8a13-efb30155839f";
+        fsType = "btrfs";
+        options = [ "subvol=home" ];
     };
 
     fileSystems."/var/lib/rkt" = {
@@ -42,13 +43,15 @@
 
     swapDevices = [ ];
 
-    # Define on which hard drive you want to install Grub.
-    boot.loader.grub.device = "/dev/sda";
+    boot.loader.grub = {
+        device = "/dev/sda";
+        efiSupport = true;
+    };
 
-    boot.initrd.luks.devices = [ { 
-            name = "luksSSD1";
-            device = "/dev/disk/by-uuid/2274dc28-7a48-4355-bc27-2d73f7a2744e";
-            preLVM = false;
+    boot.initrd.luks.devices = [ {
+            name = "btrfsroot";
+            device = "/dev/disk/by-uuid/0e6b5751-0e6d-4de7-84c3-17fe525c4c72";
+            preLVM = true;
             allowDiscards = true;
         }
     ];
diff --git a/nixos-configuration/steveej-laptop/system.nix b/nixos-configuration/steveej-laptop/system.nix
index 1bb876f..f783f51 100644
--- a/nixos-configuration/steveej-laptop/system.nix
+++ b/nixos-configuration/steveej-laptop/system.nix
@@ -113,7 +113,7 @@
     libinput.enable = true;
     libinput.naturalScrolling = true;
 
-    videoDrivers = [ "qxl" "intel" ];
+    videoDrivers = [ "qxl" "modesetting" ];
     enable = true;
     layout = "us";
 
@@ -126,17 +126,7 @@
     };
 
     displayManager = {
-      slim = {
-        enable = true;
-        theme = pkgs.fetchFromGitHub {
-          owner = "steveej";
-          repo = "nixos-slim-theme";
-          rev = "eec04a624113db835f2b5960d305e242da9dbc2a";
-          sha256 = "146zmr5rzwxq5mz6b7108a3ksf3nvqxrr8bvi82jsw6xqji4i5f5";
-        };
-        autoLogin = true;
-        defaultUser = "steveej";
-      };
+      sddm.enable = true;
       sessionCommands = ''
         xscreensaver -no-splash &
         ${pkgs.networkmanagerapplet}/bin/nm-applet &