From 0255469ad31149bf9dba8c974fb84b9ff8fd20ce Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Sat, 23 Jan 2021 16:24:21 -0500
Subject: [PATCH] Add luks encrypted fs

---
 machines/hermes/hardware.nix  | 33 ++++++++++++++++++---------------
 overlays/g810-led/default.nix |  2 +-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/machines/hermes/hardware.nix b/machines/hermes/hardware.nix
index 94bf8ba..2cbf948 100644
--- a/machines/hermes/hardware.nix
+++ b/machines/hermes/hardware.nix
@@ -1,28 +1,31 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e39690f0-4026-4571-969f-493efa0d1c96";
-      fsType = "ext4";
-    };
+  boot.initrd.luks.devices.luksroot = {
+    device = "/dev/disk/by-uuid/4b886807-3e19-437c-84bb-c2dd766fc19b";
+    allowDiscards = true;
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/B2C8-621E";
-      fsType = "vfat";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/48d2e958-00a0-47fa-8c32-9aec031f6098";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/D387-B640";
+    fsType = "vfat";
+  };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/0933f280-888d-4eff-9274-a515bcccca4e"; }
-    ];
+    [{ device = "/dev/disk/by-uuid/92c35fa7-2d2e-4172-abaf-4c81599782f1"; }];
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }
diff --git a/overlays/g810-led/default.nix b/overlays/g810-led/default.nix
index 3cc1493..5cdcc0b 100644
--- a/overlays/g810-led/default.nix
+++ b/overlays/g810-led/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ samuelgrf ];
+    maintainers = with maintainers; [ davegallant ];
   };
 }