From 9ebd743f78446c38008f67a4c963d785c58c074c Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 17 Jan 2020 05:47:43 -0500
Subject: [PATCH] Fix shiro hardware config

---
 hosts/shiro/default.nix                |  9 ---------
 hosts/shiro/hardware-configuration.nix | 19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/hosts/shiro/default.nix b/hosts/shiro/default.nix
index ddb45aa8..6edabea1 100644
--- a/hosts/shiro/default.nix
+++ b/hosts/shiro/default.nix
@@ -41,13 +41,4 @@
   powerManagement.powertop.enable = true;
   # Monitor backlight control
   programs.light.enable = true;
-  # Encrypted /home
-  boot.initrd.luks.devices = [
-    {
-      name = "home";
-      device = "/dev/nvme0n1p8";
-      preLVM = true;
-      allowDiscards = true;
-    }
-  ];
 }
diff --git a/hosts/shiro/hardware-configuration.nix b/hosts/shiro/hardware-configuration.nix
index 0a55648a..9fe527d6 100644
--- a/hosts/shiro/hardware-configuration.nix
+++ b/hosts/shiro/hardware-configuration.nix
@@ -5,11 +5,11 @@
 
 {
   imports = [
+    <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
     (let nixos-hardware =
            builtins.fetchTarball
              https://github.com/NixOS/nixos-hardware/archive/master.tar.gz;
      in "${nixos-hardware}/dell/xps/13-9370")
-    <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
   ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "rtsx_pci_sdmmc" ];
@@ -22,21 +22,30 @@
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
   ## SSDs
-  services.fstrim.enable = true;
+  # services.fstrim.enable = true;
 
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-uuid/nixos";
+      device = "/dev/disk/by-label/nixos";
       fsType = "ext4";
+      options = [ "noatime" ];
     };
     "/boot" = {
-      device = "/dev/disk/by-uuid/BOOT";
+      device = "/dev/disk/by-label/BOOT";
       fsType = "vfat";
     };
     "/home" = {
-      device = "/dev/disk/by-uuid/home";
+      device = "/dev/disk/by-label/home";
       fsType = "ext4";
+      options = [ "noatime" ];
     };
   };
   swapDevices = [ { device = "/dev/disk/by-label/swap"; }];
+  # Encrypted /home
+  boot.initrd.luks.devices = [{
+    name = "home";
+    device = "/dev/nvme0n1p8";
+    preLVM = true;
+    allowDiscards = true;
+  }];
 }